diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json index 5270022db7..eb4704879a 100644 --- a/node_modules/.package-lock.json +++ b/node_modules/.package-lock.json @@ -1303,17 +1303,17 @@ "license": "MIT" }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.18.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.18.2.tgz", - "integrity": "sha512-adig4SzPLjeQ0Tm+jvsozSGiCliI2ajeURDGHjZ2llnA+A67HihCQ+a3amtPhUakd1GlwHxSRvzOZktbEvhPPg==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.19.0.tgz", + "integrity": "sha512-NggSaEZCdSrFddbctrVjkVZvFC6KGfKfNK0CU7mNK/iKHGKbzT4Wmgm08dKpcZECBu9f5FypndoMyRHkdqfT1Q==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "8.18.2", - "@typescript-eslint/type-utils": "8.18.2", - "@typescript-eslint/utils": "8.18.2", - "@typescript-eslint/visitor-keys": "8.18.2", + "@typescript-eslint/scope-manager": "8.19.0", + "@typescript-eslint/type-utils": "8.19.0", + "@typescript-eslint/utils": "8.19.0", + "@typescript-eslint/visitor-keys": "8.19.0", "graphemer": "^1.4.0", "ignore": "^5.3.1", "natural-compare": "^1.4.0", @@ -1333,14 +1333,14 @@ } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": { - "version": "8.18.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.18.2.tgz", - "integrity": "sha512-YJFSfbd0CJjy14r/EvWapYgV4R5CHzptssoag2M7y3Ra7XNta6GPAJPPP5KGB9j14viYXyrzRO5GkX7CRfo8/g==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.19.0.tgz", + "integrity": "sha512-hkoJiKQS3GQ13TSMEiuNmSCvhz7ujyqD1x3ShbaETATHrck+9RaDdUbt+osXaUuns9OFwrDTTrjtwsU8gJyyRA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.18.2", - "@typescript-eslint/visitor-keys": "8.18.2" + "@typescript-eslint/types": "8.19.0", + "@typescript-eslint/visitor-keys": "8.19.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -1351,9 +1351,9 @@ } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": { - "version": "8.18.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.18.2.tgz", - "integrity": "sha512-Z/zblEPp8cIvmEn6+tPDIHUbRu/0z5lqZ+NvolL5SvXWT5rQy7+Nch83M0++XzO0XrWRFWECgOAyE8bsJTl1GQ==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.19.0.tgz", + "integrity": "sha512-8XQ4Ss7G9WX8oaYvD4OOLCjIQYgRQxO+qCiR2V2s2GxI9AUpo7riNwo6jDhKtTcaJjT8PY54j2Yb33kWtSJsmA==", "dev": true, "license": "MIT", "engines": { @@ -1365,14 +1365,14 @@ } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": { - "version": "8.18.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.18.2.tgz", - "integrity": "sha512-WXAVt595HjpmlfH4crSdM/1bcsqh+1weFRWIa9XMTx/XHZ9TCKMcr725tLYqWOgzKdeDrqVHxFotrvWcEsk2Tg==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.19.0.tgz", + "integrity": "sha512-WW9PpDaLIFW9LCbucMSdYUuGeFUz1OkWYS/5fwZwTA+l2RwlWFdJvReQqMUMBw4yJWJOfqd7An9uwut2Oj8sLw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.18.2", - "@typescript-eslint/visitor-keys": "8.18.2", + "@typescript-eslint/types": "8.19.0", + "@typescript-eslint/visitor-keys": "8.19.0", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", @@ -1392,16 +1392,16 @@ } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": { - "version": "8.18.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.18.2.tgz", - "integrity": "sha512-Cr4A0H7DtVIPkauj4sTSXVl+VBWewE9/o40KcF3TV9aqDEOWoXF3/+oRXNby3DYzZeCATvbdksYsGZzplwnK/Q==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.19.0.tgz", + "integrity": "sha512-PTBG+0oEMPH9jCZlfg07LCB2nYI0I317yyvXGfxnvGvw4SHIOuRnQ3kadyyXY6tGdChusIHIbM5zfIbp4M6tCg==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "8.18.2", - "@typescript-eslint/types": "8.18.2", - "@typescript-eslint/typescript-estree": "8.18.2" + "@typescript-eslint/scope-manager": "8.19.0", + "@typescript-eslint/types": "8.19.0", + "@typescript-eslint/typescript-estree": "8.19.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -1416,13 +1416,13 @@ } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": { - "version": "8.18.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.18.2.tgz", - "integrity": "sha512-zORcwn4C3trOWiCqFQP1x6G3xTRyZ1LYydnj51cRnJ6hxBlr/cKPckk+PKPUw/fXmvfKTcw7bwY3w9izgx5jZw==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.19.0.tgz", + "integrity": "sha512-mCFtBbFBJDCNCWUl5y6sZSCHXw1DEFEk3c/M3nRK2a4XUB8StGFtmcEMizdjKuBzB6e/smJAAWYug3VrdLMr1w==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.18.2", + "@typescript-eslint/types": "8.19.0", "eslint-visitor-keys": "^4.2.0" }, "engines": { @@ -1473,16 +1473,16 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "8.18.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.18.2.tgz", - "integrity": "sha512-y7tcq4StgxQD4mDr9+Jb26dZ+HTZ/SkfqpXSiqeUXZHxOUyjWDKsmwKhJ0/tApR08DgOhrFAoAhyB80/p3ViuA==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.19.0.tgz", + "integrity": "sha512-6M8taKyOETY1TKHp0x8ndycipTVgmp4xtg5QpEZzXxDhNvvHOJi5rLRkLr8SK3jTgD5l4fTlvBiRdfsuWydxBw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/scope-manager": "8.18.2", - "@typescript-eslint/types": "8.18.2", - "@typescript-eslint/typescript-estree": "8.18.2", - "@typescript-eslint/visitor-keys": "8.18.2", + "@typescript-eslint/scope-manager": "8.19.0", + "@typescript-eslint/types": "8.19.0", + "@typescript-eslint/typescript-estree": "8.19.0", + "@typescript-eslint/visitor-keys": "8.19.0", "debug": "^4.3.4" }, "engines": { @@ -1498,14 +1498,14 @@ } }, "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": { - "version": "8.18.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.18.2.tgz", - "integrity": "sha512-YJFSfbd0CJjy14r/EvWapYgV4R5CHzptssoag2M7y3Ra7XNta6GPAJPPP5KGB9j14viYXyrzRO5GkX7CRfo8/g==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.19.0.tgz", + "integrity": "sha512-hkoJiKQS3GQ13TSMEiuNmSCvhz7ujyqD1x3ShbaETATHrck+9RaDdUbt+osXaUuns9OFwrDTTrjtwsU8gJyyRA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.18.2", - "@typescript-eslint/visitor-keys": "8.18.2" + "@typescript-eslint/types": "8.19.0", + "@typescript-eslint/visitor-keys": "8.19.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -1516,9 +1516,9 @@ } }, "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": { - "version": "8.18.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.18.2.tgz", - "integrity": "sha512-Z/zblEPp8cIvmEn6+tPDIHUbRu/0z5lqZ+NvolL5SvXWT5rQy7+Nch83M0++XzO0XrWRFWECgOAyE8bsJTl1GQ==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.19.0.tgz", + "integrity": "sha512-8XQ4Ss7G9WX8oaYvD4OOLCjIQYgRQxO+qCiR2V2s2GxI9AUpo7riNwo6jDhKtTcaJjT8PY54j2Yb33kWtSJsmA==", "dev": true, "license": "MIT", "engines": { @@ -1530,14 +1530,14 @@ } }, "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": { - "version": "8.18.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.18.2.tgz", - "integrity": "sha512-WXAVt595HjpmlfH4crSdM/1bcsqh+1weFRWIa9XMTx/XHZ9TCKMcr725tLYqWOgzKdeDrqVHxFotrvWcEsk2Tg==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.19.0.tgz", + "integrity": "sha512-WW9PpDaLIFW9LCbucMSdYUuGeFUz1OkWYS/5fwZwTA+l2RwlWFdJvReQqMUMBw4yJWJOfqd7An9uwut2Oj8sLw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.18.2", - "@typescript-eslint/visitor-keys": "8.18.2", + "@typescript-eslint/types": "8.19.0", + "@typescript-eslint/visitor-keys": "8.19.0", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", @@ -1557,13 +1557,13 @@ } }, "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": { - "version": "8.18.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.18.2.tgz", - "integrity": "sha512-zORcwn4C3trOWiCqFQP1x6G3xTRyZ1LYydnj51cRnJ6hxBlr/cKPckk+PKPUw/fXmvfKTcw7bwY3w9izgx5jZw==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.19.0.tgz", + "integrity": "sha512-mCFtBbFBJDCNCWUl5y6sZSCHXw1DEFEk3c/M3nRK2a4XUB8StGFtmcEMizdjKuBzB6e/smJAAWYug3VrdLMr1w==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.18.2", + "@typescript-eslint/types": "8.19.0", "eslint-visitor-keys": "^4.2.0" }, "engines": { @@ -1632,14 +1632,14 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.18.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.18.2.tgz", - "integrity": "sha512-AB/Wr1Lz31bzHfGm/jgbFR0VB0SML/hd2P1yxzKDM48YmP7vbyJNHRExUE/wZsQj2wUCvbWH8poNHFuxLqCTnA==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.19.0.tgz", + "integrity": "sha512-TZs0I0OSbd5Aza4qAMpp1cdCYVnER94IziudE3JU328YUHgWu9gwiwhag+fuLeJ2LkWLXI+F/182TbG+JaBdTg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/typescript-estree": "8.18.2", - "@typescript-eslint/utils": "8.18.2", + "@typescript-eslint/typescript-estree": "8.19.0", + "@typescript-eslint/utils": "8.19.0", "debug": "^4.3.4", "ts-api-utils": "^1.3.0" }, @@ -1656,14 +1656,14 @@ } }, "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/scope-manager": { - "version": "8.18.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.18.2.tgz", - "integrity": "sha512-YJFSfbd0CJjy14r/EvWapYgV4R5CHzptssoag2M7y3Ra7XNta6GPAJPPP5KGB9j14viYXyrzRO5GkX7CRfo8/g==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.19.0.tgz", + "integrity": "sha512-hkoJiKQS3GQ13TSMEiuNmSCvhz7ujyqD1x3ShbaETATHrck+9RaDdUbt+osXaUuns9OFwrDTTrjtwsU8gJyyRA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.18.2", - "@typescript-eslint/visitor-keys": "8.18.2" + "@typescript-eslint/types": "8.19.0", + "@typescript-eslint/visitor-keys": "8.19.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -1674,9 +1674,9 @@ } }, "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": { - "version": "8.18.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.18.2.tgz", - "integrity": "sha512-Z/zblEPp8cIvmEn6+tPDIHUbRu/0z5lqZ+NvolL5SvXWT5rQy7+Nch83M0++XzO0XrWRFWECgOAyE8bsJTl1GQ==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.19.0.tgz", + "integrity": "sha512-8XQ4Ss7G9WX8oaYvD4OOLCjIQYgRQxO+qCiR2V2s2GxI9AUpo7riNwo6jDhKtTcaJjT8PY54j2Yb33kWtSJsmA==", "dev": true, "license": "MIT", "engines": { @@ -1688,14 +1688,14 @@ } }, "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": { - "version": "8.18.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.18.2.tgz", - "integrity": "sha512-WXAVt595HjpmlfH4crSdM/1bcsqh+1weFRWIa9XMTx/XHZ9TCKMcr725tLYqWOgzKdeDrqVHxFotrvWcEsk2Tg==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.19.0.tgz", + "integrity": "sha512-WW9PpDaLIFW9LCbucMSdYUuGeFUz1OkWYS/5fwZwTA+l2RwlWFdJvReQqMUMBw4yJWJOfqd7An9uwut2Oj8sLw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.18.2", - "@typescript-eslint/visitor-keys": "8.18.2", + "@typescript-eslint/types": "8.19.0", + "@typescript-eslint/visitor-keys": "8.19.0", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", @@ -1715,16 +1715,16 @@ } }, "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/utils": { - "version": "8.18.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.18.2.tgz", - "integrity": "sha512-Cr4A0H7DtVIPkauj4sTSXVl+VBWewE9/o40KcF3TV9aqDEOWoXF3/+oRXNby3DYzZeCATvbdksYsGZzplwnK/Q==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.19.0.tgz", + "integrity": "sha512-PTBG+0oEMPH9jCZlfg07LCB2nYI0I317yyvXGfxnvGvw4SHIOuRnQ3kadyyXY6tGdChusIHIbM5zfIbp4M6tCg==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "8.18.2", - "@typescript-eslint/types": "8.18.2", - "@typescript-eslint/typescript-estree": "8.18.2" + "@typescript-eslint/scope-manager": "8.19.0", + "@typescript-eslint/types": "8.19.0", + "@typescript-eslint/typescript-estree": "8.19.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -1739,13 +1739,13 @@ } }, "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": { - "version": "8.18.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.18.2.tgz", - "integrity": "sha512-zORcwn4C3trOWiCqFQP1x6G3xTRyZ1LYydnj51cRnJ6hxBlr/cKPckk+PKPUw/fXmvfKTcw7bwY3w9izgx5jZw==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.19.0.tgz", + "integrity": "sha512-mCFtBbFBJDCNCWUl5y6sZSCHXw1DEFEk3c/M3nRK2a4XUB8StGFtmcEMizdjKuBzB6e/smJAAWYug3VrdLMr1w==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.18.2", + "@typescript-eslint/types": "8.19.0", "eslint-visitor-keys": "^4.2.0" }, "engines": { @@ -7624,13 +7624,14 @@ "license": "MIT" }, "node_modules/uuid": { - "version": "11.0.3", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.0.3.tgz", - "integrity": "sha512-d0z310fCWv5dJwnX1Y/MncBAqGMKEzlBb1AOf7z9K8ALnd0utBX/msg/fA0+sbyN1ihbMsLhrBlnl1ak7Wa0rg==", + "version": "11.0.4", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.0.4.tgz", + "integrity": "sha512-IzL6VtTTYcAhA/oghbFJ1Dkmqev+FpQWnCBaKq/gUluLxliWvO8DPFWfIviRmYbtaavtSQe4WBL++rFjdcGWEg==", "funding": [ "https://github.com/sponsors/broofa", "https://github.com/sponsors/ctavan" ], + "license": "MIT", "bin": { "uuid": "dist/esm/bin/uuid" } diff --git a/node_modules/@typescript-eslint/eslint-plugin/dist/rules/array-type.js b/node_modules/@typescript-eslint/eslint-plugin/dist/rules/array-type.js index cb4ad9fbfa..2606900425 100644 --- a/node_modules/@typescript-eslint/eslint-plugin/dist/rules/array-type.js +++ b/node_modules/@typescript-eslint/eslint-plugin/dist/rules/array-type.js @@ -60,6 +60,7 @@ function typeNeedsParentheses(node) { case utils_1.AST_NODE_TYPES.TSTypeOperator: case utils_1.AST_NODE_TYPES.TSInferType: case utils_1.AST_NODE_TYPES.TSConstructorType: + case utils_1.AST_NODE_TYPES.TSConditionalType: return true; case utils_1.AST_NODE_TYPES.Identifier: return node.name === 'ReadonlyArray'; diff --git a/node_modules/@typescript-eslint/eslint-plugin/dist/rules/array-type.js.map b/node_modules/@typescript-eslint/eslint-plugin/dist/rules/array-type.js.map index 7890773f47..baabc2b419 100644 --- a/node_modules/@typescript-eslint/eslint-plugin/dist/rules/array-type.js.map +++ b/node_modules/@typescript-eslint/eslint-plugin/dist/rules/array-type.js.map @@ -1 +1 @@ -{"version":3,"file":"array-type.js","sourceRoot":"","sources":["../../src/rules/array-type.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"array-type.js","sourceRoot":"","sources":["../../src/rules/array-type.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/node_modules/@typescript-eslint/eslint-plugin/dist/rules/await-thenable.js b/node_modules/@typescript-eslint/eslint-plugin/dist/rules/await-thenable.js index 6161a2b87c..17fc2381f0 100644 --- a/node_modules/@typescript-eslint/eslint-plugin/dist/rules/await-thenable.js +++ b/node_modules/@typescript-eslint/eslint-plugin/dist/rules/await-thenable.js @@ -61,9 +61,10 @@ exports.default = (0, util_1.createRule)({ const checker = services.program.getTypeChecker(); return { AwaitExpression(node) { - const type = services.getTypeAtLocation(node.argument); - const originalNode = services.esTreeNodeToTSNodeMap.get(node); - const certainty = (0, util_1.needsToBeAwaited)(checker, originalNode, type); + const awaitArgumentEsNode = node.argument; + const awaitArgumentType = services.getTypeAtLocation(awaitArgumentEsNode); + const awaitArgumentTsNode = services.esTreeNodeToTSNodeMap.get(awaitArgumentEsNode); + const certainty = (0, util_1.needsToBeAwaited)(checker, awaitArgumentTsNode, awaitArgumentType); if (certainty === util_1.Awaitable.Never) { context.report({ node, diff --git a/node_modules/@typescript-eslint/eslint-plugin/dist/rules/await-thenable.js.map b/node_modules/@typescript-eslint/eslint-plugin/dist/rules/await-thenable.js.map index af9dad6912..396d257fb8 100644 --- a/node_modules/@typescript-eslint/eslint-plugin/dist/rules/await-thenable.js.map +++ b/node_modules/@typescript-eslint/eslint-plugin/dist/rules/await-thenable.js.map @@ -1 +1 @@ -{"version":3,"file":"await-thenable.js","sourceRoot":"","sources":["../../src/rules/await-thenable.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"await-thenable.js","sourceRoot":"","sources":["../../src/rules/await-thenable.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/node_modules/@typescript-eslint/eslint-plugin/dist/rules/consistent-indexed-object-style.js b/node_modules/@typescript-eslint/eslint-plugin/dist/rules/consistent-indexed-object-style.js index 43f72b0f1a..1580bcf1dc 100644 --- a/node_modules/@typescript-eslint/eslint-plugin/dist/rules/consistent-indexed-object-style.js +++ b/node_modules/@typescript-eslint/eslint-plugin/dist/rules/consistent-indexed-object-style.js @@ -51,13 +51,9 @@ exports.default = (0, util_1.createRule)({ if (parentId) { const scope = context.sourceCode.getScope(parentId); const superVar = utils_1.ASTUtils.findVariable(scope, parentId.name); - if (superVar) { - const isCircular = superVar.references.some(item => item.isTypeReference && - node.range[0] <= item.identifier.range[0] && - node.range[1] >= item.identifier.range[1]); - if (isCircular) { - return; - } + if (superVar && + isDeeplyReferencingType(node, superVar, new Set([parentId]))) { + return; } } context.report({ @@ -192,4 +188,64 @@ function findParentDeclaration(node) { } return undefined; } +function isDeeplyReferencingType(node, superVar, visited) { + if (visited.has(node)) { + // something on the chain is circular but it's not the reference being checked + return false; + } + visited.add(node); + switch (node.type) { + case utils_1.AST_NODE_TYPES.TSTypeLiteral: + return node.members.some(member => isDeeplyReferencingType(member, superVar, visited)); + case utils_1.AST_NODE_TYPES.TSTypeAliasDeclaration: + return isDeeplyReferencingType(node.typeAnnotation, superVar, visited); + case utils_1.AST_NODE_TYPES.TSIndexedAccessType: + return [node.indexType, node.objectType].some(type => isDeeplyReferencingType(type, superVar, visited)); + case utils_1.AST_NODE_TYPES.TSConditionalType: + return [ + node.checkType, + node.extendsType, + node.falseType, + node.trueType, + ].some(type => isDeeplyReferencingType(type, superVar, visited)); + case utils_1.AST_NODE_TYPES.TSUnionType: + case utils_1.AST_NODE_TYPES.TSIntersectionType: + return node.types.some(type => isDeeplyReferencingType(type, superVar, visited)); + case utils_1.AST_NODE_TYPES.TSInterfaceDeclaration: + return node.body.body.some(type => isDeeplyReferencingType(type, superVar, visited)); + case utils_1.AST_NODE_TYPES.TSTypeAnnotation: + return isDeeplyReferencingType(node.typeAnnotation, superVar, visited); + case utils_1.AST_NODE_TYPES.TSIndexSignature: { + if (node.typeAnnotation) { + return isDeeplyReferencingType(node.typeAnnotation, superVar, visited); + } + break; + } + case utils_1.AST_NODE_TYPES.TSTypeParameterInstantiation: { + return node.params.some(param => isDeeplyReferencingType(param, superVar, visited)); + } + case utils_1.AST_NODE_TYPES.TSTypeReference: { + if (isDeeplyReferencingType(node.typeName, superVar, visited)) { + return true; + } + if (node.typeArguments && + isDeeplyReferencingType(node.typeArguments, superVar, visited)) { + return true; + } + break; + } + case utils_1.AST_NODE_TYPES.Identifier: { + // check if the identifier is a reference of the type being checked + if (superVar.references.some(ref => (0, util_1.isNodeEqual)(ref.identifier, node))) { + return true; + } + // otherwise, follow its definition(s) + const refVar = utils_1.ASTUtils.findVariable(superVar.scope, node.name); + if (refVar) { + return refVar.defs.some(def => isDeeplyReferencingType(def.node, superVar, visited)); + } + } + } + return false; +} //# sourceMappingURL=consistent-indexed-object-style.js.map \ No newline at end of file diff --git a/node_modules/@typescript-eslint/eslint-plugin/dist/rules/consistent-indexed-object-style.js.map b/node_modules/@typescript-eslint/eslint-plugin/dist/rules/consistent-indexed-object-style.js.map index be718270c2..4d055f3c16 100644 --- a/node_modules/@typescript-eslint/eslint-plugin/dist/rules/consistent-indexed-object-style.js.map +++ b/node_modules/@typescript-eslint/eslint-plugin/dist/rules/consistent-indexed-object-style.js.map @@ -1 +1 @@ -{"version":3,"file":"consistent-indexed-object-style.js","sourceRoot":"","sources":["../../src/rules/consistent-indexed-object-style.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"consistent-indexed-object-style.js","sourceRoot":"","sources":["../../src/rules/consistent-indexed-object-style.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/node_modules/@typescript-eslint/eslint-plugin/dist/rules/member-ordering.js b/node_modules/@typescript-eslint/eslint-plugin/dist/rules/member-ordering.js index 1c4b91155b..486361f44b 100644 --- a/node_modules/@typescript-eslint/eslint-plugin/dist/rules/member-ordering.js +++ b/node_modules/@typescript-eslint/eslint-plugin/dist/rules/member-ordering.js @@ -371,6 +371,10 @@ function getAccessibility(node) { */ function getRank(node, orderConfig, supportsModifiers) { const type = getNodeType(node); + if (node.type === utils_1.AST_NODE_TYPES.MethodDefinition && + node.value.type === utils_1.AST_NODE_TYPES.TSEmptyBodyFunctionExpression) { + return -1; + } if (type == null) { // shouldn't happen but just in case, put it on the end return orderConfig.length - 1; diff --git a/node_modules/@typescript-eslint/eslint-plugin/dist/rules/member-ordering.js.map b/node_modules/@typescript-eslint/eslint-plugin/dist/rules/member-ordering.js.map index 442ee739a6..4f4d0a27e8 100644 --- a/node_modules/@typescript-eslint/eslint-plugin/dist/rules/member-ordering.js.map +++ b/node_modules/@typescript-eslint/eslint-plugin/dist/rules/member-ordering.js.map @@ -1 +1 @@ -{"version":3,"file":"member-ordering.js","sourceRoot":"","sources":["../../src/rules/member-ordering.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"member-ordering.js","sourceRoot":"","sources":["../../src/rules/member-ordering.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/node_modules/@typescript-eslint/eslint-plugin/dist/rules/no-unnecessary-boolean-literal-compare.js b/node_modules/@typescript-eslint/eslint-plugin/dist/rules/no-unnecessary-boolean-literal-compare.js index 30eb310226..8902d501a2 100644 --- a/node_modules/@typescript-eslint/eslint-plugin/dist/rules/no-unnecessary-boolean-literal-compare.js +++ b/node_modules/@typescript-eslint/eslint-plugin/dist/rules/no-unnecessary-boolean-literal-compare.js @@ -79,19 +79,23 @@ exports.default = (0, util_1.createRule)({ ], create(context, [options]) { const services = (0, util_1.getParserServices)(context); + const checker = services.program.getTypeChecker(); function getBooleanComparison(node) { const comparison = deconstructComparison(node); if (!comparison) { return undefined; } - const expressionType = (0, util_1.getConstrainedTypeAtLocation)(services, comparison.expression); - if (isBooleanType(expressionType)) { + const { constraintType, isTypeParameter } = (0, util_1.getConstraintInfo)(checker, services.getTypeAtLocation(comparison.expression)); + if (isTypeParameter && constraintType == null) { + return undefined; + } + if (isBooleanType(constraintType)) { return { ...comparison, expressionIsNullableBoolean: false, }; } - if (isNullableBoolean(expressionType)) { + if (isNullableBoolean(constraintType)) { return { ...comparison, expressionIsNullableBoolean: true, diff --git a/node_modules/@typescript-eslint/eslint-plugin/dist/rules/no-unnecessary-boolean-literal-compare.js.map b/node_modules/@typescript-eslint/eslint-plugin/dist/rules/no-unnecessary-boolean-literal-compare.js.map index ea33bc9a23..ff3033adc0 100644 --- a/node_modules/@typescript-eslint/eslint-plugin/dist/rules/no-unnecessary-boolean-literal-compare.js.map +++ b/node_modules/@typescript-eslint/eslint-plugin/dist/rules/no-unnecessary-boolean-literal-compare.js.map @@ -1 +1 @@ -{"version":3,"file":"no-unnecessary-boolean-literal-compare.js","sourceRoot":"","sources":["../../src/rules/no-unnecessary-boolean-literal-compare.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"no-unnecessary-boolean-literal-compare.js","sourceRoot":"","sources":["../../src/rules/no-unnecessary-boolean-literal-compare.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/node_modules/@typescript-eslint/eslint-plugin/dist/rules/no-unnecessary-condition.js b/node_modules/@typescript-eslint/eslint-plugin/dist/rules/no-unnecessary-condition.js index f47e6db068..6cfaf3f8a6 100644 --- a/node_modules/@typescript-eslint/eslint-plugin/dist/rules/no-unnecessary-condition.js +++ b/node_modules/@typescript-eslint/eslint-plugin/dist/rules/no-unnecessary-condition.js @@ -472,15 +472,7 @@ exports.default = (0, util_1.createRule)({ // Otherwise just do type analysis on the function as a whole. const returnTypes = tsutils .getCallSignaturesOfType((0, util_1.getConstrainedTypeAtLocation)(services, callback)) - .map(sig => sig.getReturnType()) - .map(t => { - // TODO: use `getConstraintTypeInfoAtLocation` once it's merged - // https://github.com/typescript-eslint/typescript-eslint/pull/10496 - if (tsutils.isTypeParameter(t)) { - return checker.getBaseConstraintOfType(t); - } - return t; - }); + .map(sig => sig.getReturnType()); if (returnTypes.length === 0) { // Not a callable function, e.g. `any` return; @@ -488,14 +480,17 @@ exports.default = (0, util_1.createRule)({ let hasFalsyReturnTypes = false; let hasTruthyReturnTypes = false; for (const type of returnTypes) { + const { constraintType } = (0, util_1.getConstraintInfo)(checker, type); // Predicate is always necessary if it involves `any` or `unknown` - if (!type || (0, util_1.isTypeAnyType)(type) || (0, util_1.isTypeUnknownType)(type)) { + if (!constraintType || + (0, util_1.isTypeAnyType)(constraintType) || + (0, util_1.isTypeUnknownType)(constraintType)) { return; } - if (isPossiblyFalsy(type)) { + if (isPossiblyFalsy(constraintType)) { hasFalsyReturnTypes = true; } - if (isPossiblyTruthy(type)) { + if (isPossiblyTruthy(constraintType)) { hasTruthyReturnTypes = true; } // bail early if both a possibly-truthy and a possibly-falsy have been detected diff --git a/node_modules/@typescript-eslint/eslint-plugin/dist/rules/no-unnecessary-condition.js.map b/node_modules/@typescript-eslint/eslint-plugin/dist/rules/no-unnecessary-condition.js.map index 52029b1336..327e780189 100644 --- a/node_modules/@typescript-eslint/eslint-plugin/dist/rules/no-unnecessary-condition.js.map +++ b/node_modules/@typescript-eslint/eslint-plugin/dist/rules/no-unnecessary-condition.js.map @@ -1 +1 @@ -{"version":3,"file":"no-unnecessary-condition.js","sourceRoot":"","sources":["../../src/rules/no-unnecessary-condition.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"no-unnecessary-condition.js","sourceRoot":"","sources":["../../src/rules/no-unnecessary-condition.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/node_modules/@typescript-eslint/eslint-plugin/dist/rules/strict-boolean-expressions.js b/node_modules/@typescript-eslint/eslint-plugin/dist/rules/strict-boolean-expressions.js index 87e711aa84..94f8212515 100644 --- a/node_modules/@typescript-eslint/eslint-plugin/dist/rules/strict-boolean-expressions.js +++ b/node_modules/@typescript-eslint/eslint-plugin/dist/rules/strict-boolean-expressions.js @@ -82,7 +82,10 @@ exports.default = (0, util_1.createRule)({ conditionFixDefaultEmptyString: 'Explicitly treat nullish value the same as an empty string (`value ?? ""`)', conditionFixDefaultFalse: 'Explicitly treat nullish value the same as false (`value ?? false`)', conditionFixDefaultZero: 'Explicitly treat nullish value the same as 0 (`value ?? 0`)', + explicitBooleanReturnType: 'Add an explicit `boolean` return type annotation.', noStrictNullCheck: 'This rule requires the `strictNullChecks` compiler option to be turned on to function correctly.', + predicateCannotBeAsync: "Predicate function should not be 'async'; expected a boolean return type.", + predicateReturnsNonBoolean: 'Predicate function should return a boolean.', }, schema: [ { @@ -203,6 +206,69 @@ exports.default = (0, util_1.createRule)({ if (assertedArgument != null) { traverseNode(assertedArgument, true); } + if ((0, util_1.isArrayMethodCallWithPredicate)(context, services, node)) { + const predicate = node.arguments.at(0); + if (predicate) { + checkArrayMethodCallPredicate(predicate); + } + } + } + /** + * Dedicated function to check array method predicate calls. Reports predicate + * arguments that don't return a boolean value. + * + * Ignores the `allow*` options and requires a boolean value. + */ + function checkArrayMethodCallPredicate(predicateNode) { + const isFunctionExpression = utils_1.ASTUtils.isFunction(predicateNode); + // custom message for accidental `async` function expressions + if (isFunctionExpression && predicateNode.async) { + return context.report({ + node: predicateNode, + messageId: 'predicateCannotBeAsync', + }); + } + const returnTypes = services + .getTypeAtLocation(predicateNode) + .getCallSignatures() + .map(signature => { + const type = signature.getReturnType(); + if (tsutils.isTypeParameter(type)) { + return checker.getBaseConstraintOfType(type) ?? type; + } + return type; + }); + if (returnTypes.every(returnType => isBooleanType(returnType))) { + return; + } + const canFix = isFunctionExpression && !predicateNode.returnType; + return context.report({ + node: predicateNode, + messageId: 'predicateReturnsNonBoolean', + suggest: canFix + ? [ + { + messageId: 'explicitBooleanReturnType', + fix: fixer => { + if (predicateNode.type === + utils_1.AST_NODE_TYPES.ArrowFunctionExpression && + (0, util_1.isParenlessArrowFunction)(predicateNode, context.sourceCode)) { + return [ + fixer.insertTextBefore(predicateNode.params[0], '('), + fixer.insertTextAfter(predicateNode.params[0], '): boolean'), + ]; + } + if (predicateNode.params.length === 0) { + const closingBracket = (0, util_1.nullThrows)(context.sourceCode.getFirstToken(predicateNode, token => token.value === ')'), 'function expression has to have a closing parenthesis.'); + return fixer.insertTextAfter(closingBracket, ': boolean'); + } + const lastClosingParenthesis = (0, util_1.nullThrows)(context.sourceCode.getTokenAfter(predicateNode.params[predicateNode.params.length - 1], token => token.value === ')'), 'function expression has to have a closing parenthesis.'); + return fixer.insertTextAfter(lastClosingParenthesis, ': boolean'); + }, + }, + ] + : null, + }); } /** * Inspects any node. @@ -843,6 +909,9 @@ function isArrayLengthExpression(node, typeChecker, services) { */ function isBrandedBoolean(type) { return (type.isIntersection() && - type.types.some(childType => tsutils.isTypeFlagSet(childType, ts.TypeFlags.BooleanLiteral | ts.TypeFlags.Boolean))); + type.types.some(childType => isBooleanType(childType))); +} +function isBooleanType(expressionType) { + return tsutils.isTypeFlagSet(expressionType, ts.TypeFlags.Boolean | ts.TypeFlags.BooleanLiteral); } //# sourceMappingURL=strict-boolean-expressions.js.map \ No newline at end of file diff --git a/node_modules/@typescript-eslint/eslint-plugin/dist/rules/strict-boolean-expressions.js.map b/node_modules/@typescript-eslint/eslint-plugin/dist/rules/strict-boolean-expressions.js.map index 09b996d5b2..0f059fcf55 100644 --- a/node_modules/@typescript-eslint/eslint-plugin/dist/rules/strict-boolean-expressions.js.map +++ b/node_modules/@typescript-eslint/eslint-plugin/dist/rules/strict-boolean-expressions.js.map @@ -1 +1 @@ -{"version":3,"file":"strict-boolean-expressions.js","sourceRoot":"","sources":["../../src/rules/strict-boolean-expressions.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"strict-boolean-expressions.js","sourceRoot":"","sources":["../../src/rules/strict-boolean-expressions.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/node_modules/@typescript-eslint/eslint-plugin/dist/util/getConstraintInfo.js b/node_modules/@typescript-eslint/eslint-plugin/dist/util/getConstraintInfo.js new file mode 100644 index 0000000000..b3e3876878 --- /dev/null +++ b/node_modules/@typescript-eslint/eslint-plugin/dist/util/getConstraintInfo.js @@ -0,0 +1,71 @@ +"use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); +Object.defineProperty(exports, "__esModule", { value: true }); +exports.getConstraintInfo = getConstraintInfo; +const tsutils = __importStar(require("ts-api-utils")); +/** + * Returns whether the type is a generic and what its constraint is. + * + * If the type is not a generic, `isTypeParameter` will be `false`, and + * `constraintType` will be the same as the input type. + * + * If the type is a generic, and it is constrained, `isTypeParameter` will be + * `true`, and `constraintType` will be the constraint type. + * + * If the type is a generic, but it is not constrained, `constraintType` will be + * `undefined` (rather than an `unknown` type), due to https://github.com/microsoft/TypeScript/issues/60475 + * + * Successor to {@link getConstrainedTypeAtLocation} due to https://github.com/typescript-eslint/typescript-eslint/issues/10438 + * + * This is considered internal since it is unstable for now and may have breaking changes at any time. + * Use at your own risk. + * + * @internal + * + */ +function getConstraintInfo(checker, type) { + if (tsutils.isTypeParameter(type)) { + const constraintType = checker.getBaseConstraintOfType(type); + return { + constraintType, + isTypeParameter: true, + }; + } + return { + constraintType: type, + isTypeParameter: false, + }; +} +//# sourceMappingURL=getConstraintInfo.js.map \ No newline at end of file diff --git a/node_modules/@typescript-eslint/eslint-plugin/dist/util/getConstraintInfo.js.map b/node_modules/@typescript-eslint/eslint-plugin/dist/util/getConstraintInfo.js.map new file mode 100644 index 0000000000..e9dee2d785 --- /dev/null +++ b/node_modules/@typescript-eslint/eslint-plugin/dist/util/getConstraintInfo.js.map @@ -0,0 +1 @@ +{"version":3,"file":"getConstraintInfo.js","sourceRoot":"","sources":["../../src/util/getConstraintInfo.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA4CA,8CAeC;AAzDD,sDAAwC;AAsBxC;;;;;;;;;;;;;;;;;;;GAmBG;AACH,SAAgB,iBAAiB,CAC/B,OAAuB,EACvB,IAAa;IAEb,IAAI,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC;QAClC,MAAM,cAAc,GAAG,OAAO,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC;QAC7D,OAAO;YACL,cAAc;YACd,eAAe,EAAE,IAAI;SACtB,CAAC;IACJ,CAAC;IACD,OAAO;QACL,cAAc,EAAE,IAAI;QACpB,eAAe,EAAE,KAAK;KACvB,CAAC;AACJ,CAAC"} \ No newline at end of file diff --git a/node_modules/@typescript-eslint/eslint-plugin/dist/util/index.js b/node_modules/@typescript-eslint/eslint-plugin/dist/util/index.js index 860e8b60d7..df8b40e45a 100644 --- a/node_modules/@typescript-eslint/eslint-plugin/dist/util/index.js +++ b/node_modules/@typescript-eslint/eslint-plugin/dist/util/index.js @@ -39,6 +39,7 @@ __exportStar(require("./objectIterators"), exports); __exportStar(require("./needsToBeAwaited"), exports); __exportStar(require("./scopeUtils"), exports); __exportStar(require("./types"), exports); +__exportStar(require("./getConstraintInfo"), exports); // this is done for convenience - saves migrating all of the old rules __exportStar(require("@typescript-eslint/type-utils"), exports); const { applyDefault, deepMerge, getParserServices, isObjectNotArray, nullThrows, NullThrowsReasons, } = utils_1.ESLintUtils; diff --git a/node_modules/@typescript-eslint/eslint-plugin/dist/util/index.js.map b/node_modules/@typescript-eslint/eslint-plugin/dist/util/index.js.map index 1cdac1f49f..a5e60bdc09 100644 --- a/node_modules/@typescript-eslint/eslint-plugin/dist/util/index.js.map +++ b/node_modules/@typescript-eslint/eslint-plugin/dist/util/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,oDAAuD;AAEvD,6CAA2B;AAC3B,2DAAyC;AACzC,+CAA6B;AAC7B,oDAAkC;AAClC,uDAAqC;AACrC,0DAAwC;AACxC,yDAAuC;AACvC,oDAAkC;AAClC,2DAAyC;AACzC,sDAAoC;AACpC,qDAAmC;AACnC,mEAAiD;AACjD,+CAA6B;AAC7B,gDAA8B;AAC9B,kDAAgC;AAChC,iEAA+C;AAC/C,0DAAwC;AACxC,yCAAuB;AACvB,4DAA0C;AAC1C,oDAAkC;AAClC,qDAAmC;AACnC,+CAA6B;AAC7B,0CAAwB;AAExB,sEAAsE;AACtE,gEAA8C;AAC9C,MAAM,EACJ,YAAY,EACZ,SAAS,EACT,iBAAiB,EACjB,gBAAgB,EAChB,UAAU,EACV,iBAAiB,GAClB,GAAG,mBAAW,CAAC;AAMd,oCAAY;AACZ,8BAAS;AACT,8CAAiB;AAGjB,4CAAgB;AAChB,gCAAU;AACV,8CAAiB"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,oDAAuD;AAEvD,6CAA2B;AAC3B,2DAAyC;AACzC,+CAA6B;AAC7B,oDAAkC;AAClC,uDAAqC;AACrC,0DAAwC;AACxC,yDAAuC;AACvC,oDAAkC;AAClC,2DAAyC;AACzC,sDAAoC;AACpC,qDAAmC;AACnC,mEAAiD;AACjD,+CAA6B;AAC7B,gDAA8B;AAC9B,kDAAgC;AAChC,iEAA+C;AAC/C,0DAAwC;AACxC,yCAAuB;AACvB,4DAA0C;AAC1C,oDAAkC;AAClC,qDAAmC;AACnC,+CAA6B;AAC7B,0CAAwB;AACxB,sDAAoC;AAEpC,sEAAsE;AACtE,gEAA8C;AAE9C,MAAM,EACJ,YAAY,EACZ,SAAS,EACT,iBAAiB,EACjB,gBAAgB,EAChB,UAAU,EACV,iBAAiB,GAClB,GAAG,mBAAW,CAAC;AAMd,oCAAY;AACZ,8BAAS;AACT,8CAAiB;AAGjB,4CAAgB;AAChB,gCAAU;AACV,8CAAiB"} \ No newline at end of file diff --git a/node_modules/@typescript-eslint/eslint-plugin/dist/util/needsToBeAwaited.js b/node_modules/@typescript-eslint/eslint-plugin/dist/util/needsToBeAwaited.js index 719f147fad..d2a89b02a3 100644 --- a/node_modules/@typescript-eslint/eslint-plugin/dist/util/needsToBeAwaited.js +++ b/node_modules/@typescript-eslint/eslint-plugin/dist/util/needsToBeAwaited.js @@ -37,6 +37,7 @@ exports.Awaitable = void 0; exports.needsToBeAwaited = needsToBeAwaited; const type_utils_1 = require("@typescript-eslint/type-utils"); const tsutils = __importStar(require("ts-api-utils")); +const getConstraintInfo_1 = require("./getConstraintInfo"); var Awaitable; (function (Awaitable) { Awaitable[Awaitable["Always"] = 0] = "Always"; @@ -44,21 +45,17 @@ var Awaitable; Awaitable[Awaitable["May"] = 2] = "May"; })(Awaitable || (exports.Awaitable = Awaitable = {})); function needsToBeAwaited(checker, node, type) { - // can't use `getConstrainedTypeAtLocation` directly since it's bugged for - // unconstrained generics. - const constrainedType = !tsutils.isTypeParameter(type) - ? type - : checker.getBaseConstraintOfType(type); + const { constraintType, isTypeParameter } = (0, getConstraintInfo_1.getConstraintInfo)(checker, type); // unconstrained generic types should be treated as unknown - if (constrainedType == null) { + if (isTypeParameter && constraintType == null) { return Awaitable.May; } // `any` and `unknown` types may need to be awaited - if ((0, type_utils_1.isTypeAnyType)(constrainedType) || (0, type_utils_1.isTypeUnknownType)(constrainedType)) { + if ((0, type_utils_1.isTypeAnyType)(constraintType) || (0, type_utils_1.isTypeUnknownType)(constraintType)) { return Awaitable.May; } // 'thenable' values should always be be awaited - if (tsutils.isThenableType(checker, node, constrainedType)) { + if (tsutils.isThenableType(checker, node, constraintType)) { return Awaitable.Always; } // anything else should not be awaited diff --git a/node_modules/@typescript-eslint/eslint-plugin/dist/util/needsToBeAwaited.js.map b/node_modules/@typescript-eslint/eslint-plugin/dist/util/needsToBeAwaited.js.map index 9e8c72ac82..1115c93390 100644 --- a/node_modules/@typescript-eslint/eslint-plugin/dist/util/needsToBeAwaited.js.map +++ b/node_modules/@typescript-eslint/eslint-plugin/dist/util/needsToBeAwaited.js.map @@ -1 +1 @@ -{"version":3,"file":"needsToBeAwaited.js","sourceRoot":"","sources":["../../src/util/needsToBeAwaited.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAcA,4CA4BC;AAxCD,8DAGuC;AACvC,sDAAwC;AAExC,IAAY,SAIX;AAJD,WAAY,SAAS;IACnB,6CAAM,CAAA;IACN,2CAAK,CAAA;IACL,uCAAG,CAAA;AACL,CAAC,EAJW,SAAS,yBAAT,SAAS,QAIpB;AAED,SAAgB,gBAAgB,CAC9B,OAAuB,EACvB,IAAa,EACb,IAAa;IAEb,0EAA0E;IAC1E,0BAA0B;IAC1B,MAAM,eAAe,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC;QACpD,CAAC,CAAC,IAAI;QACN,CAAC,CAAC,OAAO,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC;IAE1C,2DAA2D;IAC3D,IAAI,eAAe,IAAI,IAAI,EAAE,CAAC;QAC5B,OAAO,SAAS,CAAC,GAAG,CAAC;IACvB,CAAC;IAED,mDAAmD;IACnD,IAAI,IAAA,0BAAa,EAAC,eAAe,CAAC,IAAI,IAAA,8BAAiB,EAAC,eAAe,CAAC,EAAE,CAAC;QACzE,OAAO,SAAS,CAAC,GAAG,CAAC;IACvB,CAAC;IAED,gDAAgD;IAChD,IAAI,OAAO,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,EAAE,eAAe,CAAC,EAAE,CAAC;QAC3D,OAAO,SAAS,CAAC,MAAM,CAAC;IAC1B,CAAC;IAED,sCAAsC;IACtC,OAAO,SAAS,CAAC,KAAK,CAAC;AACzB,CAAC"} \ No newline at end of file +{"version":3,"file":"needsToBeAwaited.js","sourceRoot":"","sources":["../../src/util/needsToBeAwaited.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAgBA,4CAwBC;AAtCD,8DAGuC;AACvC,sDAAwC;AAExC,2DAAwD;AAExD,IAAY,SAIX;AAJD,WAAY,SAAS;IACnB,6CAAM,CAAA;IACN,2CAAK,CAAA;IACL,uCAAG,CAAA;AACL,CAAC,EAJW,SAAS,yBAAT,SAAS,QAIpB;AAED,SAAgB,gBAAgB,CAC9B,OAAuB,EACvB,IAAa,EACb,IAAa;IAEb,MAAM,EAAE,cAAc,EAAE,eAAe,EAAE,GAAG,IAAA,qCAAiB,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAE7E,2DAA2D;IAC3D,IAAI,eAAe,IAAI,cAAc,IAAI,IAAI,EAAE,CAAC;QAC9C,OAAO,SAAS,CAAC,GAAG,CAAC;IACvB,CAAC;IAED,mDAAmD;IACnD,IAAI,IAAA,0BAAa,EAAC,cAAc,CAAC,IAAI,IAAA,8BAAiB,EAAC,cAAc,CAAC,EAAE,CAAC;QACvE,OAAO,SAAS,CAAC,GAAG,CAAC;IACvB,CAAC;IAED,gDAAgD;IAChD,IAAI,OAAO,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,EAAE,cAAc,CAAC,EAAE,CAAC;QAC1D,OAAO,SAAS,CAAC,MAAM,CAAC;IAC1B,CAAC;IAED,sCAAsC;IACtC,OAAO,SAAS,CAAC,KAAK,CAAC;AACzB,CAAC"} \ No newline at end of file diff --git a/node_modules/@typescript-eslint/eslint-plugin/docs/rules/strict-boolean-expressions.mdx b/node_modules/@typescript-eslint/eslint-plugin/docs/rules/strict-boolean-expressions.mdx index 94e647872a..c0e71ec42c 100644 --- a/node_modules/@typescript-eslint/eslint-plugin/docs/rules/strict-boolean-expressions.mdx +++ b/node_modules/@typescript-eslint/eslint-plugin/docs/rules/strict-boolean-expressions.mdx @@ -22,6 +22,7 @@ The following nodes are considered boolean expressions and their type is checked - Right-hand side operand is ignored when it's not a descendant of another boolean expression. This is to allow usage of boolean operators for their short-circuiting behavior. - Asserted argument of an assertion function (`assert(arg)`). +- Return type of array predicate functions such as `filter()`, `some()`, etc. ## Examples @@ -61,6 +62,9 @@ while (obj) { declare function assert(value: unknown): asserts value; let maybeString = Math.random() > 0.5 ? '' : undefined; assert(maybeString); + +// array predicates' return types are boolean contexts. +['one', null].filter(x => x); ``` diff --git a/node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager/package.json b/node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager/package.json index f91543e081..7665258566 100644 --- a/node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager/package.json +++ b/node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager/package.json @@ -1,6 +1,6 @@ { "name": "@typescript-eslint/scope-manager", - "version": "8.18.2", + "version": "8.19.0", "description": "TypeScript scope analyser for ESLint", "files": [ "dist", @@ -46,13 +46,13 @@ "typecheck": "npx nx typecheck" }, "dependencies": { - "@typescript-eslint/types": "8.18.2", - "@typescript-eslint/visitor-keys": "8.18.2" + "@typescript-eslint/types": "8.19.0", + "@typescript-eslint/visitor-keys": "8.19.0" }, "devDependencies": { "@jest/types": "29.6.3", "@types/glob": "*", - "@typescript-eslint/typescript-estree": "8.18.2", + "@typescript-eslint/typescript-estree": "8.19.0", "glob": "*", "jest-specific-snapshot": "*", "make-dir": "*", diff --git a/node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types/package.json b/node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types/package.json index 8b84acea4c..50ed2e2b8d 100644 --- a/node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types/package.json +++ b/node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types/package.json @@ -1,6 +1,6 @@ { "name": "@typescript-eslint/types", - "version": "8.18.2", + "version": "8.19.0", "description": "Types for the TypeScript-ESTree AST spec", "files": [ "dist", diff --git a/node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree/package.json b/node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree/package.json index 5c64ff4d89..a9b75afc04 100644 --- a/node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree/package.json +++ b/node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree/package.json @@ -1,6 +1,6 @@ { "name": "@typescript-eslint/typescript-estree", - "version": "8.18.2", + "version": "8.19.0", "description": "A parser that converts TypeScript source code into an ESTree compatible form", "files": [ "dist", @@ -54,8 +54,8 @@ "typecheck": "tsc --noEmit" }, "dependencies": { - "@typescript-eslint/types": "8.18.2", - "@typescript-eslint/visitor-keys": "8.18.2", + "@typescript-eslint/types": "8.19.0", + "@typescript-eslint/visitor-keys": "8.19.0", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", diff --git a/node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils/dist/json-schema.d.ts.map b/node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils/dist/json-schema.d.ts.map index 780f1c3720..7e85351c44 100644 --- a/node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils/dist/json-schema.d.ts.map +++ b/node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils/dist/json-schema.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"json-schema.d.ts","sourceRoot":"","sources":["../src/json-schema.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAMH;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAC3B,KAAK,GACL,OAAO,GACP,SAAS,GACT,SAAS,GACT,MAAM,GACN,QAAQ,GACR,QAAQ,GACR,QAAQ,CAAC;AAEb;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;AAE/D,MAAM,MAAM,uBAAuB,GAC/B,gBAAgB,GAChB,iBAAiB,GACjB,eAAe,CAAC;AAKpB,MAAM,WAAW,iBAAiB;IAChC,CAAC,GAAG,EAAE,MAAM,GAAG,uBAAuB,CAAC;CACxC;AAKD,MAAM,WAAW,gBAAiB,SAAQ,KAAK,CAAC,uBAAuB,CAAC;CAAG;AAE3E;;;;;;;;;;;;GAYG;AACH,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAC;AAExC;;;GAGG;AACH,MAAM,MAAM,WAAW,GACnB,sBAAsB,GACtB,sBAAsB,GACtB,oBAAoB,GACpB,sBAAsB,GACtB,wBAAwB,GACxB,sBAAsB,GACtB,qBAAqB,GACrB,uBAAuB,GACvB,uBAAuB,GACvB,sBAAsB,GACtB,oBAAoB,GACpB,uBAAuB,CAAC;AAE5B,UAAU,eAAe;IACvB;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,SAAS,CAAC;IAEhD;;;;;;;;;;;;;;OAcG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE1B,OAAO,CAAC,EAAE,kBAAkB,GAAG,SAAS,CAAC;IAEzC;;OAEG;IACH,KAAK,CAAC,EAAE,WAAW,EAAE,GAAG,SAAS,CAAC;IAElC;;OAEG;IACH,KAAK,CAAC,EAAE,WAAW,EAAE,GAAG,SAAS,CAAC;IAElC;;OAEG;IACH,OAAO,CAAC,EAAE,uBAAuB,GAAG,SAAS,CAAC;IAE9C;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,SAAS,CAAC;IAEtD;;;;;OAKG;IACH,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC;;;;;;;;;;;;;;;OAeG;IACH,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,CAAC;IAExC,EAAE,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAExB;;OAEG;IACH,GAAG,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;IAE9B;;OAEG;IACH,KAAK,CAAC,EAAE,WAAW,EAAE,GAAG,SAAS,CAAC;IAElC;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,OAAO,GAAG,MAAM,EAAE,GAAG,SAAS,CAAC;IAE1C;;;;;OAKG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE3B;;OAEG;IACH,IAAI,CAAC,EAAE,mBAAmB,GAAG,mBAAmB,EAAE,GAAG,SAAS,CAAC;CAChE;AAED,MAAM,WAAW,oBAAqB,SAAQ,eAAe;IAC3D,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,SAAS,CAAC;CAClB;AAED,MAAM,WAAW,sBAAuB,SAAQ,eAAe;IAC7D,KAAK,EAAE,WAAW,EAAE,CAAC;IACrB,IAAI,CAAC,EAAE,SAAS,CAAC;CAClB;AAED,MAAM,WAAW,sBAAuB,SAAQ,eAAe;IAC7D,KAAK,EAAE,WAAW,EAAE,CAAC;IACrB,IAAI,CAAC,EAAE,SAAS,CAAC;CAClB;AAED,MAAM,WAAW,sBAAuB,SAAQ,eAAe;IAC7D,KAAK,EAAE,WAAW,EAAE,CAAC;IACrB,IAAI,CAAC,EAAE,SAAS,CAAC;CAClB;AAED,MAAM,WAAW,sBACf,SAAQ,IAAI,CAAC,uBAAuB,EAAE,MAAM,GAAG,MAAM,CAAC,EACpD,IAAI,CAAC,sBAAsB,EAAE,MAAM,GAAG,MAAM,CAAC,EAC7C,IAAI,CAAC,uBAAuB,EAAE,MAAM,GAAG,MAAM,CAAC,EAC9C,IAAI,CAAC,uBAAuB,EAAE,MAAM,GAAG,MAAM,CAAC,EAC9C,IAAI,CAAC,wBAAwB,EAAE,MAAM,GAAG,MAAM,CAAC,EAC/C,IAAI,CAAC,qBAAqB,EAAE,MAAM,GAAG,MAAM,CAAC,EAC5C,IAAI,CAAC,oBAAoB,EAAE,MAAM,GAAG,MAAM,CAAC;IAC7C;;;;;;;;OAQG;IACH,IAAI,CAAC,EAAE,eAAe,EAAE,CAAC;IACzB,IAAI,EAAE,mBAAmB,EAAE,CAAC;CAC7B;AAED;;GAEG;AACH,MAAM,WAAW,uBAAwB,SAAQ,eAAe;IAC9D;;;;;;;;;OASG;IACH,oBAAoB,CAAC,EAAE,OAAO,GAAG,WAAW,GAAG,SAAS,CAAC;IAEzD;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,GAAG,MAAM,EAAE,CAAC,GAAG,SAAS,CAAC;IAElE;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEnC;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEnC;;;;;;;;;;OAUG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,SAAS,CAAC;IAE5D;;;;;;;;;;;;OAYG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,SAAS,CAAC;IAErD,IAAI,EAAE,QAAQ,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,sBAAuB,SAAQ,eAAe;IAC7D;;;;;;;;;OASG;IACH,eAAe,CAAC,EAAE,OAAO,GAAG,WAAW,GAAG,SAAS,CAAC;IAEpD;;;;;;;;;;;;;;;;;;OAkBG;IACH,KAAK,CAAC,EAAE,WAAW,GAAG,WAAW,EAAE,GAAG,SAAS,CAAC;IAEhD;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE9B;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE9B,IAAI,EAAE,OAAO,CAAC;IAEd;;OAEG;IACH,WAAW,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CACnC;AAED;;GAEG;AACH,MAAM,WAAW,uBAAwB,SAAQ,eAAe;IAC9D,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IAE5B;;;;;;;;;;OAUG;IACH,MAAM,CAAC,EACH,MAAM,GACN,WAAW,GACX,OAAO,GACP,UAAU,GACV,MAAM,GACN,MAAM,GACN,cAAc,GACd,2BAA2B,GAC3B,OAAO,GACP,uBAAuB,GACvB,MAAM,GACN,KAAK,GACL,eAAe,GACf,cAAc,GACd,KAAK,GACL,MAAM,GACN,SAAS,CAAC;IAEd;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE/B;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE/B;;;;;;;;;;;;OAYG;IACH,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE7B,IAAI,EAAE,QAAQ,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,uBAAwB,SAAQ,eAAe;IAC9D;;;;;;;;OAQG;IACH,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IAE5B;;;;;;OAMG;IACH,gBAAgB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAEvC;;;;;;OAMG;IACH,gBAAgB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAEvC;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE7B;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE7B;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEhC,IAAI,EAAE,SAAS,GAAG,QAAQ,CAAC;CAC5B;AAED;;GAEG;AACH,MAAM,WAAW,wBAAyB,SAAQ,eAAe;IAC/D;;;;;;;;OAQG;IACH,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,SAAS,CAAC;IAE7B,IAAI,EAAE,SAAS,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,qBAAsB,SAAQ,eAAe;IAC5D;;;;;;;;OAQG;IACH,IAAI,CAAC,EAAE,IAAI,EAAE,GAAG,SAAS,CAAC;IAE1B,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,oBAAqB,SAAQ,eAAe;IAC3D,IAAI,EAAE,KAAK,CAAC;CACb"} \ No newline at end of file +{"version":3,"file":"json-schema.d.ts","sourceRoot":"","sources":["../src/json-schema.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils/package.json b/node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils/package.json index eb7ac9a7e2..603265f73c 100644 --- a/node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils/package.json +++ b/node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils/package.json @@ -1,6 +1,6 @@ { "name": "@typescript-eslint/utils", - "version": "8.18.2", + "version": "8.19.0", "description": "Utilities for working with TypeScript + ESLint together", "files": [ "dist", @@ -64,9 +64,9 @@ }, "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "8.18.2", - "@typescript-eslint/types": "8.18.2", - "@typescript-eslint/typescript-estree": "8.18.2" + "@typescript-eslint/scope-manager": "8.19.0", + "@typescript-eslint/types": "8.19.0", + "@typescript-eslint/typescript-estree": "8.19.0" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", diff --git a/node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys/package.json b/node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys/package.json index 3fbd201bd0..7d7edd0ccf 100644 --- a/node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys/package.json +++ b/node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys/package.json @@ -1,6 +1,6 @@ { "name": "@typescript-eslint/visitor-keys", - "version": "8.18.2", + "version": "8.19.0", "description": "Visitor keys used to help traverse the TypeScript-ESTree AST", "files": [ "dist", @@ -47,7 +47,7 @@ "typecheck": "tsc --noEmit" }, "dependencies": { - "@typescript-eslint/types": "8.18.2", + "@typescript-eslint/types": "8.19.0", "eslint-visitor-keys": "^4.2.0" }, "devDependencies": { diff --git a/node_modules/@typescript-eslint/eslint-plugin/package.json b/node_modules/@typescript-eslint/eslint-plugin/package.json index 31468fa080..ab47506850 100644 --- a/node_modules/@typescript-eslint/eslint-plugin/package.json +++ b/node_modules/@typescript-eslint/eslint-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@typescript-eslint/eslint-plugin", - "version": "8.18.2", + "version": "8.19.0", "description": "TypeScript plugin for ESLint", "files": [ "dist", @@ -61,10 +61,10 @@ }, "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "8.18.2", - "@typescript-eslint/type-utils": "8.18.2", - "@typescript-eslint/utils": "8.18.2", - "@typescript-eslint/visitor-keys": "8.18.2", + "@typescript-eslint/scope-manager": "8.19.0", + "@typescript-eslint/type-utils": "8.19.0", + "@typescript-eslint/utils": "8.19.0", + "@typescript-eslint/visitor-keys": "8.19.0", "graphemer": "^1.4.0", "ignore": "^5.3.1", "natural-compare": "^1.4.0", @@ -75,8 +75,8 @@ "@types/marked": "^5.0.2", "@types/mdast": "^4.0.3", "@types/natural-compare": "*", - "@typescript-eslint/rule-schema-to-typescript-types": "8.18.2", - "@typescript-eslint/rule-tester": "8.18.2", + "@typescript-eslint/rule-schema-to-typescript-types": "8.19.0", + "@typescript-eslint/rule-tester": "8.19.0", "ajv": "^6.12.6", "cross-env": "^7.0.3", "cross-fetch": "*", diff --git a/node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager/package.json b/node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager/package.json index f91543e081..7665258566 100644 --- a/node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager/package.json +++ b/node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager/package.json @@ -1,6 +1,6 @@ { "name": "@typescript-eslint/scope-manager", - "version": "8.18.2", + "version": "8.19.0", "description": "TypeScript scope analyser for ESLint", "files": [ "dist", @@ -46,13 +46,13 @@ "typecheck": "npx nx typecheck" }, "dependencies": { - "@typescript-eslint/types": "8.18.2", - "@typescript-eslint/visitor-keys": "8.18.2" + "@typescript-eslint/types": "8.19.0", + "@typescript-eslint/visitor-keys": "8.19.0" }, "devDependencies": { "@jest/types": "29.6.3", "@types/glob": "*", - "@typescript-eslint/typescript-estree": "8.18.2", + "@typescript-eslint/typescript-estree": "8.19.0", "glob": "*", "jest-specific-snapshot": "*", "make-dir": "*", diff --git a/node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types/package.json b/node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types/package.json index 8b84acea4c..50ed2e2b8d 100644 --- a/node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types/package.json +++ b/node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types/package.json @@ -1,6 +1,6 @@ { "name": "@typescript-eslint/types", - "version": "8.18.2", + "version": "8.19.0", "description": "Types for the TypeScript-ESTree AST spec", "files": [ "dist", diff --git a/node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree/package.json b/node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree/package.json index 5c64ff4d89..a9b75afc04 100644 --- a/node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree/package.json +++ b/node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree/package.json @@ -1,6 +1,6 @@ { "name": "@typescript-eslint/typescript-estree", - "version": "8.18.2", + "version": "8.19.0", "description": "A parser that converts TypeScript source code into an ESTree compatible form", "files": [ "dist", @@ -54,8 +54,8 @@ "typecheck": "tsc --noEmit" }, "dependencies": { - "@typescript-eslint/types": "8.18.2", - "@typescript-eslint/visitor-keys": "8.18.2", + "@typescript-eslint/types": "8.19.0", + "@typescript-eslint/visitor-keys": "8.19.0", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", diff --git a/node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys/package.json b/node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys/package.json index 3fbd201bd0..7d7edd0ccf 100644 --- a/node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys/package.json +++ b/node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys/package.json @@ -1,6 +1,6 @@ { "name": "@typescript-eslint/visitor-keys", - "version": "8.18.2", + "version": "8.19.0", "description": "Visitor keys used to help traverse the TypeScript-ESTree AST", "files": [ "dist", @@ -47,7 +47,7 @@ "typecheck": "tsc --noEmit" }, "dependencies": { - "@typescript-eslint/types": "8.18.2", + "@typescript-eslint/types": "8.19.0", "eslint-visitor-keys": "^4.2.0" }, "devDependencies": { diff --git a/node_modules/@typescript-eslint/parser/package.json b/node_modules/@typescript-eslint/parser/package.json index e2f35b5537..b5be2259dd 100644 --- a/node_modules/@typescript-eslint/parser/package.json +++ b/node_modules/@typescript-eslint/parser/package.json @@ -1,6 +1,6 @@ { "name": "@typescript-eslint/parser", - "version": "8.18.2", + "version": "8.19.0", "description": "An ESLint custom parser which leverages TypeScript ESTree", "files": [ "dist", @@ -53,10 +53,10 @@ "typescript": ">=4.8.4 <5.8.0" }, "dependencies": { - "@typescript-eslint/scope-manager": "8.18.2", - "@typescript-eslint/types": "8.18.2", - "@typescript-eslint/typescript-estree": "8.18.2", - "@typescript-eslint/visitor-keys": "8.18.2", + "@typescript-eslint/scope-manager": "8.19.0", + "@typescript-eslint/types": "8.19.0", + "@typescript-eslint/typescript-estree": "8.19.0", + "@typescript-eslint/visitor-keys": "8.19.0", "debug": "^4.3.4" }, "devDependencies": { diff --git a/node_modules/@typescript-eslint/type-utils/dist/getConstrainedTypeAtLocation.d.ts b/node_modules/@typescript-eslint/type-utils/dist/getConstrainedTypeAtLocation.d.ts index 88c2d48de3..54c2717055 100644 --- a/node_modules/@typescript-eslint/type-utils/dist/getConstrainedTypeAtLocation.d.ts +++ b/node_modules/@typescript-eslint/type-utils/dist/getConstrainedTypeAtLocation.d.ts @@ -1,7 +1,13 @@ import type { ParserServicesWithTypeInformation, TSESTree } from '@typescript-eslint/typescript-estree'; import type * as ts from 'typescript'; /** - * Resolves the given node's type. Will resolve to the type's generic constraint, if it has one. + * Resolves the given node's type. Will return the type's generic constraint, if it has one. + * + * Warning - if the type is generic and does _not_ have a constraint, the type will be + * returned as-is, rather than returning an `unknown` type. This can be checked + * for by checking for the type flag ts.TypeFlags.TypeParameter. + * + * @see https://github.com/typescript-eslint/typescript-eslint/issues/10438 */ export declare function getConstrainedTypeAtLocation(services: ParserServicesWithTypeInformation, node: TSESTree.Node): ts.Type; //# sourceMappingURL=getConstrainedTypeAtLocation.d.ts.map \ No newline at end of file diff --git a/node_modules/@typescript-eslint/type-utils/dist/getConstrainedTypeAtLocation.d.ts.map b/node_modules/@typescript-eslint/type-utils/dist/getConstrainedTypeAtLocation.d.ts.map index 57b85997be..6248b21bab 100644 --- a/node_modules/@typescript-eslint/type-utils/dist/getConstrainedTypeAtLocation.d.ts.map +++ b/node_modules/@typescript-eslint/type-utils/dist/getConstrainedTypeAtLocation.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"getConstrainedTypeAtLocation.d.ts","sourceRoot":"","sources":["../src/getConstrainedTypeAtLocation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iCAAiC,EACjC,QAAQ,EACT,MAAM,sCAAsC,CAAC;AAC9C,OAAO,KAAK,KAAK,EAAE,MAAM,YAAY,CAAC;AAEtC;;GAEG;AACH,wBAAgB,4BAA4B,CAC1C,QAAQ,EAAE,iCAAiC,EAC3C,IAAI,EAAE,QAAQ,CAAC,IAAI,GAClB,EAAE,CAAC,IAAI,CAOT"} \ No newline at end of file +{"version":3,"file":"getConstrainedTypeAtLocation.d.ts","sourceRoot":"","sources":["../src/getConstrainedTypeAtLocation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iCAAiC,EACjC,QAAQ,EACT,MAAM,sCAAsC,CAAC;AAC9C,OAAO,KAAK,KAAK,EAAE,MAAM,YAAY,CAAC;AAEtC;;;;;;;;GAQG;AACH,wBAAgB,4BAA4B,CAC1C,QAAQ,EAAE,iCAAiC,EAC3C,IAAI,EAAE,QAAQ,CAAC,IAAI,GAClB,EAAE,CAAC,IAAI,CAOT"} \ No newline at end of file diff --git a/node_modules/@typescript-eslint/type-utils/dist/getConstrainedTypeAtLocation.js b/node_modules/@typescript-eslint/type-utils/dist/getConstrainedTypeAtLocation.js index 2bb33280a5..d337014451 100644 --- a/node_modules/@typescript-eslint/type-utils/dist/getConstrainedTypeAtLocation.js +++ b/node_modules/@typescript-eslint/type-utils/dist/getConstrainedTypeAtLocation.js @@ -2,7 +2,13 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.getConstrainedTypeAtLocation = getConstrainedTypeAtLocation; /** - * Resolves the given node's type. Will resolve to the type's generic constraint, if it has one. + * Resolves the given node's type. Will return the type's generic constraint, if it has one. + * + * Warning - if the type is generic and does _not_ have a constraint, the type will be + * returned as-is, rather than returning an `unknown` type. This can be checked + * for by checking for the type flag ts.TypeFlags.TypeParameter. + * + * @see https://github.com/typescript-eslint/typescript-eslint/issues/10438 */ function getConstrainedTypeAtLocation(services, node) { const nodeType = services.getTypeAtLocation(node); diff --git a/node_modules/@typescript-eslint/type-utils/dist/getConstrainedTypeAtLocation.js.map b/node_modules/@typescript-eslint/type-utils/dist/getConstrainedTypeAtLocation.js.map index 3080507b24..1e083dcef9 100644 --- a/node_modules/@typescript-eslint/type-utils/dist/getConstrainedTypeAtLocation.js.map +++ b/node_modules/@typescript-eslint/type-utils/dist/getConstrainedTypeAtLocation.js.map @@ -1 +1 @@ -{"version":3,"file":"getConstrainedTypeAtLocation.js","sourceRoot":"","sources":["../src/getConstrainedTypeAtLocation.ts"],"names":[],"mappings":";;AASA,oEAUC;AAbD;;GAEG;AACH,SAAgB,4BAA4B,CAC1C,QAA2C,EAC3C,IAAmB;IAEnB,MAAM,QAAQ,GAAG,QAAQ,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAClD,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO;SACjC,cAAc,EAAE;SAChB,uBAAuB,CAAC,QAAQ,CAAC,CAAC;IAErC,OAAO,WAAW,IAAI,QAAQ,CAAC;AACjC,CAAC"} \ No newline at end of file +{"version":3,"file":"getConstrainedTypeAtLocation.js","sourceRoot":"","sources":["../src/getConstrainedTypeAtLocation.ts"],"names":[],"mappings":";;AAeA,oEAUC;AAnBD;;;;;;;;GAQG;AACH,SAAgB,4BAA4B,CAC1C,QAA2C,EAC3C,IAAmB;IAEnB,MAAM,QAAQ,GAAG,QAAQ,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAClD,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO;SACjC,cAAc,EAAE;SAChB,uBAAuB,CAAC,QAAQ,CAAC,CAAC;IAErC,OAAO,WAAW,IAAI,QAAQ,CAAC;AACjC,CAAC"} \ No newline at end of file diff --git a/node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/scope-manager/package.json b/node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/scope-manager/package.json index f91543e081..7665258566 100644 --- a/node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/scope-manager/package.json +++ b/node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/scope-manager/package.json @@ -1,6 +1,6 @@ { "name": "@typescript-eslint/scope-manager", - "version": "8.18.2", + "version": "8.19.0", "description": "TypeScript scope analyser for ESLint", "files": [ "dist", @@ -46,13 +46,13 @@ "typecheck": "npx nx typecheck" }, "dependencies": { - "@typescript-eslint/types": "8.18.2", - "@typescript-eslint/visitor-keys": "8.18.2" + "@typescript-eslint/types": "8.19.0", + "@typescript-eslint/visitor-keys": "8.19.0" }, "devDependencies": { "@jest/types": "29.6.3", "@types/glob": "*", - "@typescript-eslint/typescript-estree": "8.18.2", + "@typescript-eslint/typescript-estree": "8.19.0", "glob": "*", "jest-specific-snapshot": "*", "make-dir": "*", diff --git a/node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types/package.json b/node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types/package.json index 8b84acea4c..50ed2e2b8d 100644 --- a/node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types/package.json +++ b/node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types/package.json @@ -1,6 +1,6 @@ { "name": "@typescript-eslint/types", - "version": "8.18.2", + "version": "8.19.0", "description": "Types for the TypeScript-ESTree AST spec", "files": [ "dist", diff --git a/node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree/package.json b/node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree/package.json index 5c64ff4d89..a9b75afc04 100644 --- a/node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree/package.json +++ b/node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree/package.json @@ -1,6 +1,6 @@ { "name": "@typescript-eslint/typescript-estree", - "version": "8.18.2", + "version": "8.19.0", "description": "A parser that converts TypeScript source code into an ESTree compatible form", "files": [ "dist", @@ -54,8 +54,8 @@ "typecheck": "tsc --noEmit" }, "dependencies": { - "@typescript-eslint/types": "8.18.2", - "@typescript-eslint/visitor-keys": "8.18.2", + "@typescript-eslint/types": "8.19.0", + "@typescript-eslint/visitor-keys": "8.19.0", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", diff --git a/node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/utils/dist/json-schema.d.ts.map b/node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/utils/dist/json-schema.d.ts.map index 780f1c3720..7e85351c44 100644 --- a/node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/utils/dist/json-schema.d.ts.map +++ b/node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/utils/dist/json-schema.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"json-schema.d.ts","sourceRoot":"","sources":["../src/json-schema.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"json-schema.d.ts","sourceRoot":"","sources":["../src/json-schema.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/utils/package.json b/node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/utils/package.json index eb7ac9a7e2..603265f73c 100644 --- a/node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/utils/package.json +++ b/node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/utils/package.json @@ -1,6 +1,6 @@ { "name": "@typescript-eslint/utils", - "version": "8.18.2", + "version": "8.19.0", "description": "Utilities for working with TypeScript + ESLint together", "files": [ "dist", @@ -64,9 +64,9 @@ }, "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "8.18.2", - "@typescript-eslint/types": "8.18.2", - "@typescript-eslint/typescript-estree": "8.18.2" + "@typescript-eslint/scope-manager": "8.19.0", + "@typescript-eslint/types": "8.19.0", + "@typescript-eslint/typescript-estree": "8.19.0" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", diff --git a/node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys/package.json b/node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys/package.json index 3fbd201bd0..7d7edd0ccf 100644 --- a/node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys/package.json +++ b/node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys/package.json @@ -1,6 +1,6 @@ { "name": "@typescript-eslint/visitor-keys", - "version": "8.18.2", + "version": "8.19.0", "description": "Visitor keys used to help traverse the TypeScript-ESTree AST", "files": [ "dist", @@ -47,7 +47,7 @@ "typecheck": "tsc --noEmit" }, "dependencies": { - "@typescript-eslint/types": "8.18.2", + "@typescript-eslint/types": "8.19.0", "eslint-visitor-keys": "^4.2.0" }, "devDependencies": { diff --git a/node_modules/@typescript-eslint/type-utils/package.json b/node_modules/@typescript-eslint/type-utils/package.json index 3e156a83bb..667910689c 100644 --- a/node_modules/@typescript-eslint/type-utils/package.json +++ b/node_modules/@typescript-eslint/type-utils/package.json @@ -1,6 +1,6 @@ { "name": "@typescript-eslint/type-utils", - "version": "8.18.2", + "version": "8.19.0", "description": "Type utilities for working with TypeScript + ESLint together", "files": [ "dist", @@ -46,8 +46,8 @@ "typecheck": "tsc --noEmit" }, "dependencies": { - "@typescript-eslint/typescript-estree": "8.18.2", - "@typescript-eslint/utils": "8.18.2", + "@typescript-eslint/typescript-estree": "8.19.0", + "@typescript-eslint/utils": "8.19.0", "debug": "^4.3.4", "ts-api-utils": "^1.3.0" }, @@ -57,7 +57,7 @@ }, "devDependencies": { "@jest/types": "29.6.3", - "@typescript-eslint/parser": "8.18.2", + "@typescript-eslint/parser": "8.19.0", "ajv": "^6.12.6", "downlevel-dts": "*", "jest": "29.7.0", diff --git a/node_modules/uuid/CHANGELOG.md b/node_modules/uuid/CHANGELOG.md deleted file mode 100644 index 8f9e0eb88d..0000000000 --- a/node_modules/uuid/CHANGELOG.md +++ /dev/null @@ -1,335 +0,0 @@ -# Change Log - -## [11.0.3](https://github.com/uuidjs/uuid/compare/v11.0.2...v11.0.3) (2024-11-04) - - -### Bug Fixes - -* apply stricter typing to the v* signatures ([#831](https://github.com/uuidjs/uuid/issues/831)) ([c2d3fed](https://github.com/uuidjs/uuid/commit/c2d3fed22cfd47c22c8f22f6154abb5060648ce5)) -* export internal uuid types ([#833](https://github.com/uuidjs/uuid/issues/833)) ([341edf4](https://github.com/uuidjs/uuid/commit/341edf444ced63708ba336285dbec29443523939)) -* remove sourcemaps ([#827](https://github.com/uuidjs/uuid/issues/827)) ([b93ea10](https://github.com/uuidjs/uuid/commit/b93ea101af7382053032d4fb61cc85599d6c7216)) -* revert "simplify type for v3 and v5" ([#835](https://github.com/uuidjs/uuid/issues/835)) ([e2dee69](https://github.com/uuidjs/uuid/commit/e2dee691e95aba854a892d2507d8cd9f009bf61d)) - -## [11.0.2](https://github.com/uuidjs/uuid/compare/v11.0.1...v11.0.2) (2024-10-28) - -### Bug Fixes - -* remove wrapper.mjs ([#822](https://github.com/uuidjs/uuid/issues/822)) ([6683ad3](https://github.com/uuidjs/uuid/commit/6683ad38b048375b451eac1194960f24ba20e0ca)) - -## [11.0.1](https://github.com/uuidjs/uuid/compare/v11.0.0...v11.0.1) (2024-10-27) - -### Bug Fixes - -* restore package.json#browser field ([#817](https://github.com/uuidjs/uuid/issues/817)) ([ae8f386](https://github.com/uuidjs/uuid/commit/ae8f38657bca0ee053bf29c88c006b1ea05af1b5)) - -## [11.0.0](https://github.com/uuidjs/uuid/compare/v9.0.0...v11.0.0) (2024-10-26) - -### ⚠ BREAKING CHANGES - -- refactor v1 internal state and options logic (#780) -- refactor v7 internal state and options logic, fixes #764 (#779) -- Port to TypeScript, closes #762 (#763) -- update node support matrix (only support node 16-20) (#750) - -### Features - -- Port to TypeScript, closes [#762](https://github.com/uuidjs/uuid/issues/762) ([#763](https://github.com/uuidjs/uuid/issues/763)) ([1e0f987](https://github.com/uuidjs/uuid/commit/1e0f9870db864ca93f7a69db0d468b5e1b7605e7)) -- update node support matrix (only support node 16-20) ([#750](https://github.com/uuidjs/uuid/issues/750)) ([883b163](https://github.com/uuidjs/uuid/commit/883b163b9ab9d6655bfbd8a35e61a3c71674dfe1)) - -### Bug Fixes - -- missing v7 expectations in browser spec ([#751](https://github.com/uuidjs/uuid/issues/751)) ([f54a866](https://github.com/uuidjs/uuid/commit/f54a866cedb2b3b96581157c1f4ac935a0b11411)) -- refactor v1 internal state and options logic ([#780](https://github.com/uuidjs/uuid/issues/780)) ([031b3d3](https://github.com/uuidjs/uuid/commit/031b3d3d738bc6694501ac0a37152b95ed500989)) -- refactor v7 internal state and options logic, fixes [#764](https://github.com/uuidjs/uuid/issues/764) ([#779](https://github.com/uuidjs/uuid/issues/779)) ([9dbd1cd](https://github.com/uuidjs/uuid/commit/9dbd1cd4177c43fcaac961a3b16fb2d044c9940a)) -- remove v4 options default assignment preventing native.randomUUID from being used ([#786](https://github.com/uuidjs/uuid/issues/786)) ([afe6232](https://github.com/uuidjs/uuid/commit/afe62323c4408a824755a39d7b971a8ae06f7199)), closes [#763](https://github.com/uuidjs/uuid/issues/763) -- seq_hi shift for byte 6 ([#775](https://github.com/uuidjs/uuid/issues/775)) ([1d532ca](https://github.com/uuidjs/uuid/commit/1d532ca374f181932a24a83fa98f71a5bd4f3e96)) -- tsconfig module type ([#778](https://github.com/uuidjs/uuid/issues/778)) ([7eff835](https://github.com/uuidjs/uuid/commit/7eff835cba334ad418f57768c00d15b918a9b419)) - -## [10.0.0](https://github.com/uuidjs/uuid/compare/v9.0.0...v10.0.0) (2024-06-07) - -### ⚠ BREAKING CHANGES - -- update node support (drop node@12, node@14, add node@20) (#750) - -### Features - -- support support rfc9562 MAX uuid (new in RFC9562) ([#714](https://github.com/uuidjs/uuid/issues/714)) ([0385cd3](https://github.com/uuidjs/uuid/commit/0385cd3f18ae9920678b2849932fa7a9d9aee7d0)) -- support rfc9562 v6 uuids ([#754](https://github.com/uuidjs/uuid/issues/754)) ([c4ed13e](https://github.com/uuidjs/uuid/commit/c4ed13e7159d87c9e42a349bdd9dc955f1af46b6)) -- support rfc9562 v7 uuids ([#681](https://github.com/uuidjs/uuid/issues/681)) ([db76a12](https://github.com/uuidjs/uuid/commit/db76a1284760c441438f50a57924b322dae08891)) -- update node support matrix (only support node 16-20) ([#750](https://github.com/uuidjs/uuid/issues/750)) ([883b163](https://github.com/uuidjs/uuid/commit/883b163b9ab9d6655bfbd8a35e61a3c71674dfe1)) -- support rfc9562 v8 uuids ([#759](https://github.com/uuidjs/uuid/issues/759)) ([35a5342](https://github.com/uuidjs/uuid/commit/35a53428202657e402e6b4aa68f56c08194541bf)) - -### Bug Fixes - -- revert "perf: remove superfluous call to toLowerCase ([#677](https://github.com/uuidjs/uuid/issues/677))" ([#738](https://github.com/uuidjs/uuid/issues/738)) ([e267b90](https://github.com/uuidjs/uuid/commit/e267b9073df1d0ce119ee53c0487fe76acb2be37)) - -## [9.0.1](https://github.com/uuidjs/uuid/compare/v9.0.0...v9.0.1) (2023-09-12) - -### build - -- Fix CI to work with Node.js 20.x - -## [9.0.0](https://github.com/uuidjs/uuid/compare/v8.3.2...v9.0.0) (2022-09-05) - -### ⚠ BREAKING CHANGES - -- Drop Node.js 10.x support. This library always aims at supporting one EOLed LTS release which by this time now is 12.x which has reached EOL 30 Apr 2022. - -- Remove the minified UMD build from the package. - - Minified code is hard to audit and since this is a widely used library it seems more appropriate nowadays to optimize for auditability than to ship a legacy module format that, at best, serves educational purposes nowadays. - - For production browser use cases, users should be using a bundler. For educational purposes, today's online sandboxes like replit.com offer convenient ways to load npm modules, so the use case for UMD through repos like UNPKG or jsDelivr has largely vanished. - -- Drop IE 11 and Safari 10 support. Drop support for browsers that don't correctly implement const/let and default arguments, and no longer transpile the browser build to ES2015. - - This also removes the fallback on msCrypto instead of the crypto API. - - Browser tests are run in the first supported version of each supported browser and in the latest (as of this commit) version available on Browserstack. - -### Features - -- optimize uuid.v1 by 1.3x uuid.v4 by 4.3x (430%) ([#597](https://github.com/uuidjs/uuid/issues/597)) ([3a033f6](https://github.com/uuidjs/uuid/commit/3a033f6bab6bb3780ece6d645b902548043280bc)) -- remove UMD build ([#645](https://github.com/uuidjs/uuid/issues/645)) ([e948a0f](https://github.com/uuidjs/uuid/commit/e948a0f22bf22f4619b27bd913885e478e20fe6f)), closes [#620](https://github.com/uuidjs/uuid/issues/620) -- use native crypto.randomUUID when available ([#600](https://github.com/uuidjs/uuid/issues/600)) ([c9e076c](https://github.com/uuidjs/uuid/commit/c9e076c852edad7e9a06baaa1d148cf4eda6c6c4)) - -### Bug Fixes - -- add Jest/jsdom compatibility ([#642](https://github.com/uuidjs/uuid/issues/642)) ([16f9c46](https://github.com/uuidjs/uuid/commit/16f9c469edf46f0786164cdf4dc980743984a6fd)) -- change default export to named function ([#545](https://github.com/uuidjs/uuid/issues/545)) ([c57bc5a](https://github.com/uuidjs/uuid/commit/c57bc5a9a0653273aa639cda9177ce52efabe42a)) -- handle error when parameter is not set in v3 and v5 ([#622](https://github.com/uuidjs/uuid/issues/622)) ([fcd7388](https://github.com/uuidjs/uuid/commit/fcd73881692d9fabb63872576ba28e30ff852091)) -- run npm audit fix ([#644](https://github.com/uuidjs/uuid/issues/644)) ([04686f5](https://github.com/uuidjs/uuid/commit/04686f54c5fed2cfffc1b619f4970c4bb8532353)) -- upgrading from uuid3 broken link ([#568](https://github.com/uuidjs/uuid/issues/568)) ([1c849da](https://github.com/uuidjs/uuid/commit/1c849da6e164259e72e18636726345b13a7eddd6)) - -### build - -- drop Node.js 8.x from babel transpile target ([#603](https://github.com/uuidjs/uuid/issues/603)) ([aa11485](https://github.com/uuidjs/uuid/commit/aa114858260402107ec8a1e1a825dea0a259bcb5)) -- drop support for legacy browsers (IE11, Safari 10) ([#604](https://github.com/uuidjs/uuid/issues/604)) ([0f433e5](https://github.com/uuidjs/uuid/commit/0f433e5ec444edacd53016de67db021102f36148)) - -- drop node 10.x to upgrade dev dependencies ([#653](https://github.com/uuidjs/uuid/issues/653)) ([28a5712](https://github.com/uuidjs/uuid/commit/28a571283f8abda6b9d85e689f95b7d3ee9e282e)), closes [#643](https://github.com/uuidjs/uuid/issues/643) - -### [8.3.2](https://github.com/uuidjs/uuid/compare/v8.3.1...v8.3.2) (2020-12-08) - -### Bug Fixes - -- lazy load getRandomValues ([#537](https://github.com/uuidjs/uuid/issues/537)) ([16c8f6d](https://github.com/uuidjs/uuid/commit/16c8f6df2f6b09b4d6235602d6a591188320a82e)), closes [#536](https://github.com/uuidjs/uuid/issues/536) - -### [8.3.1](https://github.com/uuidjs/uuid/compare/v8.3.0...v8.3.1) (2020-10-04) - -### Bug Fixes - -- support expo>=39.0.0 ([#515](https://github.com/uuidjs/uuid/issues/515)) ([c65a0f3](https://github.com/uuidjs/uuid/commit/c65a0f3fa73b901959d638d1e3591dfacdbed867)), closes [#375](https://github.com/uuidjs/uuid/issues/375) - -## [8.3.0](https://github.com/uuidjs/uuid/compare/v8.2.0...v8.3.0) (2020-07-27) - -### Features - -- add parse/stringify/validate/version/NIL APIs ([#479](https://github.com/uuidjs/uuid/issues/479)) ([0e6c10b](https://github.com/uuidjs/uuid/commit/0e6c10ba1bf9517796ff23c052fc0468eedfd5f4)), closes [#475](https://github.com/uuidjs/uuid/issues/475) [#478](https://github.com/uuidjs/uuid/issues/478) [#480](https://github.com/uuidjs/uuid/issues/480) [#481](https://github.com/uuidjs/uuid/issues/481) [#180](https://github.com/uuidjs/uuid/issues/180) - -## [8.2.0](https://github.com/uuidjs/uuid/compare/v8.1.0...v8.2.0) (2020-06-23) - -### Features - -- improve performance of v1 string representation ([#453](https://github.com/uuidjs/uuid/issues/453)) ([0ee0b67](https://github.com/uuidjs/uuid/commit/0ee0b67c37846529c66089880414d29f3ae132d5)) -- remove deprecated v4 string parameter ([#454](https://github.com/uuidjs/uuid/issues/454)) ([88ce3ca](https://github.com/uuidjs/uuid/commit/88ce3ca0ba046f60856de62c7ce03f7ba98ba46c)), closes [#437](https://github.com/uuidjs/uuid/issues/437) -- support jspm ([#473](https://github.com/uuidjs/uuid/issues/473)) ([e9f2587](https://github.com/uuidjs/uuid/commit/e9f2587a92575cac31bc1d4ae944e17c09756659)) - -### Bug Fixes - -- prepare package exports for webpack 5 ([#468](https://github.com/uuidjs/uuid/issues/468)) ([8d6e6a5](https://github.com/uuidjs/uuid/commit/8d6e6a5f8965ca9575eb4d92e99a43435f4a58a8)) - -## [8.1.0](https://github.com/uuidjs/uuid/compare/v8.0.0...v8.1.0) (2020-05-20) - -### Features - -- improve v4 performance by reusing random number array ([#435](https://github.com/uuidjs/uuid/issues/435)) ([bf4af0d](https://github.com/uuidjs/uuid/commit/bf4af0d711b4d2ed03d1f74fd12ad0baa87dc79d)) -- optimize V8 performance of bytesToUuid ([#434](https://github.com/uuidjs/uuid/issues/434)) ([e156415](https://github.com/uuidjs/uuid/commit/e156415448ec1af2351fa0b6660cfb22581971f2)) - -### Bug Fixes - -- export package.json required by react-native and bundlers ([#449](https://github.com/uuidjs/uuid/issues/449)) ([be1c8fe](https://github.com/uuidjs/uuid/commit/be1c8fe9a3206c358e0059b52fafd7213aa48a52)), closes [ai/nanoevents#44](https://github.com/ai/nanoevents/issues/44#issuecomment-602010343) [#444](https://github.com/uuidjs/uuid/issues/444) - -## [8.0.0](https://github.com/uuidjs/uuid/compare/v7.0.3...v8.0.0) (2020-04-29) - -### ⚠ BREAKING CHANGES - -- For native ECMAScript Module (ESM) usage in Node.js only named exports are exposed, there is no more default export. - - ```diff - -import uuid from 'uuid'; - -console.log(uuid.v4()); // -> 'cd6c3b08-0adc-4f4b-a6ef-36087a1c9869' - +import { v4 as uuidv4 } from 'uuid'; - +uuidv4(); // ⇨ '9b1deb4d-3b7d-4bad-9bdd-2b0d7b3dcb6d' - ``` - -- Deep requiring specific algorithms of this library like `require('uuid/v4')`, which has been deprecated in `uuid@7`, is no longer supported. - - Instead use the named exports that this module exports. - - For ECMAScript Modules (ESM): - - ```diff - -import uuidv4 from 'uuid/v4'; - +import { v4 as uuidv4 } from 'uuid'; - uuidv4(); - ``` - - For CommonJS: - - ```diff - -const uuidv4 = require('uuid/v4'); - +const { v4: uuidv4 } = require('uuid'); - uuidv4(); - ``` - -### Features - -- native Node.js ES Modules (wrapper approach) ([#423](https://github.com/uuidjs/uuid/issues/423)) ([2d9f590](https://github.com/uuidjs/uuid/commit/2d9f590ad9701d692625c07ed62f0a0f91227991)), closes [#245](https://github.com/uuidjs/uuid/issues/245) [#419](https://github.com/uuidjs/uuid/issues/419) [#342](https://github.com/uuidjs/uuid/issues/342) -- remove deep requires ([#426](https://github.com/uuidjs/uuid/issues/426)) ([daf72b8](https://github.com/uuidjs/uuid/commit/daf72b84ceb20272a81bb5fbddb05dd95922cbba)) - -### Bug Fixes - -- add CommonJS syntax example to README quickstart section ([#417](https://github.com/uuidjs/uuid/issues/417)) ([e0ec840](https://github.com/uuidjs/uuid/commit/e0ec8402c7ad44b7ef0453036c612f5db513fda0)) - -### [7.0.3](https://github.com/uuidjs/uuid/compare/v7.0.2...v7.0.3) (2020-03-31) - -### Bug Fixes - -- make deep require deprecation warning work in browsers ([#409](https://github.com/uuidjs/uuid/issues/409)) ([4b71107](https://github.com/uuidjs/uuid/commit/4b71107d8c0d2ef56861ede6403fc9dc35a1e6bf)), closes [#408](https://github.com/uuidjs/uuid/issues/408) - -### [7.0.2](https://github.com/uuidjs/uuid/compare/v7.0.1...v7.0.2) (2020-03-04) - -### Bug Fixes - -- make access to msCrypto consistent ([#393](https://github.com/uuidjs/uuid/issues/393)) ([8bf2a20](https://github.com/uuidjs/uuid/commit/8bf2a20f3565df743da7215eebdbada9d2df118c)) -- simplify link in deprecation warning ([#391](https://github.com/uuidjs/uuid/issues/391)) ([bb2c8e4](https://github.com/uuidjs/uuid/commit/bb2c8e4e9f4c5f9c1eaaf3ea59710c633cd90cb7)) -- update links to match content in readme ([#386](https://github.com/uuidjs/uuid/issues/386)) ([44f2f86](https://github.com/uuidjs/uuid/commit/44f2f86e9d2bbf14ee5f0f00f72a3db1292666d4)) - -### [7.0.1](https://github.com/uuidjs/uuid/compare/v7.0.0...v7.0.1) (2020-02-25) - -### Bug Fixes - -- clean up esm builds for node and browser ([#383](https://github.com/uuidjs/uuid/issues/383)) ([59e6a49](https://github.com/uuidjs/uuid/commit/59e6a49e7ce7b3e8fb0f3ee52b9daae72af467dc)) -- provide browser versions independent from module system ([#380](https://github.com/uuidjs/uuid/issues/380)) ([4344a22](https://github.com/uuidjs/uuid/commit/4344a22e7aed33be8627eeaaf05360f256a21753)), closes [#378](https://github.com/uuidjs/uuid/issues/378) - -## [7.0.0](https://github.com/uuidjs/uuid/compare/v3.4.0...v7.0.0) (2020-02-24) - -### ⚠ BREAKING CHANGES - -- The default export, which used to be the v4() method but which was already discouraged in v3.x of this library, has been removed. -- Explicitly note that deep imports of the different uuid version functions are deprecated and no longer encouraged and that ECMAScript module named imports should be used instead. Emit a deprecation warning for people who deep-require the different algorithm variants. -- Remove builtin support for insecure random number generators in the browser. Users who want that will have to supply their own random number generator function. -- Remove support for generating v3 and v5 UUIDs in Node.js<4.x -- Convert code base to ECMAScript Modules (ESM) and release CommonJS build for node and ESM build for browser bundlers. - -### Features - -- add UMD build to npm package ([#357](https://github.com/uuidjs/uuid/issues/357)) ([4e75adf](https://github.com/uuidjs/uuid/commit/4e75adf435196f28e3fbbe0185d654b5ded7ca2c)), closes [#345](https://github.com/uuidjs/uuid/issues/345) -- add various es module and CommonJS examples ([b238510](https://github.com/uuidjs/uuid/commit/b238510bf352463521f74bab175a3af9b7a42555)) -- ensure that docs are up-to-date in CI ([ee5e77d](https://github.com/uuidjs/uuid/commit/ee5e77db547474f5a8f23d6c857a6d399209986b)) -- hybrid CommonJS & ECMAScript modules build ([a3f078f](https://github.com/uuidjs/uuid/commit/a3f078faa0baff69ab41aed08e041f8f9c8993d0)) -- remove insecure fallback random number generator ([3a5842b](https://github.com/uuidjs/uuid/commit/3a5842b141a6e5de0ae338f391661e6b84b167c9)), closes [#173](https://github.com/uuidjs/uuid/issues/173) -- remove support for pre Node.js v4 Buffer API ([#356](https://github.com/uuidjs/uuid/issues/356)) ([b59b5c5](https://github.com/uuidjs/uuid/commit/b59b5c5ecad271c5453f1a156f011671f6d35627)) -- rename repository to github:uuidjs/uuid ([#351](https://github.com/uuidjs/uuid/issues/351)) ([c37a518](https://github.com/uuidjs/uuid/commit/c37a518e367ac4b6d0aa62dba1bc6ce9e85020f7)), closes [#338](https://github.com/uuidjs/uuid/issues/338) - -### Bug Fixes - -- add deep-require proxies for local testing and adjust tests ([#365](https://github.com/uuidjs/uuid/issues/365)) ([7fedc79](https://github.com/uuidjs/uuid/commit/7fedc79ac8fda4bfd1c566c7f05ef4ac13b2db48)) -- add note about removal of default export ([#372](https://github.com/uuidjs/uuid/issues/372)) ([12749b7](https://github.com/uuidjs/uuid/commit/12749b700eb49db8a9759fd306d8be05dbfbd58c)), closes [#370](https://github.com/uuidjs/uuid/issues/370) -- deprecated deep requiring of the different algorithm versions ([#361](https://github.com/uuidjs/uuid/issues/361)) ([c0bdf15](https://github.com/uuidjs/uuid/commit/c0bdf15e417639b1aeb0b247b2fb11f7a0a26b23)) - -## [3.4.0](https://github.com/uuidjs/uuid/compare/v3.3.3...v3.4.0) (2020-01-16) - -### Features - -- rename repository to github:uuidjs/uuid ([#351](https://github.com/uuidjs/uuid/issues/351)) ([e2d7314](https://github.com/uuidjs/uuid/commit/e2d7314)), closes [#338](https://github.com/uuidjs/uuid/issues/338) - -## [3.3.3](https://github.com/uuidjs/uuid/compare/v3.3.2...v3.3.3) (2019-08-19) - -### Bug Fixes - -- no longer run ci tests on node v4 -- upgrade dependencies - -## [3.3.2](https://github.com/uuidjs/uuid/compare/v3.3.1...v3.3.2) (2018-06-28) - -### Bug Fixes - -- typo ([305d877](https://github.com/uuidjs/uuid/commit/305d877)) - -## [3.3.1](https://github.com/uuidjs/uuid/compare/v3.3.0...v3.3.1) (2018-06-28) - -### Bug Fixes - -- fix [#284](https://github.com/uuidjs/uuid/issues/284) by setting function name in try-catch ([f2a60f2](https://github.com/uuidjs/uuid/commit/f2a60f2)) - -# [3.3.0](https://github.com/uuidjs/uuid/compare/v3.2.1...v3.3.0) (2018-06-22) - -### Bug Fixes - -- assignment to readonly property to allow running in strict mode ([#270](https://github.com/uuidjs/uuid/issues/270)) ([d062fdc](https://github.com/uuidjs/uuid/commit/d062fdc)) -- fix [#229](https://github.com/uuidjs/uuid/issues/229) ([c9684d4](https://github.com/uuidjs/uuid/commit/c9684d4)) -- Get correct version of IE11 crypto ([#274](https://github.com/uuidjs/uuid/issues/274)) ([153d331](https://github.com/uuidjs/uuid/commit/153d331)) -- mem issue when generating uuid ([#267](https://github.com/uuidjs/uuid/issues/267)) ([c47702c](https://github.com/uuidjs/uuid/commit/c47702c)) - -### Features - -- enforce Conventional Commit style commit messages ([#282](https://github.com/uuidjs/uuid/issues/282)) ([cc9a182](https://github.com/uuidjs/uuid/commit/cc9a182)) - -## [3.2.1](https://github.com/uuidjs/uuid/compare/v3.2.0...v3.2.1) (2018-01-16) - -### Bug Fixes - -- use msCrypto if available. Fixes [#241](https://github.com/uuidjs/uuid/issues/241) ([#247](https://github.com/uuidjs/uuid/issues/247)) ([1fef18b](https://github.com/uuidjs/uuid/commit/1fef18b)) - -# [3.2.0](https://github.com/uuidjs/uuid/compare/v3.1.0...v3.2.0) (2018-01-16) - -### Bug Fixes - -- remove mistakenly added typescript dependency, rollback version (standard-version will auto-increment) ([09fa824](https://github.com/uuidjs/uuid/commit/09fa824)) -- use msCrypto if available. Fixes [#241](https://github.com/uuidjs/uuid/issues/241) ([#247](https://github.com/uuidjs/uuid/issues/247)) ([1fef18b](https://github.com/uuidjs/uuid/commit/1fef18b)) - -### Features - -- Add v3 Support ([#217](https://github.com/uuidjs/uuid/issues/217)) ([d94f726](https://github.com/uuidjs/uuid/commit/d94f726)) - -# [3.1.0](https://github.com/uuidjs/uuid/compare/v3.1.0...v3.0.1) (2017-06-17) - -### Bug Fixes - -- (fix) Add .npmignore file to exclude test/ and other non-essential files from packing. (#183) -- Fix typo (#178) -- Simple typo fix (#165) - -### Features - -- v5 support in CLI (#197) -- V5 support (#188) - -# 3.0.1 (2016-11-28) - -- split uuid versions into separate files - -# 3.0.0 (2016-11-17) - -- remove .parse and .unparse - -# 2.0.0 - -- Removed uuid.BufferClass - -# 1.4.0 - -- Improved module context detection -- Removed public RNG functions - -# 1.3.2 - -- Improve tests and handling of v1() options (Issue #24) -- Expose RNG option to allow for perf testing with different generators - -# 1.3.0 - -- Support for version 1 ids, thanks to [@ctavan](https://github.com/ctavan)! -- Support for node.js crypto API -- De-emphasizing performance in favor of a) cryptographic quality PRNGs where available and b) more manageable code diff --git a/node_modules/uuid/CONTRIBUTING.md b/node_modules/uuid/CONTRIBUTING.md deleted file mode 100644 index 4a4503d02c..0000000000 --- a/node_modules/uuid/CONTRIBUTING.md +++ /dev/null @@ -1,18 +0,0 @@ -# Contributing - -Please feel free to file GitHub Issues or propose Pull Requests. We're always happy to discuss improvements to this library! - -## Testing - -```shell -npm test -``` - -## Releasing - -Releases are supposed to be done from master, version bumping is automated through [`standard-version`](https://github.com/conventional-changelog/standard-version): - -```shell -npm run release -- --dry-run # verify output manually -npm run release # follow the instructions from the output of this command -``` diff --git a/node_modules/uuid/README.md b/node_modules/uuid/README.md index 82349bfac5..72730cfb03 100644 --- a/node_modules/uuid/README.md +++ b/node_modules/uuid/README.md @@ -2,16 +2,15 @@ -- This file is auto-generated from README_js.md. Changes should be made there. --> - # uuid [![CI](https://github.com/uuidjs/uuid/workflows/CI/badge.svg)](https://github.com/uuidjs/uuid/actions?query=workflow%3ACI) [![Browser](https://github.com/uuidjs/uuid/workflows/Browser/badge.svg)](https://github.com/uuidjs/uuid/actions?query=workflow%3ABrowser) For the creation of [RFC9562](https://www.rfc-editor.org/rfc/rfc9562.html) (formally [RFC4122](https://www.rfc-editor.org/rfc/rfc4122.html)) UUIDs - **Complete** - Support for all RFC9562 UUID versions -- **Cross-platform** - Support for ... - - CommonJS, [ECMAScript Modules](#ecmascript-modules) - - NodeJS 16+ ([LTS releases](https://github.com/nodejs/Release)) - - Chrome, Safari, Firefox, Edge browsers +- **Cross-platform** - Support for... + - ESM & Common JS + - [Chrome, Safari, Firefox, Edge browsers](#support) + - [NodeJS](#support) - [React Native / Expo](#react-native--expo) - **Secure** - Cryptographically-strong random values - **Compact** - No dependencies, [tree-shakable](https://developer.mozilla.org/en-US/docs/Glossary/Tree_shaking) @@ -117,13 +116,13 @@ Example: import { parse as uuidParse } from 'uuid'; // Parse a UUID -uuidParse('6ec0bd7f-11c0-43da-975e-2a8ad9ebae0b'); // ⇨ - // Uint8Array(16) [ - // 110, 192, 189, 127, 17, - // 192, 67, 218, 151, 94, - // 42, 138, 217, 235, 174, - // 11 - // ] +uuidParse('6ec0bd7f-11c0-43da-975e-2a8ad9ebae0b'); // ⇨ +// Uint8Array(16) [ +// 110, 192, 189, 127, 17, +// 192, 67, 218, 151, 94, +// 42, 138, 217, 235, 174, +// 11 +// ] ``` ### uuid.stringify(arr[, offset]) @@ -367,7 +366,7 @@ Create an RFC version 7 (random) UUID | [`options.msecs = (current time)`] | RFC "timestamp" field (`Number` of milliseconds, unix epoch) | | [`options.random = (random)`] | `Array` of 16 random bytes (0-255) used to generate other fields, above | | [`options.rng`] | Alternative to `options.random`, a `Function` that returns an `Array` of 16 random bytes (0-255) | -| [`options.seq = (random)`] | 32-bit sequence `Number` between 0 - 0xffffffff. This may be provided to help insure uniqueness for UUIDs generated within the same millisecond time interval. Default = random value. | +| [`options.seq = (random)`] | 32-bit sequence `Number` between 0 - 0xffffffff. This may be provided to help ensure uniqueness for UUIDs generated within the same millisecond time interval. Default = random value. | | [`buffer`] | `Array \| Buffer` If specified, uuid will be written here in byte-form, starting at `offset` | | [`offset` = 0] | `Number` Index to start writing UUID bytes in `buffer` | | _returns_ | UUID `String` if no `buffer` is specified, otherwise returns `buffer` | @@ -475,14 +474,28 @@ defined by RFC9562 ## `options` Handling for Timestamp UUIDs -Prior to `uuid@11`, it was possible for `options` state to interfere with the internal state used to insure uniqueness of timestamp-based UUIDs (the `v1()`, `v6()`, and `v7()` methods). Starting with `uuid@11`, this issue has been addressed by using the presence of the `options` argument as a flag to select between two possible behaviors: +Prior to `uuid@11`, it was possible for `options` state to interfere with the internal state used to ensure uniqueness of timestamp-based UUIDs (the `v1()`, `v6()`, and `v7()` methods). Starting with `uuid@11`, this issue has been addressed by using the presence of the `options` argument as a flag to select between two possible behaviors: - Without `options`: Internal state is utilized to improve UUID uniqueness. - With `options`: Internal state is **NOT** used and, instead, appropriate defaults are applied as needed. +## Support + +**Browsers**: `uuid` [builds are tested](/uuidjs/uuid/blob/main/wdio.conf.js) against the latest version of desktop Chrome, Safari, Firefox, and Edge. Mobile versions of these same browsers are expected to work but aren't currently tested. + +**Node**: `uuid` [builds are tested](https://github.com/uuidjs/uuid/blob/main/.github/workflows/ci.yml#L26-L27) against node ([LTS releases](https://github.com/nodejs/Release)), plus one prior. E.g. `node@18` is in maintainence mode, and `node@22` is the current LTS release. So `uuid` supports `node@16`-`node@22`. + +**Typescript**: TS versions released within the past two years are supported. [source](https://github.com/microsoft/TypeScript/issues/49088#issuecomment-2468723715) + ## Known issues -### React Native / Expo + + +### "getRandomValues() not supported" + +This error occurs in environments where the standard [`crypto.getRandomValues()`](https://developer.mozilla.org/en-US/docs/Web/API/Crypto/getRandomValues) API is not supported. This issue can be resolved by adding an appropriate polyfill: + +#### React Native / Expo 1. Install [`react-native-get-random-values`](https://github.com/LinusU/react-native-get-random-values#readme) 1. Import it _before_ `uuid`. Since `uuid` might also appear as a transitive dependency of some other imports it's safest to just import `react-native-get-random-values` as the very first thing in your entry point: @@ -494,4 +507,4 @@ import { v4 as uuidv4 } from 'uuid'; --- -Markdown generated from [README_js.md](README_js.md) by +Markdown generated from [README_js.md](README_js.md) by diff --git a/node_modules/uuid/dist/cjs-browser/md5.d.ts b/node_modules/uuid/dist/cjs-browser/md5.d.ts index 5a55f51ebd..44bc824b1b 100644 --- a/node_modules/uuid/dist/cjs-browser/md5.d.ts +++ b/node_modules/uuid/dist/cjs-browser/md5.d.ts @@ -1,2 +1,2 @@ -declare function md5(bytes: Uint8Array): Uint8Array; +declare function md5(bytes: Uint8Array): Uint8Array; export default md5; diff --git a/node_modules/uuid/dist/cjs-browser/parse.d.ts b/node_modules/uuid/dist/cjs-browser/parse.d.ts index a316fb1178..86d55ef9c5 100644 --- a/node_modules/uuid/dist/cjs-browser/parse.d.ts +++ b/node_modules/uuid/dist/cjs-browser/parse.d.ts @@ -1,2 +1,2 @@ -declare function parse(uuid: string): Uint8Array; +declare function parse(uuid: string): Uint8Array; export default parse; diff --git a/node_modules/uuid/dist/cjs-browser/rng.d.ts b/node_modules/uuid/dist/cjs-browser/rng.d.ts index 73e60cf348..1fbb163599 100644 --- a/node_modules/uuid/dist/cjs-browser/rng.d.ts +++ b/node_modules/uuid/dist/cjs-browser/rng.d.ts @@ -1 +1 @@ -export default function rng(): Uint8Array; +export default function rng(): Uint8Array; diff --git a/node_modules/uuid/dist/cjs-browser/test/parse.test.d.ts b/node_modules/uuid/dist/cjs-browser/test/parse.test.d.ts deleted file mode 100644 index cb0ff5c3b5..0000000000 --- a/node_modules/uuid/dist/cjs-browser/test/parse.test.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/node_modules/uuid/dist/cjs-browser/test/parse.test.js b/node_modules/uuid/dist/cjs-browser/test/parse.test.js deleted file mode 100644 index f9053a419e..0000000000 --- a/node_modules/uuid/dist/cjs-browser/test/parse.test.js +++ /dev/null @@ -1,50 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const assert = require("assert"); -const node_test_1 = require("node:test"); -const parse_js_1 = require("../parse.js"); -const stringify_js_1 = require("../stringify.js"); -const v4_js_1 = require("../v4.js"); -function splitmix32(a) { - return function () { - a |= 0; - a = (a + 0x9e3779b9) | 0; - let t = a ^ (a >>> 16); - t = Math.imul(t, 0x21f0aaad); - t = t ^ (t >>> 15); - t = Math.imul(t, 0x735a2d97); - return ((t = t ^ (t >>> 15)) >>> 0) / 4294967296; - }; -} -const rand = splitmix32(0x12345678); -function rng(bytes = new Uint8Array(16)) { - for (let i = 0; i < 16; i++) { - bytes[i] = rand() * 256; - } - return bytes; -} -(0, node_test_1.describe)('parse', () => { - (0, node_test_1.default)('String -> bytes parsing', () => { - assert.deepStrictEqual((0, parse_js_1.default)('0f5abcd1-c194-47f3-905b-2df7263a084b'), Uint8Array.from([ - 0x0f, 0x5a, 0xbc, 0xd1, 0xc1, 0x94, 0x47, 0xf3, 0x90, 0x5b, 0x2d, 0xf7, 0x26, 0x3a, 0x08, - 0x4b, - ])); - }); - (0, node_test_1.default)('String -> bytes -> string symmetry for assorted uuids', () => { - for (let i = 0; i < 1000; i++) { - const uuid = (0, v4_js_1.default)({ rng }); - assert.equal((0, stringify_js_1.default)((0, parse_js_1.default)(uuid)), uuid); - } - }); - (0, node_test_1.default)('Case neutrality', () => { - assert.deepStrictEqual((0, parse_js_1.default)('0f5abcd1-c194-47f3-905b-2df7263a084b'), (0, parse_js_1.default)('0f5abcd1-c194-47f3-905b-2df7263a084b'.toUpperCase())); - }); - (0, node_test_1.default)('Null UUID case', () => { - assert.deepStrictEqual((0, parse_js_1.default)('00000000-0000-0000-0000-000000000000'), Uint8Array.from(new Array(16).fill(0))); - }); - (0, node_test_1.default)('UUID validation', () => { - assert.throws(() => (0, parse_js_1.default)()); - assert.throws(() => (0, parse_js_1.default)('invalid uuid')); - assert.throws(() => (0, parse_js_1.default)('zyxwvuts-rqpo-nmlk-jihg-fedcba000000')); - }); -}); diff --git a/node_modules/uuid/dist/cjs-browser/test/rng.test.d.ts b/node_modules/uuid/dist/cjs-browser/test/rng.test.d.ts deleted file mode 100644 index cb0ff5c3b5..0000000000 --- a/node_modules/uuid/dist/cjs-browser/test/rng.test.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/node_modules/uuid/dist/cjs-browser/test/rng.test.js b/node_modules/uuid/dist/cjs-browser/test/rng.test.js deleted file mode 100644 index 72c392afc1..0000000000 --- a/node_modules/uuid/dist/cjs-browser/test/rng.test.js +++ /dev/null @@ -1,14 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const assert = require("assert"); -const node_test_1 = require("node:test"); -const rng_js_1 = require("../rng.js"); -(0, node_test_1.describe)('rng', () => { - (0, node_test_1.default)('Node.js RNG', () => { - const bytes = (0, rng_js_1.default)(); - assert.equal(bytes.length, 16); - for (let i = 0; i < bytes.length; ++i) { - assert.equal(typeof bytes[i], 'number'); - } - }); -}); diff --git a/node_modules/uuid/dist/cjs-browser/test/stringify.test.d.ts b/node_modules/uuid/dist/cjs-browser/test/stringify.test.d.ts deleted file mode 100644 index cb0ff5c3b5..0000000000 --- a/node_modules/uuid/dist/cjs-browser/test/stringify.test.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/node_modules/uuid/dist/cjs-browser/test/stringify.test.js b/node_modules/uuid/dist/cjs-browser/test/stringify.test.js deleted file mode 100644 index 8b44b5c7b4..0000000000 --- a/node_modules/uuid/dist/cjs-browser/test/stringify.test.js +++ /dev/null @@ -1,23 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const assert = require("assert"); -const node_test_1 = require("node:test"); -const stringify_js_1 = require("../stringify.js"); -const BYTES = Uint8Array.of(0x0f, 0x5a, 0xbc, 0xd1, 0xc1, 0x94, 0x47, 0xf3, 0x90, 0x5b, 0x2d, 0xf7, 0x26, 0x3a, 0x08, 0x4b); -(0, node_test_1.describe)('stringify', () => { - (0, node_test_1.default)('Stringify Array (unsafe)', () => { - assert.equal((0, stringify_js_1.unsafeStringify)(BYTES), '0f5abcd1-c194-47f3-905b-2df7263a084b'); - }); - (0, node_test_1.default)('Stringify w/ offset (unsafe)', () => { - const bytes = new Uint8Array(19).fill(0); - bytes.set(BYTES, 3); - assert.equal((0, stringify_js_1.unsafeStringify)(bytes, 3), '0f5abcd1-c194-47f3-905b-2df7263a084b'); - }); - (0, node_test_1.default)('Stringify Array (safe)', () => { - assert.equal((0, stringify_js_1.default)(BYTES), '0f5abcd1-c194-47f3-905b-2df7263a084b'); - }); - (0, node_test_1.default)('Throws on not enough values (safe)', () => { - const bytes = BYTES.slice(0, 15); - assert.throws(() => (0, stringify_js_1.default)(bytes)); - }); -}); diff --git a/node_modules/uuid/dist/cjs-browser/test/test_constants.d.ts b/node_modules/uuid/dist/cjs-browser/test/test_constants.d.ts deleted file mode 100644 index 959a679fd0..0000000000 --- a/node_modules/uuid/dist/cjs-browser/test/test_constants.d.ts +++ /dev/null @@ -1,33 +0,0 @@ -export declare const TESTS: ({ - value: string; - expectedValidate: boolean; - expectedVersion: number; -} | { - value: string; - expectedValidate: boolean; - expectedVersion?: undefined; -} | { - value: undefined; - expectedValidate: boolean; - expectedVersion?: undefined; -} | { - value: null; - expectedValidate: boolean; - expectedVersion?: undefined; -} | { - value: number; - expectedValidate: boolean; - expectedVersion?: undefined; -} | { - value: RegExp; - expectedValidate: boolean; - expectedVersion?: undefined; -} | { - value: Date; - expectedValidate: boolean; - expectedVersion?: undefined; -} | { - value: boolean; - expectedValidate: boolean; - expectedVersion?: undefined; -})[]; diff --git a/node_modules/uuid/dist/cjs-browser/test/test_constants.js b/node_modules/uuid/dist/cjs-browser/test/test_constants.js deleted file mode 100644 index e1c2752079..0000000000 --- a/node_modules/uuid/dist/cjs-browser/test/test_constants.js +++ /dev/null @@ -1,91 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.TESTS = void 0; -const max_js_1 = require("../max.js"); -const nil_js_1 = require("../nil.js"); -exports.TESTS = [ - { value: nil_js_1.default, expectedValidate: true, expectedVersion: 0 }, - { value: max_js_1.default, expectedValidate: true, expectedVersion: 15 }, - { value: '00000000-0000-1000-8000-000000000000', expectedValidate: true, expectedVersion: 1 }, - { value: 'ffffffff-ffff-1fff-8fff-ffffffffffff', expectedValidate: true, expectedVersion: 1 }, - { value: '00000000-0000-2000-8000-000000000000', expectedValidate: true, expectedVersion: 2 }, - { value: 'ffffffff-ffff-2fff-bfff-ffffffffffff', expectedValidate: true, expectedVersion: 2 }, - { value: '00000000-0000-3000-8000-000000000000', expectedValidate: true, expectedVersion: 3 }, - { value: 'ffffffff-ffff-3fff-bfff-ffffffffffff', expectedValidate: true, expectedVersion: 3 }, - { value: '00000000-0000-4000-8000-000000000000', expectedValidate: true, expectedVersion: 4 }, - { value: 'ffffffff-ffff-4fff-bfff-ffffffffffff', expectedValidate: true, expectedVersion: 4 }, - { value: '00000000-0000-5000-8000-000000000000', expectedValidate: true, expectedVersion: 5 }, - { value: 'ffffffff-ffff-5fff-bfff-ffffffffffff', expectedValidate: true, expectedVersion: 5 }, - { value: '00000000-0000-6000-8000-000000000000', expectedValidate: true, expectedVersion: 6 }, - { value: 'ffffffff-ffff-6fff-bfff-ffffffffffff', expectedValidate: true, expectedVersion: 6 }, - { value: '00000000-0000-7000-8000-000000000000', expectedValidate: true, expectedVersion: 7 }, - { value: 'ffffffff-ffff-7fff-bfff-ffffffffffff', expectedValidate: true, expectedVersion: 7 }, - { value: '00000000-0000-8000-8000-000000000000', expectedValidate: true, expectedVersion: 8 }, - { value: 'ffffffff-ffff-8fff-bfff-ffffffffffff', expectedValidate: true, expectedVersion: 8 }, - { value: '00000000-0000-9000-8000-000000000000', expectedValidate: false }, - { value: 'ffffffff-ffff-9fff-bfff-ffffffffffff', expectedValidate: false }, - { value: '00000000-0000-a000-8000-000000000000', expectedValidate: false }, - { value: 'ffffffff-ffff-afff-bfff-ffffffffffff', expectedValidate: false }, - { value: '00000000-0000-b000-8000-000000000000', expectedValidate: false }, - { value: 'ffffffff-ffff-bfff-bfff-ffffffffffff', expectedValidate: false }, - { value: '00000000-0000-c000-8000-000000000000', expectedValidate: false }, - { value: 'ffffffff-ffff-cfff-bfff-ffffffffffff', expectedValidate: false }, - { value: '00000000-0000-d000-8000-000000000000', expectedValidate: false }, - { value: 'ffffffff-ffff-dfff-bfff-ffffffffffff', expectedValidate: false }, - { value: '00000000-0000-e000-8000-000000000000', expectedValidate: false }, - { value: 'ffffffff-ffff-efff-bfff-ffffffffffff', expectedValidate: false }, - { value: 'd9428888-122b-11e1-b85c-61cd3cbb3210', expectedValidate: true, expectedVersion: 1 }, - { value: '000003e8-2363-21ef-b200-325096b39f47', expectedValidate: true, expectedVersion: 2 }, - { value: 'a981a0c2-68b1-35dc-bcfc-296e52ab01ec', expectedValidate: true, expectedVersion: 3 }, - { value: '109156be-c4fb-41ea-b1b4-efe1671c5836', expectedValidate: true, expectedVersion: 4 }, - { value: '90123e1c-7512-523e-bb28-76fab9f2f73d', expectedValidate: true, expectedVersion: 5 }, - { value: '1ef21d2f-1207-6660-8c4f-419efbd44d48', expectedValidate: true, expectedVersion: 6 }, - { value: '017f22e2-79b0-7cc3-98c4-dc0c0c07398f', expectedValidate: true, expectedVersion: 7 }, - { value: '0d8f23a0-697f-83ae-802e-48f3756dd581', expectedValidate: true, expectedVersion: 8 }, - { value: '00000000-0000-1000-0000-000000000000', expectedValidate: false }, - { value: '00000000-0000-1000-1000-000000000000', expectedValidate: false }, - { value: '00000000-0000-1000-2000-000000000000', expectedValidate: false }, - { value: '00000000-0000-1000-3000-000000000000', expectedValidate: false }, - { value: '00000000-0000-1000-4000-000000000000', expectedValidate: false }, - { value: '00000000-0000-1000-5000-000000000000', expectedValidate: false }, - { value: '00000000-0000-1000-6000-000000000000', expectedValidate: false }, - { value: '00000000-0000-1000-7000-000000000000', expectedValidate: false }, - { value: '00000000-0000-1000-8000-000000000000', expectedValidate: true, expectedVersion: 1 }, - { value: '00000000-0000-1000-9000-000000000000', expectedValidate: true, expectedVersion: 1 }, - { value: '00000000-0000-1000-a000-000000000000', expectedValidate: true, expectedVersion: 1 }, - { value: '00000000-0000-1000-b000-000000000000', expectedValidate: true, expectedVersion: 1 }, - { value: '00000000-0000-1000-c000-000000000000', expectedValidate: false }, - { value: '00000000-0000-1000-d000-000000000000', expectedValidate: false }, - { value: '00000000-0000-1000-e000-000000000000', expectedValidate: false }, - { value: '00000000-0000-1000-f000-000000000000', expectedValidate: false }, - { value: '00000000000000000000000000000000', expectedValidate: false }, - { value: '', expectedValidate: false }, - { value: 'invalid uuid string', expectedValidate: false }, - { - value: '=Y00a-f*vb*-c-d#-p00f\b-g0h-#i^-j*3&-L00k-\nl---00n-fg000-00p-00r+', - expectedValidate: false, - }, - { value: undefined, expectedValidate: false }, - { value: null, expectedValidate: false }, - { value: 123, expectedValidate: false }, - { value: /regex/, expectedValidate: false }, - { value: new Date(0), expectedValidate: false }, - { value: false, expectedValidate: false }, -]; -for (let charIndex = 0; charIndex < 36; charIndex++) { - if (charIndex === 8 || - charIndex === 13 || - charIndex === 14 || - charIndex === 18 || - charIndex === 23) { - continue; - } - const nilChars = nil_js_1.default.split(''); - const maxChars = max_js_1.default.split(''); - for (let i = 0; i < 4; i++) { - nilChars[charIndex] = (0x0 ^ (1 << i)).toString(16); - exports.TESTS.push({ value: nilChars.join(''), expectedValidate: false }); - maxChars[charIndex] = (0xf ^ (1 << i)).toString(16); - exports.TESTS.push({ value: maxChars.join(''), expectedValidate: false }); - } -} diff --git a/node_modules/uuid/dist/cjs-browser/test/v1.test.d.ts b/node_modules/uuid/dist/cjs-browser/test/v1.test.d.ts deleted file mode 100644 index cb0ff5c3b5..0000000000 --- a/node_modules/uuid/dist/cjs-browser/test/v1.test.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/node_modules/uuid/dist/cjs-browser/test/v1.test.js b/node_modules/uuid/dist/cjs-browser/test/v1.test.js deleted file mode 100644 index 2013927198..0000000000 --- a/node_modules/uuid/dist/cjs-browser/test/v1.test.js +++ /dev/null @@ -1,127 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const assert = require("assert"); -const node_test_1 = require("node:test"); -const parse_js_1 = require("../parse.js"); -const v1_js_1 = require("../v1.js"); -const TIME = 1321644961388; -const RFC_V1 = 'c232ab00-9414-11ec-b3c8-9f68deced846'; -const RFC_V1_BYTES = (0, parse_js_1.default)(RFC_V1); -const RFC_OPTIONS = { - msecs: 0x17f22e279b0, - nsecs: 0, - clockseq: 0x33c8, - node: Uint8Array.of(0x9f, 0x68, 0xde, 0xce, 0xd8, 0x46), -}; -const RFC_RANDOM = Uint8Array.of(0, 0, 0, 0, 0, 0, 0, 0, RFC_OPTIONS.clockseq >> 8, RFC_OPTIONS.clockseq & 0xff, ...RFC_OPTIONS.node); -function compareV1TimeField(a, b) { - a = a.split('-').slice(0, 3).reverse().join(''); - b = b.split('-').slice(0, 3).reverse().join(''); - return a < b ? -1 : a > b ? 1 : 0; -} -(0, node_test_1.describe)('v1', () => { - (0, node_test_1.default)('v1 sort order (default)', () => { - const ids = [(0, v1_js_1.default)(), (0, v1_js_1.default)(), (0, v1_js_1.default)(), (0, v1_js_1.default)(), (0, v1_js_1.default)()]; - const sorted = [...ids].sort(compareV1TimeField); - assert.deepEqual(ids, sorted); - }); - (0, node_test_1.default)('v1 sort order (time option)', () => { - const ids = [ - (0, v1_js_1.default)({ msecs: TIME - 10 * 3600 * 1000 }), - (0, v1_js_1.default)({ msecs: TIME - 1 }), - (0, v1_js_1.default)({ msecs: TIME }), - (0, v1_js_1.default)({ msecs: TIME + 1 }), - (0, v1_js_1.default)({ msecs: TIME + 28 * 24 * 3600 * 1000 }), - ]; - const sorted = [...ids].sort(compareV1TimeField); - assert.deepEqual(ids, sorted); - }); - (0, node_test_1.default)('v1(options)', () => { - assert.equal((0, v1_js_1.default)({ msecs: RFC_OPTIONS.msecs, random: RFC_RANDOM }), RFC_V1, 'minimal options'); - assert.equal((0, v1_js_1.default)(RFC_OPTIONS), RFC_V1, 'full options'); - }); - (0, node_test_1.default)('v1(options) equality', () => { - assert.notEqual((0, v1_js_1.default)({ msecs: TIME }), (0, v1_js_1.default)({ msecs: TIME }), 'UUIDs with minimal options differ'); - assert.equal((0, v1_js_1.default)(RFC_OPTIONS), (0, v1_js_1.default)(RFC_OPTIONS), 'UUIDs with full options are identical'); - }); - (0, node_test_1.default)('fills one UUID into a buffer as expected', () => { - const buffer = new Uint8Array(16); - const result = (0, v1_js_1.default)(RFC_OPTIONS, buffer); - assert.deepEqual(buffer, RFC_V1_BYTES); - assert.strictEqual(buffer, result); - }); - (0, node_test_1.default)('fills two UUIDs into a buffer as expected', () => { - const buffer = new Uint8Array(32); - (0, v1_js_1.default)(RFC_OPTIONS, buffer, 0); - (0, v1_js_1.default)(RFC_OPTIONS, buffer, 16); - const expectedBuf = new Uint8Array(32); - expectedBuf.set(RFC_V1_BYTES); - expectedBuf.set(RFC_V1_BYTES, 16); - assert.deepEqual(buffer, expectedBuf); - }); - (0, node_test_1.default)('v1() state transitions', () => { - const PRE_STATE = { - msecs: 10, - nsecs: 20, - clockseq: 0x1234, - node: Uint8Array.of(0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc), - }; - const tests = [ - { - title: 'initial state', - state: {}, - now: 10, - expected: { - msecs: 10, - nsecs: 0, - clockseq: RFC_OPTIONS.clockseq, - node: RFC_OPTIONS.node, - }, - }, - { - title: 'same time interval', - state: { ...PRE_STATE }, - now: PRE_STATE.msecs, - expected: { - ...PRE_STATE, - nsecs: 21, - }, - }, - { - title: 'new time interval', - state: { ...PRE_STATE }, - now: PRE_STATE.msecs + 1, - expected: { - ...PRE_STATE, - msecs: PRE_STATE.msecs + 1, - nsecs: 0, - }, - }, - { - title: 'same time interval (nsecs overflow)', - state: { ...PRE_STATE, nsecs: 9999 }, - now: PRE_STATE.msecs, - expected: { - ...PRE_STATE, - nsecs: 0, - clockseq: RFC_OPTIONS.clockseq, - node: RFC_OPTIONS.node, - }, - }, - { - title: 'time regression', - state: { ...PRE_STATE }, - now: PRE_STATE.msecs - 1, - expected: { - ...PRE_STATE, - msecs: PRE_STATE.msecs - 1, - clockseq: RFC_OPTIONS.clockseq, - node: RFC_OPTIONS.node, - }, - }, - ]; - for (const { title, state, now, expected } of tests) { - assert.deepStrictEqual((0, v1_js_1.updateV1State)(state, now, RFC_RANDOM), expected, `Failed: ${title}`); - } - }); -}); diff --git a/node_modules/uuid/dist/cjs-browser/test/v35.test.d.ts b/node_modules/uuid/dist/cjs-browser/test/v35.test.d.ts deleted file mode 100644 index cb0ff5c3b5..0000000000 --- a/node_modules/uuid/dist/cjs-browser/test/v35.test.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/node_modules/uuid/dist/cjs-browser/test/v35.test.js b/node_modules/uuid/dist/cjs-browser/test/v35.test.js deleted file mode 100644 index d12394b9c0..0000000000 --- a/node_modules/uuid/dist/cjs-browser/test/v35.test.js +++ /dev/null @@ -1,143 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const assert = require("assert"); -const node_test_1 = require("node:test"); -const md5_js_1 = require("../md5.js"); -const sha1_js_1 = require("../sha1.js"); -const v3_js_1 = require("../v3.js"); -const v35_js_1 = require("../v35.js"); -const v5_js_1 = require("../v5.js"); -(0, node_test_1.describe)('v35', () => { - const HASH_SAMPLES = [ - { - input: (0, v35_js_1.stringToBytes)(''), - sha1: 'da39a3ee5e6b4b0d3255bfef95601890afd80709', - md5: 'd41d8cd98f00b204e9800998ecf8427e', - }, - { - input: (0, v35_js_1.stringToBytes)('\t\b\f !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\u00A1\u00A2\u00A3\u00A4\u00A5\u00A6\u00A7\u00A8\u00A9\u00AA\u00AB\u00AC\u00AE\u00AF\u00B0\u00B1\u00B2\u00B3\u00B4\u00B5\u00B6\u00B7\u00B8\u00B9\u00BA\u00BB\u00BC\u00BD\u00BE\u00BF\u00C0\u00C1\u00C2\u00C3\u00C4\u00C5\u00C6\u00C7\u00C8\u00C9\u00CA\u00CB\u00CC\u00CD\u00CE\u00CF\u00D0\u00D1\u00D2\u00D3\u00D4\u00D5\u00D6\u00D7\u00D8\u00D9\u00DA\u00DB\u00DC\u00DD\u00DE\u00DF\u00E0\u00E1\u00E2\u00E3\u00E4\u00E5\u00E6\u00E7\u00E8\u00E9\u00EA\u00EB\u00EC\u00ED\u00EE\u00EF\u00F0\u00F1\u00F2\u00F3\u00F4\u00F5\u00F6\u00F7\u00F8\u00F9\u00FA\u00FB\u00FC\u00FD\u00FE\u00FF'), - sha1: 'ca4a426a3d536f14cfd79011e79e10d64de950a0', - md5: 'e8098ec21950f841731d28749129d3ee', - }, - { - input: (0, v35_js_1.stringToBytes)('\u00A5\u0104\u018F\u0256\u02B1o\u0315\u038E\u0409\u0500\u0531\u05E1\u05B6\u0920\u0903\u09A4\u0983\u0A20\u0A02\u0AA0\u0A83\u0B06\u0C05\u0C03\u1401\u16A0'), - sha1: 'f2753ebc390e5f637e333c2a4179644a93ae9f65', - md5: '231b309e277b6be8bb3d6c688b7f098b', - }, - ]; - function hashToHex(hash) { - const chars = new Array(hash.length); - for (let i = 0; i < hash.length; i++) { - chars[i] = hash[i].toString(16).padStart(2, '0'); - } - return chars.join(''); - } - HASH_SAMPLES.forEach(function (sample, i) { - (0, node_test_1.default)(`sha1(node) HASH_SAMPLES[${i}]`, () => { - assert.equal(hashToHex((0, sha1_js_1.default)(sample.input)), sample.sha1); - }); - }); - HASH_SAMPLES.forEach(function (sample, i) { - (0, node_test_1.default)(`md5(node) HASH_SAMPLES[${i}]`, () => { - assert.equal(hashToHex((0, md5_js_1.default)(sample.input)), sample.md5); - }); - }); - (0, node_test_1.default)('v3', () => { - assert.strictEqual((0, v3_js_1.default)('hello.example.com', v3_js_1.default.DNS), '9125a8dc-52ee-365b-a5aa-81b0b3681cf6'); - assert.strictEqual((0, v3_js_1.default)('http://example.com/hello', v3_js_1.default.URL), 'c6235813-3ba4-3801-ae84-e0a6ebb7d138'); - assert.strictEqual((0, v3_js_1.default)('hello', '0f5abcd1-c194-47f3-905b-2df7263a084b'), 'a981a0c2-68b1-35dc-bcfc-296e52ab01ec'); - }); - (0, node_test_1.default)('v3 namespace.toUpperCase', () => { - assert.strictEqual((0, v3_js_1.default)('hello.example.com', v3_js_1.default.DNS.toUpperCase()), '9125a8dc-52ee-365b-a5aa-81b0b3681cf6'); - assert.strictEqual((0, v3_js_1.default)('http://example.com/hello', v3_js_1.default.URL.toUpperCase()), 'c6235813-3ba4-3801-ae84-e0a6ebb7d138'); - assert.strictEqual((0, v3_js_1.default)('hello', '0f5abcd1-c194-47f3-905b-2df7263a084b'.toUpperCase()), 'a981a0c2-68b1-35dc-bcfc-296e52ab01ec'); - }); - (0, node_test_1.default)('v3 namespace string validation', () => { - assert.throws(() => { - (0, v3_js_1.default)('hello.example.com', 'zyxwvuts-rqpo-nmlk-jihg-fedcba000000'); - }); - assert.throws(() => { - (0, v3_js_1.default)('hello.example.com', 'invalid uuid value'); - }); - assert.ok((0, v3_js_1.default)('hello.example.com', '00000000-0000-0000-0000-000000000000')); - }); - (0, node_test_1.default)('v3 namespace buffer validation', () => { - assert.throws(() => { - (0, v3_js_1.default)('hello.example.com', new Uint8Array(15)); - }); - assert.throws(() => { - (0, v3_js_1.default)('hello.example.com', new Uint8Array(17)); - }); - assert.ok((0, v3_js_1.default)('hello.example.com', new Uint8Array(16).fill(0))); - }); - (0, node_test_1.default)('v3 fill buffer', () => { - let buf = new Uint8Array(16); - const expectedUuid = Uint8Array.of(0x91, 0x25, 0xa8, 0xdc, 0x52, 0xee, 0x36, 0x5b, 0xa5, 0xaa, 0x81, 0xb0, 0xb3, 0x68, 0x1c, 0xf6); - const result = (0, v3_js_1.default)('hello.example.com', v3_js_1.default.DNS, buf); - assert.deepEqual(buf, expectedUuid); - assert.strictEqual(result, buf); - buf = new Uint8Array(19).fill(0xaa); - const expectedBuf = new Uint8Array(19).fill(0xaa); - expectedBuf.set(expectedUuid, 3); - (0, v3_js_1.default)('hello.example.com', v3_js_1.default.DNS, buf, 3); - assert.deepEqual(buf, expectedBuf); - }); - (0, node_test_1.default)('v3 undefined/null', () => { - assert.throws(() => (0, v3_js_1.default)()); - assert.throws(() => (0, v3_js_1.default)('hello')); - assert.throws(() => (0, v3_js_1.default)('hello.example.com', undefined)); - assert.throws(() => (0, v3_js_1.default)('hello.example.com', null, new Uint8Array(16))); - }); - (0, node_test_1.default)('v5', () => { - assert.strictEqual((0, v5_js_1.default)('hello.example.com', v5_js_1.default.DNS), 'fdda765f-fc57-5604-a269-52a7df8164ec'); - assert.strictEqual((0, v5_js_1.default)('http://example.com/hello', v5_js_1.default.URL), '3bbcee75-cecc-5b56-8031-b6641c1ed1f1'); - assert.strictEqual((0, v5_js_1.default)('hello', '0f5abcd1-c194-47f3-905b-2df7263a084b'), '90123e1c-7512-523e-bb28-76fab9f2f73d'); - }); - (0, node_test_1.default)('v5 namespace.toUpperCase', () => { - assert.strictEqual((0, v5_js_1.default)('hello.example.com', v5_js_1.default.DNS.toUpperCase()), 'fdda765f-fc57-5604-a269-52a7df8164ec'); - assert.strictEqual((0, v5_js_1.default)('http://example.com/hello', v5_js_1.default.URL.toUpperCase()), '3bbcee75-cecc-5b56-8031-b6641c1ed1f1'); - assert.strictEqual((0, v5_js_1.default)('hello', '0f5abcd1-c194-47f3-905b-2df7263a084b'.toUpperCase()), '90123e1c-7512-523e-bb28-76fab9f2f73d'); - }); - (0, node_test_1.default)('v5 namespace string validation', () => { - assert.throws(() => { - (0, v5_js_1.default)('hello.example.com', 'zyxwvuts-rqpo-nmlk-jihg-fedcba000000'); - }); - assert.throws(() => { - (0, v5_js_1.default)('hello.example.com', 'invalid uuid value'); - }); - assert.ok((0, v5_js_1.default)('hello.example.com', '00000000-0000-0000-0000-000000000000')); - }); - (0, node_test_1.default)('v5 namespace buffer validation', () => { - assert.throws(() => { - (0, v5_js_1.default)('hello.example.com', new Uint8Array(15)); - }); - assert.throws(() => { - (0, v5_js_1.default)('hello.example.com', new Uint8Array(17)); - }); - assert.ok((0, v5_js_1.default)('hello.example.com', new Uint8Array(16).fill(0))); - }); - (0, node_test_1.default)('v5 fill buffer', () => { - let buf = new Uint8Array(16); - const expectedUuid = Uint8Array.of(0xfd, 0xda, 0x76, 0x5f, 0xfc, 0x57, 0x56, 0x04, 0xa2, 0x69, 0x52, 0xa7, 0xdf, 0x81, 0x64, 0xec); - const result = (0, v5_js_1.default)('hello.example.com', v5_js_1.default.DNS, buf); - assert.deepEqual(buf, expectedUuid); - assert.strictEqual(result, buf); - buf = new Uint8Array(19).fill(0xaa); - const expectedBuf = new Uint8Array(19).fill(0xaa); - expectedBuf.set(expectedUuid, 3); - (0, v5_js_1.default)('hello.example.com', v5_js_1.default.DNS, buf, 3); - assert.deepEqual(buf, expectedBuf); - }); - (0, node_test_1.default)('v5 undefined/null', () => { - assert.throws(() => (0, v5_js_1.default)()); - assert.throws(() => (0, v5_js_1.default)('hello')); - assert.throws(() => (0, v5_js_1.default)('hello.example.com', undefined)); - assert.throws(() => (0, v5_js_1.default)('hello.example.com', null, new Uint8Array(16))); - }); - (0, node_test_1.default)('v3/v5 constants', () => { - assert.strictEqual(v3_js_1.default.DNS, '6ba7b810-9dad-11d1-80b4-00c04fd430c8'); - assert.strictEqual(v3_js_1.default.URL, '6ba7b811-9dad-11d1-80b4-00c04fd430c8'); - assert.strictEqual(v5_js_1.default.DNS, '6ba7b810-9dad-11d1-80b4-00c04fd430c8'); - assert.strictEqual(v5_js_1.default.URL, '6ba7b811-9dad-11d1-80b4-00c04fd430c8'); - }); -}); diff --git a/node_modules/uuid/dist/cjs-browser/test/v4.test.d.ts b/node_modules/uuid/dist/cjs-browser/test/v4.test.d.ts deleted file mode 100644 index cb0ff5c3b5..0000000000 --- a/node_modules/uuid/dist/cjs-browser/test/v4.test.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/node_modules/uuid/dist/cjs-browser/test/v4.test.js b/node_modules/uuid/dist/cjs-browser/test/v4.test.js deleted file mode 100644 index db2680f76f..0000000000 --- a/node_modules/uuid/dist/cjs-browser/test/v4.test.js +++ /dev/null @@ -1,60 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const assert = require("assert"); -const node_test_1 = require("node:test"); -const native_js_1 = require("../native.js"); -const v4_js_1 = require("../v4.js"); -const randomBytesFixture = Uint8Array.of(0x10, 0x91, 0x56, 0xbe, 0xc4, 0xfb, 0xc1, 0xea, 0x71, 0xb4, 0xef, 0xe1, 0x67, 0x1c, 0x58, 0x36); -const expectedBytes = Uint8Array.of(16, 145, 86, 190, 196, 251, 65, 234, 177, 180, 239, 225, 103, 28, 88, 54); -(0, node_test_1.describe)('v4', () => { - (0, node_test_1.default)('subsequent UUIDs are different', () => { - const id1 = (0, v4_js_1.default)(); - const id2 = (0, v4_js_1.default)(); - assert.ok(id1 !== id2); - }); - (0, node_test_1.default)('should uses native randomUUID() if no option is passed', async () => { - const mock = (await Promise.resolve().then(() => require('node:test'))).default.mock; - if (!mock) { - return; - } - const mockRandomUUID = mock.method(native_js_1.default, 'randomUUID'); - assert.equal(mockRandomUUID.mock.callCount(), 0); - (0, v4_js_1.default)(); - assert.equal(mockRandomUUID.mock.callCount(), 1); - mock.restoreAll(); - }); - (0, node_test_1.default)('should not use native randomUUID() if an option is passed', async () => { - const mock = (await Promise.resolve().then(() => require('node:test'))).default.mock; - if (!mock) { - return; - } - const mockRandomUUID = mock.method(native_js_1.default, 'randomUUID'); - assert.equal(mockRandomUUID.mock.callCount(), 0); - (0, v4_js_1.default)({}); - assert.equal(mockRandomUUID.mock.callCount(), 0); - mock.restoreAll(); - }); - (0, node_test_1.default)('explicit options.random produces expected result', () => { - const id = (0, v4_js_1.default)({ random: randomBytesFixture }); - assert.strictEqual(id, '109156be-c4fb-41ea-b1b4-efe1671c5836'); - }); - (0, node_test_1.default)('explicit options.rng produces expected result', () => { - const id = (0, v4_js_1.default)({ rng: () => randomBytesFixture }); - assert.strictEqual(id, '109156be-c4fb-41ea-b1b4-efe1671c5836'); - }); - (0, node_test_1.default)('fills one UUID into a buffer as expected', () => { - const buffer = new Uint8Array(16); - const result = (0, v4_js_1.default)({ random: randomBytesFixture }, buffer); - assert.deepEqual(buffer, expectedBytes); - assert.strictEqual(buffer, result); - }); - (0, node_test_1.default)('fills two UUIDs into a buffer as expected', () => { - const buffer = new Uint8Array(32); - (0, v4_js_1.default)({ random: randomBytesFixture }, buffer, 0); - (0, v4_js_1.default)({ random: randomBytesFixture }, buffer, 16); - const expectedBuf = new Uint8Array(32); - expectedBuf.set(expectedBytes); - expectedBuf.set(expectedBytes, 16); - assert.deepEqual(buffer, expectedBuf); - }); -}); diff --git a/node_modules/uuid/dist/cjs-browser/test/v6.test.d.ts b/node_modules/uuid/dist/cjs-browser/test/v6.test.d.ts deleted file mode 100644 index cb0ff5c3b5..0000000000 --- a/node_modules/uuid/dist/cjs-browser/test/v6.test.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/node_modules/uuid/dist/cjs-browser/test/v6.test.js b/node_modules/uuid/dist/cjs-browser/test/v6.test.js deleted file mode 100644 index 32ba29240e..0000000000 --- a/node_modules/uuid/dist/cjs-browser/test/v6.test.js +++ /dev/null @@ -1,56 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const assert = require("assert"); -const node_test_1 = require("node:test"); -const v1ToV6_js_1 = require("../v1ToV6.js"); -const v6_js_1 = require("../v6.js"); -const v6ToV1_js_1 = require("../v6ToV1.js"); -(0, node_test_1.describe)('v6', () => { - const V1_ID = 'f1207660-21d2-11ef-8c4f-419efbd44d48'; - const V6_ID = '1ef21d2f-1207-6660-8c4f-419efbd44d48'; - const fullOptions = { - msecs: 0x133b891f705, - nsecs: 0x1538, - clockseq: 0x385c, - node: Uint8Array.of(0x61, 0xcd, 0x3c, 0xbb, 0x32, 0x10), - }; - const EXPECTED_BYTES = Uint8Array.of(0x1e, 0x11, 0x22, 0xbd, 0x94, 0x28, 0x68, 0x88, 0xb8, 0x5c, 0x61, 0xcd, 0x3c, 0xbb, 0x32, 0x10); - (0, node_test_1.default)('default behavior', () => { - const id = (0, v6_js_1.default)(); - assert.ok(/[0-9a-f]{8}-[0-9a-f]{4}-6[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}/.test(id), 'id is valid v6 UUID'); - }); - (0, node_test_1.default)('default behavior (binary type)', () => { - const buffer = new Uint8Array(16); - const result = (0, v6_js_1.default)(fullOptions, buffer); - assert.deepEqual(buffer, EXPECTED_BYTES); - assert.strictEqual(buffer, result); - }); - (0, node_test_1.default)('all options', () => { - const id = (0, v6_js_1.default)(fullOptions); - assert.equal(id, '1e1122bd-9428-6888-b85c-61cd3cbb3210'); - }); - (0, node_test_1.default)('sort by creation time', () => { - const ids = []; - for (let i = 0; i < 5; i++) { - ids.push((0, v6_js_1.default)({ msecs: i * 1000 })); - } - assert.deepEqual(ids, ids.slice().sort()); - }); - (0, node_test_1.default)('creating at array offset', () => { - const buffer = new Uint8Array(32); - (0, v6_js_1.default)(fullOptions, buffer, 0); - (0, v6_js_1.default)(fullOptions, buffer, 16); - const expectedBuf = new Uint8Array(32); - expectedBuf.set(EXPECTED_BYTES, 0); - expectedBuf.set(EXPECTED_BYTES, 16); - assert.deepEqual(buffer, expectedBuf); - }); - (0, node_test_1.default)('v1 -> v6 conversion', () => { - const id = (0, v1ToV6_js_1.default)(V1_ID); - assert.equal(id, V6_ID); - }); - (0, node_test_1.default)('v6 -> v1 conversion', () => { - const id = (0, v6ToV1_js_1.default)(V6_ID); - assert.equal(id, V1_ID); - }); -}); diff --git a/node_modules/uuid/dist/cjs-browser/test/v7.test.d.ts b/node_modules/uuid/dist/cjs-browser/test/v7.test.d.ts deleted file mode 100644 index cb0ff5c3b5..0000000000 --- a/node_modules/uuid/dist/cjs-browser/test/v7.test.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/node_modules/uuid/dist/cjs-browser/test/v7.test.js b/node_modules/uuid/dist/cjs-browser/test/v7.test.js deleted file mode 100644 index 2c549d534a..0000000000 --- a/node_modules/uuid/dist/cjs-browser/test/v7.test.js +++ /dev/null @@ -1,194 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const assert = require("assert"); -const node_test_1 = require("node:test"); -const parse_js_1 = require("../parse.js"); -const stringify_js_1 = require("../stringify.js"); -const v7_js_1 = require("../v7.js"); -const RFC_V7 = '017f22e2-79b0-7cc3-98c4-dc0c0c07398f'; -const RFC_V7_BYTES = (0, parse_js_1.default)('017f22e2-79b0-7cc3-98c4-dc0c0c07398f'); -const RFC_MSECS = 0x17f22e279b0; -const RFC_SEQ = (0x0cc3 << 20) | (0x98c4dc >> 2); -const RFC_RANDOM = Uint8Array.of(0x10, 0x91, 0x56, 0xbe, 0xc4, 0xfb, 0x0c, 0xc3, 0x18, 0xc4, 0x6c, 0x0c, 0x0c, 0x07, 0x39, 0x8f); -(0, node_test_1.describe)('v7', () => { - (0, node_test_1.default)('subsequent UUIDs are different', () => { - const id1 = (0, v7_js_1.default)(); - const id2 = (0, v7_js_1.default)(); - assert.ok(id1 !== id2); - }); - (0, node_test_1.default)('explicit options.random and options.msecs produces expected result', () => { - const id = (0, v7_js_1.default)({ - random: RFC_RANDOM, - msecs: RFC_MSECS, - seq: RFC_SEQ, - }); - assert.strictEqual(id, RFC_V7); - }); - (0, node_test_1.default)('explicit options.rng produces expected result', () => { - const id = (0, v7_js_1.default)({ - rng: () => RFC_RANDOM, - msecs: RFC_MSECS, - seq: RFC_SEQ, - }); - assert.strictEqual(id, RFC_V7); - }); - (0, node_test_1.default)('explicit options.msecs produces expected result', () => { - const id = (0, v7_js_1.default)({ - msecs: RFC_MSECS, - }); - assert.strictEqual(id.indexOf('017f22e2'), 0); - }); - (0, node_test_1.default)('fills one UUID into a buffer as expected', () => { - const buffer = new Uint8Array(16); - const result = (0, v7_js_1.default)({ - random: RFC_RANDOM, - msecs: RFC_MSECS, - seq: RFC_SEQ, - }, buffer); - (0, stringify_js_1.default)(buffer); - assert.deepEqual(buffer, RFC_V7_BYTES); - assert.strictEqual(buffer, result); - }); - (0, node_test_1.default)('fills two UUIDs into a buffer as expected', () => { - const buffer = new Uint8Array(32); - (0, v7_js_1.default)({ - random: RFC_RANDOM, - msecs: RFC_MSECS, - seq: RFC_SEQ, - }, buffer, 0); - (0, v7_js_1.default)({ - random: RFC_RANDOM, - msecs: RFC_MSECS, - seq: RFC_SEQ, - }, buffer, 16); - const expected = new Uint8Array(32); - expected.set(RFC_V7_BYTES); - expected.set(RFC_V7_BYTES, 16); - assert.deepEqual(buffer, expected); - }); - (0, node_test_1.default)('lexicographical sorting is preserved', () => { - let id; - let prior; - let msecs = RFC_MSECS; - for (let i = 0; i < 20000; ++i) { - if (i % 1500 === 0) { - msecs += 1; - } - id = (0, v7_js_1.default)({ msecs, seq: i }); - if (prior !== undefined) { - assert.ok(prior < id, `${prior} < ${id}`); - } - prior = id; - } - }); - (0, node_test_1.default)('can supply seq', () => { - let seq = 0x12345; - let uuid = (0, v7_js_1.default)({ - msecs: RFC_MSECS, - seq, - }); - assert.strictEqual(uuid.substr(0, 25), '017f22e2-79b0-7000-848d-1'); - seq = 0x6fffffff; - uuid = (0, v7_js_1.default)({ - msecs: RFC_MSECS, - seq, - }); - assert.strictEqual(uuid.substring(0, 25), '017f22e2-79b0-76ff-bfff-f'); - }); - (0, node_test_1.default)('internal seq is reset upon timestamp change', () => { - (0, v7_js_1.default)({ - msecs: RFC_MSECS, - seq: 0x6fffffff, - }); - const uuid = (0, v7_js_1.default)({ - msecs: RFC_MSECS + 1, - }); - assert.ok(uuid.indexOf('fff') !== 15); - }); - (0, node_test_1.default)('v7() state transitions', () => { - const tests = [ - { - title: 'new time interval', - state: { msecs: 1, seq: 123 }, - now: 2, - expected: { - msecs: 2, - seq: 0x6c318c4, - }, - }, - { - title: 'same time interval', - state: { msecs: 1, seq: 123 }, - now: 1, - expected: { - msecs: 1, - seq: 124, - }, - }, - { - title: 'same time interval (sequence rollover)', - state: { msecs: 1, seq: 0xffffffff }, - now: 1, - expected: { - msecs: 2, - seq: 0, - }, - }, - { - title: 'time regression', - state: { msecs: 2, seq: 123 }, - now: 1, - expected: { - msecs: 2, - seq: 124, - }, - }, - { - title: 'time regression (sequence rollover)', - state: { msecs: 2, seq: 0xffffffff }, - now: 1, - expected: { - msecs: 3, - seq: 0, - }, - }, - ]; - for (const { title, state, now, expected } of tests) { - assert.deepStrictEqual((0, v7_js_1.updateV7State)(state, now, RFC_RANDOM), expected, `Failed: ${title}`); - } - }); - (0, node_test_1.default)('flipping bits changes the result', () => { - const asBigInt = (buf) => buf.reduce((acc, v) => (acc << 8n) | BigInt(v), 0n); - const asNumber = (bits, data) => Number(BigInt.asUintN(bits, data)); - const flip = (data, n) => data ^ (1n << BigInt(127 - n)); - const optionsFrom = (data) => { - const ms = asNumber(48, data >> 80n); - const hi = asNumber(12, data >> 64n); - const lo = asNumber(20, data >> 42n); - const r = BigInt.asUintN(42, data); - return { - msecs: ms, - seq: (hi << 20) | lo, - random: Uint8Array.from([ - ...Array(10).fill(0), - ...Array(6) - .fill(0) - .map((_, i) => asNumber(8, r >> (BigInt(i) * 8n))) - .reverse(), - ]), - }; - }; - const buf = new Uint8Array(16); - const data = asBigInt((0, v7_js_1.default)({}, buf)); - const id = (0, stringify_js_1.default)(buf); - const reserved = [48, 49, 50, 51, 64, 65]; - for (let i = 0; i < 128; ++i) { - if (reserved.includes(i)) { - continue; - } - const flipped = flip(data, i); - assert.strictEqual(asBigInt((0, v7_js_1.default)(optionsFrom(flipped), buf)).toString(16), flipped.toString(16), `Unequal uuids at bit ${i}`); - assert.notStrictEqual((0, stringify_js_1.default)(buf), id); - } - }); -}); diff --git a/node_modules/uuid/dist/cjs-browser/test/validate.test.d.ts b/node_modules/uuid/dist/cjs-browser/test/validate.test.d.ts deleted file mode 100644 index cb0ff5c3b5..0000000000 --- a/node_modules/uuid/dist/cjs-browser/test/validate.test.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/node_modules/uuid/dist/cjs-browser/test/validate.test.js b/node_modules/uuid/dist/cjs-browser/test/validate.test.js deleted file mode 100644 index 234db5501e..0000000000 --- a/node_modules/uuid/dist/cjs-browser/test/validate.test.js +++ /dev/null @@ -1,13 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const assert = require("assert"); -const node_test_1 = require("node:test"); -const validate_js_1 = require("../validate.js"); -const test_constants_js_1 = require("./test_constants.js"); -(0, node_test_1.describe)('validate()', () => { - (0, node_test_1.default)('TESTS cases', () => { - for (const { value, expectedValidate } of test_constants_js_1.TESTS) { - assert.strictEqual((0, validate_js_1.default)(value), expectedValidate, `validate(${value}) should be ${expectedValidate}`); - } - }); -}); diff --git a/node_modules/uuid/dist/cjs-browser/test/version.test.d.ts b/node_modules/uuid/dist/cjs-browser/test/version.test.d.ts deleted file mode 100644 index cb0ff5c3b5..0000000000 --- a/node_modules/uuid/dist/cjs-browser/test/version.test.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/node_modules/uuid/dist/cjs-browser/test/version.test.js b/node_modules/uuid/dist/cjs-browser/test/version.test.js deleted file mode 100644 index 2846e3e045..0000000000 --- a/node_modules/uuid/dist/cjs-browser/test/version.test.js +++ /dev/null @@ -1,20 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const assert = require("assert"); -const node_test_1 = require("node:test"); -const version_js_1 = require("../version.js"); -const test_constants_js_1 = require("./test_constants.js"); -(0, node_test_1.describe)('version()', () => { - (0, node_test_1.default)('TESTS cases', () => { - for (const { value, expectedValidate, expectedVersion } of test_constants_js_1.TESTS) { - try { - const actualVersion = (0, version_js_1.default)(value); - assert.ok(expectedValidate, `version(${value}) should throw`); - assert.strictEqual(actualVersion, expectedVersion); - } - catch { - assert.ok(!expectedValidate, `version(${value}) threw unexpectedly`); - } - } - }); -}); diff --git a/node_modules/uuid/dist/cjs-browser/v1.js b/node_modules/uuid/dist/cjs-browser/v1.js index e3d492c81d..667fade140 100644 --- a/node_modules/uuid/dist/cjs-browser/v1.js +++ b/node_modules/uuid/dist/cjs-browser/v1.js @@ -49,10 +49,18 @@ function updateV1State(state, now, rnds) { return state; } function v1Bytes(rnds, msecs, nsecs, clockseq, node, buf, offset = 0) { + if (rnds.length < 16) { + throw new Error('Random bytes length must be >= 16'); + } if (!buf) { buf = new Uint8Array(16); offset = 0; } + else { + if (offset < 0 || offset + 16 > buf.length) { + throw new RangeError(`UUID byte range ${offset}:${offset + 15} is out of buffer bounds`); + } + } msecs ??= Date.now(); nsecs ??= 0; clockseq ??= ((rnds[8] << 8) | rnds[9]) & 0x3fff; diff --git a/node_modules/uuid/dist/cjs-browser/v35.d.ts b/node_modules/uuid/dist/cjs-browser/v35.d.ts index 5d1d06daef..a2c132633f 100644 --- a/node_modules/uuid/dist/cjs-browser/v35.d.ts +++ b/node_modules/uuid/dist/cjs-browser/v35.d.ts @@ -1,7 +1,7 @@ import { UUIDTypes } from './types.js'; -export declare function stringToBytes(str: string): Uint8Array; +export declare function stringToBytes(str: string): Uint8Array; export declare const DNS = "6ba7b810-9dad-11d1-80b4-00c04fd430c8"; export declare const URL = "6ba7b811-9dad-11d1-80b4-00c04fd430c8"; type HashFunction = (bytes: Uint8Array) => Uint8Array; -export default function v35(version: 0x30 | 0x50, hash: HashFunction, value: string | Uint8Array, namespace: UUIDTypes, buf?: Uint8Array, offset?: number): string | Uint8Array; +export default function v35(version: 0x30 | 0x50, hash: HashFunction, value: string | Uint8Array, namespace: UUIDTypes, buf?: Uint8Array, offset?: number): string | Uint8Array; export {}; diff --git a/node_modules/uuid/dist/cjs-browser/v4.js b/node_modules/uuid/dist/cjs-browser/v4.js index 61be26e73c..69c975e48d 100644 --- a/node_modules/uuid/dist/cjs-browser/v4.js +++ b/node_modules/uuid/dist/cjs-browser/v4.js @@ -8,11 +8,17 @@ function v4(options, buf, offset) { return native_js_1.default.randomUUID(); } options = options || {}; - const rnds = options.random || (options.rng || rng_js_1.default)(); + const rnds = options.random ?? options.rng?.() ?? (0, rng_js_1.default)(); + if (rnds.length < 16) { + throw new Error('Random bytes length must be >= 16'); + } rnds[6] = (rnds[6] & 0x0f) | 0x40; rnds[8] = (rnds[8] & 0x3f) | 0x80; if (buf) { offset = offset || 0; + if (offset < 0 || offset + 16 > buf.length) { + throw new RangeError(`UUID byte range ${offset}:${offset + 15} is out of buffer bounds`); + } for (let i = 0; i < 16; ++i) { buf[offset + i] = rnds[i]; } diff --git a/node_modules/uuid/dist/cjs-browser/v7.js b/node_modules/uuid/dist/cjs-browser/v7.js index 72cd1f17f7..ff01dc08cc 100644 --- a/node_modules/uuid/dist/cjs-browser/v7.js +++ b/node_modules/uuid/dist/cjs-browser/v7.js @@ -33,10 +33,18 @@ function updateV7State(state, now, rnds) { return state; } function v7Bytes(rnds, msecs, seq, buf, offset = 0) { + if (rnds.length < 16) { + throw new Error('Random bytes length must be >= 16'); + } if (!buf) { buf = new Uint8Array(16); offset = 0; } + else { + if (offset < 0 || offset + 16 > buf.length) { + throw new RangeError(`UUID byte range ${offset}:${offset + 15} is out of buffer bounds`); + } + } msecs ??= Date.now(); seq ??= ((rnds[6] * 0x7f) << 24) | (rnds[7] << 16) | (rnds[8] << 8) | rnds[9]; buf[offset++] = (msecs / 0x10000000000) & 0xff; diff --git a/node_modules/uuid/dist/cjs/md5.d.ts b/node_modules/uuid/dist/cjs/md5.d.ts index 26cb1a01f9..1d00cf700a 100644 --- a/node_modules/uuid/dist/cjs/md5.d.ts +++ b/node_modules/uuid/dist/cjs/md5.d.ts @@ -1,2 +1,2 @@ -declare function md5(bytes: Uint8Array): Buffer; +declare function md5(bytes: Uint8Array): Buffer; export default md5; diff --git a/node_modules/uuid/dist/cjs/parse.d.ts b/node_modules/uuid/dist/cjs/parse.d.ts index a316fb1178..86d55ef9c5 100644 --- a/node_modules/uuid/dist/cjs/parse.d.ts +++ b/node_modules/uuid/dist/cjs/parse.d.ts @@ -1,2 +1,2 @@ -declare function parse(uuid: string): Uint8Array; +declare function parse(uuid: string): Uint8Array; export default parse; diff --git a/node_modules/uuid/dist/cjs/rng.d.ts b/node_modules/uuid/dist/cjs/rng.d.ts index 73e60cf348..1fbb163599 100644 --- a/node_modules/uuid/dist/cjs/rng.d.ts +++ b/node_modules/uuid/dist/cjs/rng.d.ts @@ -1 +1 @@ -export default function rng(): Uint8Array; +export default function rng(): Uint8Array; diff --git a/node_modules/uuid/dist/cjs/sha1.d.ts b/node_modules/uuid/dist/cjs/sha1.d.ts index c37bda8e9f..8e272a55be 100644 --- a/node_modules/uuid/dist/cjs/sha1.d.ts +++ b/node_modules/uuid/dist/cjs/sha1.d.ts @@ -1,2 +1,2 @@ -declare function sha1(bytes: Uint8Array): Buffer; +declare function sha1(bytes: Uint8Array): Buffer; export default sha1; diff --git a/node_modules/uuid/dist/cjs/test/parse.test.d.ts b/node_modules/uuid/dist/cjs/test/parse.test.d.ts deleted file mode 100644 index cb0ff5c3b5..0000000000 --- a/node_modules/uuid/dist/cjs/test/parse.test.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/node_modules/uuid/dist/cjs/test/parse.test.js b/node_modules/uuid/dist/cjs/test/parse.test.js deleted file mode 100644 index f9053a419e..0000000000 --- a/node_modules/uuid/dist/cjs/test/parse.test.js +++ /dev/null @@ -1,50 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const assert = require("assert"); -const node_test_1 = require("node:test"); -const parse_js_1 = require("../parse.js"); -const stringify_js_1 = require("../stringify.js"); -const v4_js_1 = require("../v4.js"); -function splitmix32(a) { - return function () { - a |= 0; - a = (a + 0x9e3779b9) | 0; - let t = a ^ (a >>> 16); - t = Math.imul(t, 0x21f0aaad); - t = t ^ (t >>> 15); - t = Math.imul(t, 0x735a2d97); - return ((t = t ^ (t >>> 15)) >>> 0) / 4294967296; - }; -} -const rand = splitmix32(0x12345678); -function rng(bytes = new Uint8Array(16)) { - for (let i = 0; i < 16; i++) { - bytes[i] = rand() * 256; - } - return bytes; -} -(0, node_test_1.describe)('parse', () => { - (0, node_test_1.default)('String -> bytes parsing', () => { - assert.deepStrictEqual((0, parse_js_1.default)('0f5abcd1-c194-47f3-905b-2df7263a084b'), Uint8Array.from([ - 0x0f, 0x5a, 0xbc, 0xd1, 0xc1, 0x94, 0x47, 0xf3, 0x90, 0x5b, 0x2d, 0xf7, 0x26, 0x3a, 0x08, - 0x4b, - ])); - }); - (0, node_test_1.default)('String -> bytes -> string symmetry for assorted uuids', () => { - for (let i = 0; i < 1000; i++) { - const uuid = (0, v4_js_1.default)({ rng }); - assert.equal((0, stringify_js_1.default)((0, parse_js_1.default)(uuid)), uuid); - } - }); - (0, node_test_1.default)('Case neutrality', () => { - assert.deepStrictEqual((0, parse_js_1.default)('0f5abcd1-c194-47f3-905b-2df7263a084b'), (0, parse_js_1.default)('0f5abcd1-c194-47f3-905b-2df7263a084b'.toUpperCase())); - }); - (0, node_test_1.default)('Null UUID case', () => { - assert.deepStrictEqual((0, parse_js_1.default)('00000000-0000-0000-0000-000000000000'), Uint8Array.from(new Array(16).fill(0))); - }); - (0, node_test_1.default)('UUID validation', () => { - assert.throws(() => (0, parse_js_1.default)()); - assert.throws(() => (0, parse_js_1.default)('invalid uuid')); - assert.throws(() => (0, parse_js_1.default)('zyxwvuts-rqpo-nmlk-jihg-fedcba000000')); - }); -}); diff --git a/node_modules/uuid/dist/cjs/test/rng.test.d.ts b/node_modules/uuid/dist/cjs/test/rng.test.d.ts deleted file mode 100644 index cb0ff5c3b5..0000000000 --- a/node_modules/uuid/dist/cjs/test/rng.test.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/node_modules/uuid/dist/cjs/test/rng.test.js b/node_modules/uuid/dist/cjs/test/rng.test.js deleted file mode 100644 index 72c392afc1..0000000000 --- a/node_modules/uuid/dist/cjs/test/rng.test.js +++ /dev/null @@ -1,14 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const assert = require("assert"); -const node_test_1 = require("node:test"); -const rng_js_1 = require("../rng.js"); -(0, node_test_1.describe)('rng', () => { - (0, node_test_1.default)('Node.js RNG', () => { - const bytes = (0, rng_js_1.default)(); - assert.equal(bytes.length, 16); - for (let i = 0; i < bytes.length; ++i) { - assert.equal(typeof bytes[i], 'number'); - } - }); -}); diff --git a/node_modules/uuid/dist/cjs/test/stringify.test.d.ts b/node_modules/uuid/dist/cjs/test/stringify.test.d.ts deleted file mode 100644 index cb0ff5c3b5..0000000000 --- a/node_modules/uuid/dist/cjs/test/stringify.test.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/node_modules/uuid/dist/cjs/test/stringify.test.js b/node_modules/uuid/dist/cjs/test/stringify.test.js deleted file mode 100644 index 8b44b5c7b4..0000000000 --- a/node_modules/uuid/dist/cjs/test/stringify.test.js +++ /dev/null @@ -1,23 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const assert = require("assert"); -const node_test_1 = require("node:test"); -const stringify_js_1 = require("../stringify.js"); -const BYTES = Uint8Array.of(0x0f, 0x5a, 0xbc, 0xd1, 0xc1, 0x94, 0x47, 0xf3, 0x90, 0x5b, 0x2d, 0xf7, 0x26, 0x3a, 0x08, 0x4b); -(0, node_test_1.describe)('stringify', () => { - (0, node_test_1.default)('Stringify Array (unsafe)', () => { - assert.equal((0, stringify_js_1.unsafeStringify)(BYTES), '0f5abcd1-c194-47f3-905b-2df7263a084b'); - }); - (0, node_test_1.default)('Stringify w/ offset (unsafe)', () => { - const bytes = new Uint8Array(19).fill(0); - bytes.set(BYTES, 3); - assert.equal((0, stringify_js_1.unsafeStringify)(bytes, 3), '0f5abcd1-c194-47f3-905b-2df7263a084b'); - }); - (0, node_test_1.default)('Stringify Array (safe)', () => { - assert.equal((0, stringify_js_1.default)(BYTES), '0f5abcd1-c194-47f3-905b-2df7263a084b'); - }); - (0, node_test_1.default)('Throws on not enough values (safe)', () => { - const bytes = BYTES.slice(0, 15); - assert.throws(() => (0, stringify_js_1.default)(bytes)); - }); -}); diff --git a/node_modules/uuid/dist/cjs/test/test_constants.d.ts b/node_modules/uuid/dist/cjs/test/test_constants.d.ts deleted file mode 100644 index 959a679fd0..0000000000 --- a/node_modules/uuid/dist/cjs/test/test_constants.d.ts +++ /dev/null @@ -1,33 +0,0 @@ -export declare const TESTS: ({ - value: string; - expectedValidate: boolean; - expectedVersion: number; -} | { - value: string; - expectedValidate: boolean; - expectedVersion?: undefined; -} | { - value: undefined; - expectedValidate: boolean; - expectedVersion?: undefined; -} | { - value: null; - expectedValidate: boolean; - expectedVersion?: undefined; -} | { - value: number; - expectedValidate: boolean; - expectedVersion?: undefined; -} | { - value: RegExp; - expectedValidate: boolean; - expectedVersion?: undefined; -} | { - value: Date; - expectedValidate: boolean; - expectedVersion?: undefined; -} | { - value: boolean; - expectedValidate: boolean; - expectedVersion?: undefined; -})[]; diff --git a/node_modules/uuid/dist/cjs/test/test_constants.js b/node_modules/uuid/dist/cjs/test/test_constants.js deleted file mode 100644 index e1c2752079..0000000000 --- a/node_modules/uuid/dist/cjs/test/test_constants.js +++ /dev/null @@ -1,91 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.TESTS = void 0; -const max_js_1 = require("../max.js"); -const nil_js_1 = require("../nil.js"); -exports.TESTS = [ - { value: nil_js_1.default, expectedValidate: true, expectedVersion: 0 }, - { value: max_js_1.default, expectedValidate: true, expectedVersion: 15 }, - { value: '00000000-0000-1000-8000-000000000000', expectedValidate: true, expectedVersion: 1 }, - { value: 'ffffffff-ffff-1fff-8fff-ffffffffffff', expectedValidate: true, expectedVersion: 1 }, - { value: '00000000-0000-2000-8000-000000000000', expectedValidate: true, expectedVersion: 2 }, - { value: 'ffffffff-ffff-2fff-bfff-ffffffffffff', expectedValidate: true, expectedVersion: 2 }, - { value: '00000000-0000-3000-8000-000000000000', expectedValidate: true, expectedVersion: 3 }, - { value: 'ffffffff-ffff-3fff-bfff-ffffffffffff', expectedValidate: true, expectedVersion: 3 }, - { value: '00000000-0000-4000-8000-000000000000', expectedValidate: true, expectedVersion: 4 }, - { value: 'ffffffff-ffff-4fff-bfff-ffffffffffff', expectedValidate: true, expectedVersion: 4 }, - { value: '00000000-0000-5000-8000-000000000000', expectedValidate: true, expectedVersion: 5 }, - { value: 'ffffffff-ffff-5fff-bfff-ffffffffffff', expectedValidate: true, expectedVersion: 5 }, - { value: '00000000-0000-6000-8000-000000000000', expectedValidate: true, expectedVersion: 6 }, - { value: 'ffffffff-ffff-6fff-bfff-ffffffffffff', expectedValidate: true, expectedVersion: 6 }, - { value: '00000000-0000-7000-8000-000000000000', expectedValidate: true, expectedVersion: 7 }, - { value: 'ffffffff-ffff-7fff-bfff-ffffffffffff', expectedValidate: true, expectedVersion: 7 }, - { value: '00000000-0000-8000-8000-000000000000', expectedValidate: true, expectedVersion: 8 }, - { value: 'ffffffff-ffff-8fff-bfff-ffffffffffff', expectedValidate: true, expectedVersion: 8 }, - { value: '00000000-0000-9000-8000-000000000000', expectedValidate: false }, - { value: 'ffffffff-ffff-9fff-bfff-ffffffffffff', expectedValidate: false }, - { value: '00000000-0000-a000-8000-000000000000', expectedValidate: false }, - { value: 'ffffffff-ffff-afff-bfff-ffffffffffff', expectedValidate: false }, - { value: '00000000-0000-b000-8000-000000000000', expectedValidate: false }, - { value: 'ffffffff-ffff-bfff-bfff-ffffffffffff', expectedValidate: false }, - { value: '00000000-0000-c000-8000-000000000000', expectedValidate: false }, - { value: 'ffffffff-ffff-cfff-bfff-ffffffffffff', expectedValidate: false }, - { value: '00000000-0000-d000-8000-000000000000', expectedValidate: false }, - { value: 'ffffffff-ffff-dfff-bfff-ffffffffffff', expectedValidate: false }, - { value: '00000000-0000-e000-8000-000000000000', expectedValidate: false }, - { value: 'ffffffff-ffff-efff-bfff-ffffffffffff', expectedValidate: false }, - { value: 'd9428888-122b-11e1-b85c-61cd3cbb3210', expectedValidate: true, expectedVersion: 1 }, - { value: '000003e8-2363-21ef-b200-325096b39f47', expectedValidate: true, expectedVersion: 2 }, - { value: 'a981a0c2-68b1-35dc-bcfc-296e52ab01ec', expectedValidate: true, expectedVersion: 3 }, - { value: '109156be-c4fb-41ea-b1b4-efe1671c5836', expectedValidate: true, expectedVersion: 4 }, - { value: '90123e1c-7512-523e-bb28-76fab9f2f73d', expectedValidate: true, expectedVersion: 5 }, - { value: '1ef21d2f-1207-6660-8c4f-419efbd44d48', expectedValidate: true, expectedVersion: 6 }, - { value: '017f22e2-79b0-7cc3-98c4-dc0c0c07398f', expectedValidate: true, expectedVersion: 7 }, - { value: '0d8f23a0-697f-83ae-802e-48f3756dd581', expectedValidate: true, expectedVersion: 8 }, - { value: '00000000-0000-1000-0000-000000000000', expectedValidate: false }, - { value: '00000000-0000-1000-1000-000000000000', expectedValidate: false }, - { value: '00000000-0000-1000-2000-000000000000', expectedValidate: false }, - { value: '00000000-0000-1000-3000-000000000000', expectedValidate: false }, - { value: '00000000-0000-1000-4000-000000000000', expectedValidate: false }, - { value: '00000000-0000-1000-5000-000000000000', expectedValidate: false }, - { value: '00000000-0000-1000-6000-000000000000', expectedValidate: false }, - { value: '00000000-0000-1000-7000-000000000000', expectedValidate: false }, - { value: '00000000-0000-1000-8000-000000000000', expectedValidate: true, expectedVersion: 1 }, - { value: '00000000-0000-1000-9000-000000000000', expectedValidate: true, expectedVersion: 1 }, - { value: '00000000-0000-1000-a000-000000000000', expectedValidate: true, expectedVersion: 1 }, - { value: '00000000-0000-1000-b000-000000000000', expectedValidate: true, expectedVersion: 1 }, - { value: '00000000-0000-1000-c000-000000000000', expectedValidate: false }, - { value: '00000000-0000-1000-d000-000000000000', expectedValidate: false }, - { value: '00000000-0000-1000-e000-000000000000', expectedValidate: false }, - { value: '00000000-0000-1000-f000-000000000000', expectedValidate: false }, - { value: '00000000000000000000000000000000', expectedValidate: false }, - { value: '', expectedValidate: false }, - { value: 'invalid uuid string', expectedValidate: false }, - { - value: '=Y00a-f*vb*-c-d#-p00f\b-g0h-#i^-j*3&-L00k-\nl---00n-fg000-00p-00r+', - expectedValidate: false, - }, - { value: undefined, expectedValidate: false }, - { value: null, expectedValidate: false }, - { value: 123, expectedValidate: false }, - { value: /regex/, expectedValidate: false }, - { value: new Date(0), expectedValidate: false }, - { value: false, expectedValidate: false }, -]; -for (let charIndex = 0; charIndex < 36; charIndex++) { - if (charIndex === 8 || - charIndex === 13 || - charIndex === 14 || - charIndex === 18 || - charIndex === 23) { - continue; - } - const nilChars = nil_js_1.default.split(''); - const maxChars = max_js_1.default.split(''); - for (let i = 0; i < 4; i++) { - nilChars[charIndex] = (0x0 ^ (1 << i)).toString(16); - exports.TESTS.push({ value: nilChars.join(''), expectedValidate: false }); - maxChars[charIndex] = (0xf ^ (1 << i)).toString(16); - exports.TESTS.push({ value: maxChars.join(''), expectedValidate: false }); - } -} diff --git a/node_modules/uuid/dist/cjs/test/v1.test.d.ts b/node_modules/uuid/dist/cjs/test/v1.test.d.ts deleted file mode 100644 index cb0ff5c3b5..0000000000 --- a/node_modules/uuid/dist/cjs/test/v1.test.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/node_modules/uuid/dist/cjs/test/v1.test.js b/node_modules/uuid/dist/cjs/test/v1.test.js deleted file mode 100644 index 2013927198..0000000000 --- a/node_modules/uuid/dist/cjs/test/v1.test.js +++ /dev/null @@ -1,127 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const assert = require("assert"); -const node_test_1 = require("node:test"); -const parse_js_1 = require("../parse.js"); -const v1_js_1 = require("../v1.js"); -const TIME = 1321644961388; -const RFC_V1 = 'c232ab00-9414-11ec-b3c8-9f68deced846'; -const RFC_V1_BYTES = (0, parse_js_1.default)(RFC_V1); -const RFC_OPTIONS = { - msecs: 0x17f22e279b0, - nsecs: 0, - clockseq: 0x33c8, - node: Uint8Array.of(0x9f, 0x68, 0xde, 0xce, 0xd8, 0x46), -}; -const RFC_RANDOM = Uint8Array.of(0, 0, 0, 0, 0, 0, 0, 0, RFC_OPTIONS.clockseq >> 8, RFC_OPTIONS.clockseq & 0xff, ...RFC_OPTIONS.node); -function compareV1TimeField(a, b) { - a = a.split('-').slice(0, 3).reverse().join(''); - b = b.split('-').slice(0, 3).reverse().join(''); - return a < b ? -1 : a > b ? 1 : 0; -} -(0, node_test_1.describe)('v1', () => { - (0, node_test_1.default)('v1 sort order (default)', () => { - const ids = [(0, v1_js_1.default)(), (0, v1_js_1.default)(), (0, v1_js_1.default)(), (0, v1_js_1.default)(), (0, v1_js_1.default)()]; - const sorted = [...ids].sort(compareV1TimeField); - assert.deepEqual(ids, sorted); - }); - (0, node_test_1.default)('v1 sort order (time option)', () => { - const ids = [ - (0, v1_js_1.default)({ msecs: TIME - 10 * 3600 * 1000 }), - (0, v1_js_1.default)({ msecs: TIME - 1 }), - (0, v1_js_1.default)({ msecs: TIME }), - (0, v1_js_1.default)({ msecs: TIME + 1 }), - (0, v1_js_1.default)({ msecs: TIME + 28 * 24 * 3600 * 1000 }), - ]; - const sorted = [...ids].sort(compareV1TimeField); - assert.deepEqual(ids, sorted); - }); - (0, node_test_1.default)('v1(options)', () => { - assert.equal((0, v1_js_1.default)({ msecs: RFC_OPTIONS.msecs, random: RFC_RANDOM }), RFC_V1, 'minimal options'); - assert.equal((0, v1_js_1.default)(RFC_OPTIONS), RFC_V1, 'full options'); - }); - (0, node_test_1.default)('v1(options) equality', () => { - assert.notEqual((0, v1_js_1.default)({ msecs: TIME }), (0, v1_js_1.default)({ msecs: TIME }), 'UUIDs with minimal options differ'); - assert.equal((0, v1_js_1.default)(RFC_OPTIONS), (0, v1_js_1.default)(RFC_OPTIONS), 'UUIDs with full options are identical'); - }); - (0, node_test_1.default)('fills one UUID into a buffer as expected', () => { - const buffer = new Uint8Array(16); - const result = (0, v1_js_1.default)(RFC_OPTIONS, buffer); - assert.deepEqual(buffer, RFC_V1_BYTES); - assert.strictEqual(buffer, result); - }); - (0, node_test_1.default)('fills two UUIDs into a buffer as expected', () => { - const buffer = new Uint8Array(32); - (0, v1_js_1.default)(RFC_OPTIONS, buffer, 0); - (0, v1_js_1.default)(RFC_OPTIONS, buffer, 16); - const expectedBuf = new Uint8Array(32); - expectedBuf.set(RFC_V1_BYTES); - expectedBuf.set(RFC_V1_BYTES, 16); - assert.deepEqual(buffer, expectedBuf); - }); - (0, node_test_1.default)('v1() state transitions', () => { - const PRE_STATE = { - msecs: 10, - nsecs: 20, - clockseq: 0x1234, - node: Uint8Array.of(0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc), - }; - const tests = [ - { - title: 'initial state', - state: {}, - now: 10, - expected: { - msecs: 10, - nsecs: 0, - clockseq: RFC_OPTIONS.clockseq, - node: RFC_OPTIONS.node, - }, - }, - { - title: 'same time interval', - state: { ...PRE_STATE }, - now: PRE_STATE.msecs, - expected: { - ...PRE_STATE, - nsecs: 21, - }, - }, - { - title: 'new time interval', - state: { ...PRE_STATE }, - now: PRE_STATE.msecs + 1, - expected: { - ...PRE_STATE, - msecs: PRE_STATE.msecs + 1, - nsecs: 0, - }, - }, - { - title: 'same time interval (nsecs overflow)', - state: { ...PRE_STATE, nsecs: 9999 }, - now: PRE_STATE.msecs, - expected: { - ...PRE_STATE, - nsecs: 0, - clockseq: RFC_OPTIONS.clockseq, - node: RFC_OPTIONS.node, - }, - }, - { - title: 'time regression', - state: { ...PRE_STATE }, - now: PRE_STATE.msecs - 1, - expected: { - ...PRE_STATE, - msecs: PRE_STATE.msecs - 1, - clockseq: RFC_OPTIONS.clockseq, - node: RFC_OPTIONS.node, - }, - }, - ]; - for (const { title, state, now, expected } of tests) { - assert.deepStrictEqual((0, v1_js_1.updateV1State)(state, now, RFC_RANDOM), expected, `Failed: ${title}`); - } - }); -}); diff --git a/node_modules/uuid/dist/cjs/test/v35.test.d.ts b/node_modules/uuid/dist/cjs/test/v35.test.d.ts deleted file mode 100644 index cb0ff5c3b5..0000000000 --- a/node_modules/uuid/dist/cjs/test/v35.test.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/node_modules/uuid/dist/cjs/test/v35.test.js b/node_modules/uuid/dist/cjs/test/v35.test.js deleted file mode 100644 index d12394b9c0..0000000000 --- a/node_modules/uuid/dist/cjs/test/v35.test.js +++ /dev/null @@ -1,143 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const assert = require("assert"); -const node_test_1 = require("node:test"); -const md5_js_1 = require("../md5.js"); -const sha1_js_1 = require("../sha1.js"); -const v3_js_1 = require("../v3.js"); -const v35_js_1 = require("../v35.js"); -const v5_js_1 = require("../v5.js"); -(0, node_test_1.describe)('v35', () => { - const HASH_SAMPLES = [ - { - input: (0, v35_js_1.stringToBytes)(''), - sha1: 'da39a3ee5e6b4b0d3255bfef95601890afd80709', - md5: 'd41d8cd98f00b204e9800998ecf8427e', - }, - { - input: (0, v35_js_1.stringToBytes)('\t\b\f !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\u00A1\u00A2\u00A3\u00A4\u00A5\u00A6\u00A7\u00A8\u00A9\u00AA\u00AB\u00AC\u00AE\u00AF\u00B0\u00B1\u00B2\u00B3\u00B4\u00B5\u00B6\u00B7\u00B8\u00B9\u00BA\u00BB\u00BC\u00BD\u00BE\u00BF\u00C0\u00C1\u00C2\u00C3\u00C4\u00C5\u00C6\u00C7\u00C8\u00C9\u00CA\u00CB\u00CC\u00CD\u00CE\u00CF\u00D0\u00D1\u00D2\u00D3\u00D4\u00D5\u00D6\u00D7\u00D8\u00D9\u00DA\u00DB\u00DC\u00DD\u00DE\u00DF\u00E0\u00E1\u00E2\u00E3\u00E4\u00E5\u00E6\u00E7\u00E8\u00E9\u00EA\u00EB\u00EC\u00ED\u00EE\u00EF\u00F0\u00F1\u00F2\u00F3\u00F4\u00F5\u00F6\u00F7\u00F8\u00F9\u00FA\u00FB\u00FC\u00FD\u00FE\u00FF'), - sha1: 'ca4a426a3d536f14cfd79011e79e10d64de950a0', - md5: 'e8098ec21950f841731d28749129d3ee', - }, - { - input: (0, v35_js_1.stringToBytes)('\u00A5\u0104\u018F\u0256\u02B1o\u0315\u038E\u0409\u0500\u0531\u05E1\u05B6\u0920\u0903\u09A4\u0983\u0A20\u0A02\u0AA0\u0A83\u0B06\u0C05\u0C03\u1401\u16A0'), - sha1: 'f2753ebc390e5f637e333c2a4179644a93ae9f65', - md5: '231b309e277b6be8bb3d6c688b7f098b', - }, - ]; - function hashToHex(hash) { - const chars = new Array(hash.length); - for (let i = 0; i < hash.length; i++) { - chars[i] = hash[i].toString(16).padStart(2, '0'); - } - return chars.join(''); - } - HASH_SAMPLES.forEach(function (sample, i) { - (0, node_test_1.default)(`sha1(node) HASH_SAMPLES[${i}]`, () => { - assert.equal(hashToHex((0, sha1_js_1.default)(sample.input)), sample.sha1); - }); - }); - HASH_SAMPLES.forEach(function (sample, i) { - (0, node_test_1.default)(`md5(node) HASH_SAMPLES[${i}]`, () => { - assert.equal(hashToHex((0, md5_js_1.default)(sample.input)), sample.md5); - }); - }); - (0, node_test_1.default)('v3', () => { - assert.strictEqual((0, v3_js_1.default)('hello.example.com', v3_js_1.default.DNS), '9125a8dc-52ee-365b-a5aa-81b0b3681cf6'); - assert.strictEqual((0, v3_js_1.default)('http://example.com/hello', v3_js_1.default.URL), 'c6235813-3ba4-3801-ae84-e0a6ebb7d138'); - assert.strictEqual((0, v3_js_1.default)('hello', '0f5abcd1-c194-47f3-905b-2df7263a084b'), 'a981a0c2-68b1-35dc-bcfc-296e52ab01ec'); - }); - (0, node_test_1.default)('v3 namespace.toUpperCase', () => { - assert.strictEqual((0, v3_js_1.default)('hello.example.com', v3_js_1.default.DNS.toUpperCase()), '9125a8dc-52ee-365b-a5aa-81b0b3681cf6'); - assert.strictEqual((0, v3_js_1.default)('http://example.com/hello', v3_js_1.default.URL.toUpperCase()), 'c6235813-3ba4-3801-ae84-e0a6ebb7d138'); - assert.strictEqual((0, v3_js_1.default)('hello', '0f5abcd1-c194-47f3-905b-2df7263a084b'.toUpperCase()), 'a981a0c2-68b1-35dc-bcfc-296e52ab01ec'); - }); - (0, node_test_1.default)('v3 namespace string validation', () => { - assert.throws(() => { - (0, v3_js_1.default)('hello.example.com', 'zyxwvuts-rqpo-nmlk-jihg-fedcba000000'); - }); - assert.throws(() => { - (0, v3_js_1.default)('hello.example.com', 'invalid uuid value'); - }); - assert.ok((0, v3_js_1.default)('hello.example.com', '00000000-0000-0000-0000-000000000000')); - }); - (0, node_test_1.default)('v3 namespace buffer validation', () => { - assert.throws(() => { - (0, v3_js_1.default)('hello.example.com', new Uint8Array(15)); - }); - assert.throws(() => { - (0, v3_js_1.default)('hello.example.com', new Uint8Array(17)); - }); - assert.ok((0, v3_js_1.default)('hello.example.com', new Uint8Array(16).fill(0))); - }); - (0, node_test_1.default)('v3 fill buffer', () => { - let buf = new Uint8Array(16); - const expectedUuid = Uint8Array.of(0x91, 0x25, 0xa8, 0xdc, 0x52, 0xee, 0x36, 0x5b, 0xa5, 0xaa, 0x81, 0xb0, 0xb3, 0x68, 0x1c, 0xf6); - const result = (0, v3_js_1.default)('hello.example.com', v3_js_1.default.DNS, buf); - assert.deepEqual(buf, expectedUuid); - assert.strictEqual(result, buf); - buf = new Uint8Array(19).fill(0xaa); - const expectedBuf = new Uint8Array(19).fill(0xaa); - expectedBuf.set(expectedUuid, 3); - (0, v3_js_1.default)('hello.example.com', v3_js_1.default.DNS, buf, 3); - assert.deepEqual(buf, expectedBuf); - }); - (0, node_test_1.default)('v3 undefined/null', () => { - assert.throws(() => (0, v3_js_1.default)()); - assert.throws(() => (0, v3_js_1.default)('hello')); - assert.throws(() => (0, v3_js_1.default)('hello.example.com', undefined)); - assert.throws(() => (0, v3_js_1.default)('hello.example.com', null, new Uint8Array(16))); - }); - (0, node_test_1.default)('v5', () => { - assert.strictEqual((0, v5_js_1.default)('hello.example.com', v5_js_1.default.DNS), 'fdda765f-fc57-5604-a269-52a7df8164ec'); - assert.strictEqual((0, v5_js_1.default)('http://example.com/hello', v5_js_1.default.URL), '3bbcee75-cecc-5b56-8031-b6641c1ed1f1'); - assert.strictEqual((0, v5_js_1.default)('hello', '0f5abcd1-c194-47f3-905b-2df7263a084b'), '90123e1c-7512-523e-bb28-76fab9f2f73d'); - }); - (0, node_test_1.default)('v5 namespace.toUpperCase', () => { - assert.strictEqual((0, v5_js_1.default)('hello.example.com', v5_js_1.default.DNS.toUpperCase()), 'fdda765f-fc57-5604-a269-52a7df8164ec'); - assert.strictEqual((0, v5_js_1.default)('http://example.com/hello', v5_js_1.default.URL.toUpperCase()), '3bbcee75-cecc-5b56-8031-b6641c1ed1f1'); - assert.strictEqual((0, v5_js_1.default)('hello', '0f5abcd1-c194-47f3-905b-2df7263a084b'.toUpperCase()), '90123e1c-7512-523e-bb28-76fab9f2f73d'); - }); - (0, node_test_1.default)('v5 namespace string validation', () => { - assert.throws(() => { - (0, v5_js_1.default)('hello.example.com', 'zyxwvuts-rqpo-nmlk-jihg-fedcba000000'); - }); - assert.throws(() => { - (0, v5_js_1.default)('hello.example.com', 'invalid uuid value'); - }); - assert.ok((0, v5_js_1.default)('hello.example.com', '00000000-0000-0000-0000-000000000000')); - }); - (0, node_test_1.default)('v5 namespace buffer validation', () => { - assert.throws(() => { - (0, v5_js_1.default)('hello.example.com', new Uint8Array(15)); - }); - assert.throws(() => { - (0, v5_js_1.default)('hello.example.com', new Uint8Array(17)); - }); - assert.ok((0, v5_js_1.default)('hello.example.com', new Uint8Array(16).fill(0))); - }); - (0, node_test_1.default)('v5 fill buffer', () => { - let buf = new Uint8Array(16); - const expectedUuid = Uint8Array.of(0xfd, 0xda, 0x76, 0x5f, 0xfc, 0x57, 0x56, 0x04, 0xa2, 0x69, 0x52, 0xa7, 0xdf, 0x81, 0x64, 0xec); - const result = (0, v5_js_1.default)('hello.example.com', v5_js_1.default.DNS, buf); - assert.deepEqual(buf, expectedUuid); - assert.strictEqual(result, buf); - buf = new Uint8Array(19).fill(0xaa); - const expectedBuf = new Uint8Array(19).fill(0xaa); - expectedBuf.set(expectedUuid, 3); - (0, v5_js_1.default)('hello.example.com', v5_js_1.default.DNS, buf, 3); - assert.deepEqual(buf, expectedBuf); - }); - (0, node_test_1.default)('v5 undefined/null', () => { - assert.throws(() => (0, v5_js_1.default)()); - assert.throws(() => (0, v5_js_1.default)('hello')); - assert.throws(() => (0, v5_js_1.default)('hello.example.com', undefined)); - assert.throws(() => (0, v5_js_1.default)('hello.example.com', null, new Uint8Array(16))); - }); - (0, node_test_1.default)('v3/v5 constants', () => { - assert.strictEqual(v3_js_1.default.DNS, '6ba7b810-9dad-11d1-80b4-00c04fd430c8'); - assert.strictEqual(v3_js_1.default.URL, '6ba7b811-9dad-11d1-80b4-00c04fd430c8'); - assert.strictEqual(v5_js_1.default.DNS, '6ba7b810-9dad-11d1-80b4-00c04fd430c8'); - assert.strictEqual(v5_js_1.default.URL, '6ba7b811-9dad-11d1-80b4-00c04fd430c8'); - }); -}); diff --git a/node_modules/uuid/dist/cjs/test/v4.test.d.ts b/node_modules/uuid/dist/cjs/test/v4.test.d.ts deleted file mode 100644 index cb0ff5c3b5..0000000000 --- a/node_modules/uuid/dist/cjs/test/v4.test.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/node_modules/uuid/dist/cjs/test/v4.test.js b/node_modules/uuid/dist/cjs/test/v4.test.js deleted file mode 100644 index db2680f76f..0000000000 --- a/node_modules/uuid/dist/cjs/test/v4.test.js +++ /dev/null @@ -1,60 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const assert = require("assert"); -const node_test_1 = require("node:test"); -const native_js_1 = require("../native.js"); -const v4_js_1 = require("../v4.js"); -const randomBytesFixture = Uint8Array.of(0x10, 0x91, 0x56, 0xbe, 0xc4, 0xfb, 0xc1, 0xea, 0x71, 0xb4, 0xef, 0xe1, 0x67, 0x1c, 0x58, 0x36); -const expectedBytes = Uint8Array.of(16, 145, 86, 190, 196, 251, 65, 234, 177, 180, 239, 225, 103, 28, 88, 54); -(0, node_test_1.describe)('v4', () => { - (0, node_test_1.default)('subsequent UUIDs are different', () => { - const id1 = (0, v4_js_1.default)(); - const id2 = (0, v4_js_1.default)(); - assert.ok(id1 !== id2); - }); - (0, node_test_1.default)('should uses native randomUUID() if no option is passed', async () => { - const mock = (await Promise.resolve().then(() => require('node:test'))).default.mock; - if (!mock) { - return; - } - const mockRandomUUID = mock.method(native_js_1.default, 'randomUUID'); - assert.equal(mockRandomUUID.mock.callCount(), 0); - (0, v4_js_1.default)(); - assert.equal(mockRandomUUID.mock.callCount(), 1); - mock.restoreAll(); - }); - (0, node_test_1.default)('should not use native randomUUID() if an option is passed', async () => { - const mock = (await Promise.resolve().then(() => require('node:test'))).default.mock; - if (!mock) { - return; - } - const mockRandomUUID = mock.method(native_js_1.default, 'randomUUID'); - assert.equal(mockRandomUUID.mock.callCount(), 0); - (0, v4_js_1.default)({}); - assert.equal(mockRandomUUID.mock.callCount(), 0); - mock.restoreAll(); - }); - (0, node_test_1.default)('explicit options.random produces expected result', () => { - const id = (0, v4_js_1.default)({ random: randomBytesFixture }); - assert.strictEqual(id, '109156be-c4fb-41ea-b1b4-efe1671c5836'); - }); - (0, node_test_1.default)('explicit options.rng produces expected result', () => { - const id = (0, v4_js_1.default)({ rng: () => randomBytesFixture }); - assert.strictEqual(id, '109156be-c4fb-41ea-b1b4-efe1671c5836'); - }); - (0, node_test_1.default)('fills one UUID into a buffer as expected', () => { - const buffer = new Uint8Array(16); - const result = (0, v4_js_1.default)({ random: randomBytesFixture }, buffer); - assert.deepEqual(buffer, expectedBytes); - assert.strictEqual(buffer, result); - }); - (0, node_test_1.default)('fills two UUIDs into a buffer as expected', () => { - const buffer = new Uint8Array(32); - (0, v4_js_1.default)({ random: randomBytesFixture }, buffer, 0); - (0, v4_js_1.default)({ random: randomBytesFixture }, buffer, 16); - const expectedBuf = new Uint8Array(32); - expectedBuf.set(expectedBytes); - expectedBuf.set(expectedBytes, 16); - assert.deepEqual(buffer, expectedBuf); - }); -}); diff --git a/node_modules/uuid/dist/cjs/test/v6.test.d.ts b/node_modules/uuid/dist/cjs/test/v6.test.d.ts deleted file mode 100644 index cb0ff5c3b5..0000000000 --- a/node_modules/uuid/dist/cjs/test/v6.test.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/node_modules/uuid/dist/cjs/test/v6.test.js b/node_modules/uuid/dist/cjs/test/v6.test.js deleted file mode 100644 index 32ba29240e..0000000000 --- a/node_modules/uuid/dist/cjs/test/v6.test.js +++ /dev/null @@ -1,56 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const assert = require("assert"); -const node_test_1 = require("node:test"); -const v1ToV6_js_1 = require("../v1ToV6.js"); -const v6_js_1 = require("../v6.js"); -const v6ToV1_js_1 = require("../v6ToV1.js"); -(0, node_test_1.describe)('v6', () => { - const V1_ID = 'f1207660-21d2-11ef-8c4f-419efbd44d48'; - const V6_ID = '1ef21d2f-1207-6660-8c4f-419efbd44d48'; - const fullOptions = { - msecs: 0x133b891f705, - nsecs: 0x1538, - clockseq: 0x385c, - node: Uint8Array.of(0x61, 0xcd, 0x3c, 0xbb, 0x32, 0x10), - }; - const EXPECTED_BYTES = Uint8Array.of(0x1e, 0x11, 0x22, 0xbd, 0x94, 0x28, 0x68, 0x88, 0xb8, 0x5c, 0x61, 0xcd, 0x3c, 0xbb, 0x32, 0x10); - (0, node_test_1.default)('default behavior', () => { - const id = (0, v6_js_1.default)(); - assert.ok(/[0-9a-f]{8}-[0-9a-f]{4}-6[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}/.test(id), 'id is valid v6 UUID'); - }); - (0, node_test_1.default)('default behavior (binary type)', () => { - const buffer = new Uint8Array(16); - const result = (0, v6_js_1.default)(fullOptions, buffer); - assert.deepEqual(buffer, EXPECTED_BYTES); - assert.strictEqual(buffer, result); - }); - (0, node_test_1.default)('all options', () => { - const id = (0, v6_js_1.default)(fullOptions); - assert.equal(id, '1e1122bd-9428-6888-b85c-61cd3cbb3210'); - }); - (0, node_test_1.default)('sort by creation time', () => { - const ids = []; - for (let i = 0; i < 5; i++) { - ids.push((0, v6_js_1.default)({ msecs: i * 1000 })); - } - assert.deepEqual(ids, ids.slice().sort()); - }); - (0, node_test_1.default)('creating at array offset', () => { - const buffer = new Uint8Array(32); - (0, v6_js_1.default)(fullOptions, buffer, 0); - (0, v6_js_1.default)(fullOptions, buffer, 16); - const expectedBuf = new Uint8Array(32); - expectedBuf.set(EXPECTED_BYTES, 0); - expectedBuf.set(EXPECTED_BYTES, 16); - assert.deepEqual(buffer, expectedBuf); - }); - (0, node_test_1.default)('v1 -> v6 conversion', () => { - const id = (0, v1ToV6_js_1.default)(V1_ID); - assert.equal(id, V6_ID); - }); - (0, node_test_1.default)('v6 -> v1 conversion', () => { - const id = (0, v6ToV1_js_1.default)(V6_ID); - assert.equal(id, V1_ID); - }); -}); diff --git a/node_modules/uuid/dist/cjs/test/v7.test.d.ts b/node_modules/uuid/dist/cjs/test/v7.test.d.ts deleted file mode 100644 index cb0ff5c3b5..0000000000 --- a/node_modules/uuid/dist/cjs/test/v7.test.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/node_modules/uuid/dist/cjs/test/v7.test.js b/node_modules/uuid/dist/cjs/test/v7.test.js deleted file mode 100644 index 2c549d534a..0000000000 --- a/node_modules/uuid/dist/cjs/test/v7.test.js +++ /dev/null @@ -1,194 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const assert = require("assert"); -const node_test_1 = require("node:test"); -const parse_js_1 = require("../parse.js"); -const stringify_js_1 = require("../stringify.js"); -const v7_js_1 = require("../v7.js"); -const RFC_V7 = '017f22e2-79b0-7cc3-98c4-dc0c0c07398f'; -const RFC_V7_BYTES = (0, parse_js_1.default)('017f22e2-79b0-7cc3-98c4-dc0c0c07398f'); -const RFC_MSECS = 0x17f22e279b0; -const RFC_SEQ = (0x0cc3 << 20) | (0x98c4dc >> 2); -const RFC_RANDOM = Uint8Array.of(0x10, 0x91, 0x56, 0xbe, 0xc4, 0xfb, 0x0c, 0xc3, 0x18, 0xc4, 0x6c, 0x0c, 0x0c, 0x07, 0x39, 0x8f); -(0, node_test_1.describe)('v7', () => { - (0, node_test_1.default)('subsequent UUIDs are different', () => { - const id1 = (0, v7_js_1.default)(); - const id2 = (0, v7_js_1.default)(); - assert.ok(id1 !== id2); - }); - (0, node_test_1.default)('explicit options.random and options.msecs produces expected result', () => { - const id = (0, v7_js_1.default)({ - random: RFC_RANDOM, - msecs: RFC_MSECS, - seq: RFC_SEQ, - }); - assert.strictEqual(id, RFC_V7); - }); - (0, node_test_1.default)('explicit options.rng produces expected result', () => { - const id = (0, v7_js_1.default)({ - rng: () => RFC_RANDOM, - msecs: RFC_MSECS, - seq: RFC_SEQ, - }); - assert.strictEqual(id, RFC_V7); - }); - (0, node_test_1.default)('explicit options.msecs produces expected result', () => { - const id = (0, v7_js_1.default)({ - msecs: RFC_MSECS, - }); - assert.strictEqual(id.indexOf('017f22e2'), 0); - }); - (0, node_test_1.default)('fills one UUID into a buffer as expected', () => { - const buffer = new Uint8Array(16); - const result = (0, v7_js_1.default)({ - random: RFC_RANDOM, - msecs: RFC_MSECS, - seq: RFC_SEQ, - }, buffer); - (0, stringify_js_1.default)(buffer); - assert.deepEqual(buffer, RFC_V7_BYTES); - assert.strictEqual(buffer, result); - }); - (0, node_test_1.default)('fills two UUIDs into a buffer as expected', () => { - const buffer = new Uint8Array(32); - (0, v7_js_1.default)({ - random: RFC_RANDOM, - msecs: RFC_MSECS, - seq: RFC_SEQ, - }, buffer, 0); - (0, v7_js_1.default)({ - random: RFC_RANDOM, - msecs: RFC_MSECS, - seq: RFC_SEQ, - }, buffer, 16); - const expected = new Uint8Array(32); - expected.set(RFC_V7_BYTES); - expected.set(RFC_V7_BYTES, 16); - assert.deepEqual(buffer, expected); - }); - (0, node_test_1.default)('lexicographical sorting is preserved', () => { - let id; - let prior; - let msecs = RFC_MSECS; - for (let i = 0; i < 20000; ++i) { - if (i % 1500 === 0) { - msecs += 1; - } - id = (0, v7_js_1.default)({ msecs, seq: i }); - if (prior !== undefined) { - assert.ok(prior < id, `${prior} < ${id}`); - } - prior = id; - } - }); - (0, node_test_1.default)('can supply seq', () => { - let seq = 0x12345; - let uuid = (0, v7_js_1.default)({ - msecs: RFC_MSECS, - seq, - }); - assert.strictEqual(uuid.substr(0, 25), '017f22e2-79b0-7000-848d-1'); - seq = 0x6fffffff; - uuid = (0, v7_js_1.default)({ - msecs: RFC_MSECS, - seq, - }); - assert.strictEqual(uuid.substring(0, 25), '017f22e2-79b0-76ff-bfff-f'); - }); - (0, node_test_1.default)('internal seq is reset upon timestamp change', () => { - (0, v7_js_1.default)({ - msecs: RFC_MSECS, - seq: 0x6fffffff, - }); - const uuid = (0, v7_js_1.default)({ - msecs: RFC_MSECS + 1, - }); - assert.ok(uuid.indexOf('fff') !== 15); - }); - (0, node_test_1.default)('v7() state transitions', () => { - const tests = [ - { - title: 'new time interval', - state: { msecs: 1, seq: 123 }, - now: 2, - expected: { - msecs: 2, - seq: 0x6c318c4, - }, - }, - { - title: 'same time interval', - state: { msecs: 1, seq: 123 }, - now: 1, - expected: { - msecs: 1, - seq: 124, - }, - }, - { - title: 'same time interval (sequence rollover)', - state: { msecs: 1, seq: 0xffffffff }, - now: 1, - expected: { - msecs: 2, - seq: 0, - }, - }, - { - title: 'time regression', - state: { msecs: 2, seq: 123 }, - now: 1, - expected: { - msecs: 2, - seq: 124, - }, - }, - { - title: 'time regression (sequence rollover)', - state: { msecs: 2, seq: 0xffffffff }, - now: 1, - expected: { - msecs: 3, - seq: 0, - }, - }, - ]; - for (const { title, state, now, expected } of tests) { - assert.deepStrictEqual((0, v7_js_1.updateV7State)(state, now, RFC_RANDOM), expected, `Failed: ${title}`); - } - }); - (0, node_test_1.default)('flipping bits changes the result', () => { - const asBigInt = (buf) => buf.reduce((acc, v) => (acc << 8n) | BigInt(v), 0n); - const asNumber = (bits, data) => Number(BigInt.asUintN(bits, data)); - const flip = (data, n) => data ^ (1n << BigInt(127 - n)); - const optionsFrom = (data) => { - const ms = asNumber(48, data >> 80n); - const hi = asNumber(12, data >> 64n); - const lo = asNumber(20, data >> 42n); - const r = BigInt.asUintN(42, data); - return { - msecs: ms, - seq: (hi << 20) | lo, - random: Uint8Array.from([ - ...Array(10).fill(0), - ...Array(6) - .fill(0) - .map((_, i) => asNumber(8, r >> (BigInt(i) * 8n))) - .reverse(), - ]), - }; - }; - const buf = new Uint8Array(16); - const data = asBigInt((0, v7_js_1.default)({}, buf)); - const id = (0, stringify_js_1.default)(buf); - const reserved = [48, 49, 50, 51, 64, 65]; - for (let i = 0; i < 128; ++i) { - if (reserved.includes(i)) { - continue; - } - const flipped = flip(data, i); - assert.strictEqual(asBigInt((0, v7_js_1.default)(optionsFrom(flipped), buf)).toString(16), flipped.toString(16), `Unequal uuids at bit ${i}`); - assert.notStrictEqual((0, stringify_js_1.default)(buf), id); - } - }); -}); diff --git a/node_modules/uuid/dist/cjs/test/validate.test.d.ts b/node_modules/uuid/dist/cjs/test/validate.test.d.ts deleted file mode 100644 index cb0ff5c3b5..0000000000 --- a/node_modules/uuid/dist/cjs/test/validate.test.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/node_modules/uuid/dist/cjs/test/validate.test.js b/node_modules/uuid/dist/cjs/test/validate.test.js deleted file mode 100644 index 234db5501e..0000000000 --- a/node_modules/uuid/dist/cjs/test/validate.test.js +++ /dev/null @@ -1,13 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const assert = require("assert"); -const node_test_1 = require("node:test"); -const validate_js_1 = require("../validate.js"); -const test_constants_js_1 = require("./test_constants.js"); -(0, node_test_1.describe)('validate()', () => { - (0, node_test_1.default)('TESTS cases', () => { - for (const { value, expectedValidate } of test_constants_js_1.TESTS) { - assert.strictEqual((0, validate_js_1.default)(value), expectedValidate, `validate(${value}) should be ${expectedValidate}`); - } - }); -}); diff --git a/node_modules/uuid/dist/cjs/test/version.test.d.ts b/node_modules/uuid/dist/cjs/test/version.test.d.ts deleted file mode 100644 index cb0ff5c3b5..0000000000 --- a/node_modules/uuid/dist/cjs/test/version.test.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/node_modules/uuid/dist/cjs/test/version.test.js b/node_modules/uuid/dist/cjs/test/version.test.js deleted file mode 100644 index 2846e3e045..0000000000 --- a/node_modules/uuid/dist/cjs/test/version.test.js +++ /dev/null @@ -1,20 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const assert = require("assert"); -const node_test_1 = require("node:test"); -const version_js_1 = require("../version.js"); -const test_constants_js_1 = require("./test_constants.js"); -(0, node_test_1.describe)('version()', () => { - (0, node_test_1.default)('TESTS cases', () => { - for (const { value, expectedValidate, expectedVersion } of test_constants_js_1.TESTS) { - try { - const actualVersion = (0, version_js_1.default)(value); - assert.ok(expectedValidate, `version(${value}) should throw`); - assert.strictEqual(actualVersion, expectedVersion); - } - catch { - assert.ok(!expectedValidate, `version(${value}) threw unexpectedly`); - } - } - }); -}); diff --git a/node_modules/uuid/dist/cjs/v1.js b/node_modules/uuid/dist/cjs/v1.js index e3d492c81d..667fade140 100644 --- a/node_modules/uuid/dist/cjs/v1.js +++ b/node_modules/uuid/dist/cjs/v1.js @@ -49,10 +49,18 @@ function updateV1State(state, now, rnds) { return state; } function v1Bytes(rnds, msecs, nsecs, clockseq, node, buf, offset = 0) { + if (rnds.length < 16) { + throw new Error('Random bytes length must be >= 16'); + } if (!buf) { buf = new Uint8Array(16); offset = 0; } + else { + if (offset < 0 || offset + 16 > buf.length) { + throw new RangeError(`UUID byte range ${offset}:${offset + 15} is out of buffer bounds`); + } + } msecs ??= Date.now(); nsecs ??= 0; clockseq ??= ((rnds[8] << 8) | rnds[9]) & 0x3fff; diff --git a/node_modules/uuid/dist/cjs/v35.d.ts b/node_modules/uuid/dist/cjs/v35.d.ts index 5d1d06daef..a2c132633f 100644 --- a/node_modules/uuid/dist/cjs/v35.d.ts +++ b/node_modules/uuid/dist/cjs/v35.d.ts @@ -1,7 +1,7 @@ import { UUIDTypes } from './types.js'; -export declare function stringToBytes(str: string): Uint8Array; +export declare function stringToBytes(str: string): Uint8Array; export declare const DNS = "6ba7b810-9dad-11d1-80b4-00c04fd430c8"; export declare const URL = "6ba7b811-9dad-11d1-80b4-00c04fd430c8"; type HashFunction = (bytes: Uint8Array) => Uint8Array; -export default function v35(version: 0x30 | 0x50, hash: HashFunction, value: string | Uint8Array, namespace: UUIDTypes, buf?: Uint8Array, offset?: number): string | Uint8Array; +export default function v35(version: 0x30 | 0x50, hash: HashFunction, value: string | Uint8Array, namespace: UUIDTypes, buf?: Uint8Array, offset?: number): string | Uint8Array; export {}; diff --git a/node_modules/uuid/dist/cjs/v4.js b/node_modules/uuid/dist/cjs/v4.js index 61be26e73c..69c975e48d 100644 --- a/node_modules/uuid/dist/cjs/v4.js +++ b/node_modules/uuid/dist/cjs/v4.js @@ -8,11 +8,17 @@ function v4(options, buf, offset) { return native_js_1.default.randomUUID(); } options = options || {}; - const rnds = options.random || (options.rng || rng_js_1.default)(); + const rnds = options.random ?? options.rng?.() ?? (0, rng_js_1.default)(); + if (rnds.length < 16) { + throw new Error('Random bytes length must be >= 16'); + } rnds[6] = (rnds[6] & 0x0f) | 0x40; rnds[8] = (rnds[8] & 0x3f) | 0x80; if (buf) { offset = offset || 0; + if (offset < 0 || offset + 16 > buf.length) { + throw new RangeError(`UUID byte range ${offset}:${offset + 15} is out of buffer bounds`); + } for (let i = 0; i < 16; ++i) { buf[offset + i] = rnds[i]; } diff --git a/node_modules/uuid/dist/cjs/v7.js b/node_modules/uuid/dist/cjs/v7.js index 72cd1f17f7..ff01dc08cc 100644 --- a/node_modules/uuid/dist/cjs/v7.js +++ b/node_modules/uuid/dist/cjs/v7.js @@ -33,10 +33,18 @@ function updateV7State(state, now, rnds) { return state; } function v7Bytes(rnds, msecs, seq, buf, offset = 0) { + if (rnds.length < 16) { + throw new Error('Random bytes length must be >= 16'); + } if (!buf) { buf = new Uint8Array(16); offset = 0; } + else { + if (offset < 0 || offset + 16 > buf.length) { + throw new RangeError(`UUID byte range ${offset}:${offset + 15} is out of buffer bounds`); + } + } msecs ??= Date.now(); seq ??= ((rnds[6] * 0x7f) << 24) | (rnds[7] << 16) | (rnds[8] << 8) | rnds[9]; buf[offset++] = (msecs / 0x10000000000) & 0xff; diff --git a/node_modules/uuid/dist/esm-browser/md5.d.ts b/node_modules/uuid/dist/esm-browser/md5.d.ts index 5a55f51ebd..44bc824b1b 100644 --- a/node_modules/uuid/dist/esm-browser/md5.d.ts +++ b/node_modules/uuid/dist/esm-browser/md5.d.ts @@ -1,2 +1,2 @@ -declare function md5(bytes: Uint8Array): Uint8Array; +declare function md5(bytes: Uint8Array): Uint8Array; export default md5; diff --git a/node_modules/uuid/dist/esm-browser/parse.d.ts b/node_modules/uuid/dist/esm-browser/parse.d.ts index a316fb1178..86d55ef9c5 100644 --- a/node_modules/uuid/dist/esm-browser/parse.d.ts +++ b/node_modules/uuid/dist/esm-browser/parse.d.ts @@ -1,2 +1,2 @@ -declare function parse(uuid: string): Uint8Array; +declare function parse(uuid: string): Uint8Array; export default parse; diff --git a/node_modules/uuid/dist/esm-browser/rng.d.ts b/node_modules/uuid/dist/esm-browser/rng.d.ts index 73e60cf348..1fbb163599 100644 --- a/node_modules/uuid/dist/esm-browser/rng.d.ts +++ b/node_modules/uuid/dist/esm-browser/rng.d.ts @@ -1 +1 @@ -export default function rng(): Uint8Array; +export default function rng(): Uint8Array; diff --git a/node_modules/uuid/dist/esm-browser/test/parse.test.d.ts b/node_modules/uuid/dist/esm-browser/test/parse.test.d.ts deleted file mode 100644 index cb0ff5c3b5..0000000000 --- a/node_modules/uuid/dist/esm-browser/test/parse.test.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/node_modules/uuid/dist/esm-browser/test/parse.test.js b/node_modules/uuid/dist/esm-browser/test/parse.test.js deleted file mode 100644 index e5081d2cf4..0000000000 --- a/node_modules/uuid/dist/esm-browser/test/parse.test.js +++ /dev/null @@ -1,48 +0,0 @@ -import * as assert from 'assert'; -import test, { describe } from 'node:test'; -import parse from '../parse.js'; -import stringify from '../stringify.js'; -import uuidv4 from '../v4.js'; -function splitmix32(a) { - return function () { - a |= 0; - a = (a + 0x9e3779b9) | 0; - let t = a ^ (a >>> 16); - t = Math.imul(t, 0x21f0aaad); - t = t ^ (t >>> 15); - t = Math.imul(t, 0x735a2d97); - return ((t = t ^ (t >>> 15)) >>> 0) / 4294967296; - }; -} -const rand = splitmix32(0x12345678); -function rng(bytes = new Uint8Array(16)) { - for (let i = 0; i < 16; i++) { - bytes[i] = rand() * 256; - } - return bytes; -} -describe('parse', () => { - test('String -> bytes parsing', () => { - assert.deepStrictEqual(parse('0f5abcd1-c194-47f3-905b-2df7263a084b'), Uint8Array.from([ - 0x0f, 0x5a, 0xbc, 0xd1, 0xc1, 0x94, 0x47, 0xf3, 0x90, 0x5b, 0x2d, 0xf7, 0x26, 0x3a, 0x08, - 0x4b, - ])); - }); - test('String -> bytes -> string symmetry for assorted uuids', () => { - for (let i = 0; i < 1000; i++) { - const uuid = uuidv4({ rng }); - assert.equal(stringify(parse(uuid)), uuid); - } - }); - test('Case neutrality', () => { - assert.deepStrictEqual(parse('0f5abcd1-c194-47f3-905b-2df7263a084b'), parse('0f5abcd1-c194-47f3-905b-2df7263a084b'.toUpperCase())); - }); - test('Null UUID case', () => { - assert.deepStrictEqual(parse('00000000-0000-0000-0000-000000000000'), Uint8Array.from(new Array(16).fill(0))); - }); - test('UUID validation', () => { - assert.throws(() => parse()); - assert.throws(() => parse('invalid uuid')); - assert.throws(() => parse('zyxwvuts-rqpo-nmlk-jihg-fedcba000000')); - }); -}); diff --git a/node_modules/uuid/dist/esm-browser/test/rng.test.d.ts b/node_modules/uuid/dist/esm-browser/test/rng.test.d.ts deleted file mode 100644 index cb0ff5c3b5..0000000000 --- a/node_modules/uuid/dist/esm-browser/test/rng.test.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/node_modules/uuid/dist/esm-browser/test/rng.test.js b/node_modules/uuid/dist/esm-browser/test/rng.test.js deleted file mode 100644 index e6c1e789b1..0000000000 --- a/node_modules/uuid/dist/esm-browser/test/rng.test.js +++ /dev/null @@ -1,12 +0,0 @@ -import * as assert from 'assert'; -import test, { describe } from 'node:test'; -import rng from '../rng.js'; -describe('rng', () => { - test('Node.js RNG', () => { - const bytes = rng(); - assert.equal(bytes.length, 16); - for (let i = 0; i < bytes.length; ++i) { - assert.equal(typeof bytes[i], 'number'); - } - }); -}); diff --git a/node_modules/uuid/dist/esm-browser/test/stringify.test.d.ts b/node_modules/uuid/dist/esm-browser/test/stringify.test.d.ts deleted file mode 100644 index cb0ff5c3b5..0000000000 --- a/node_modules/uuid/dist/esm-browser/test/stringify.test.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/node_modules/uuid/dist/esm-browser/test/stringify.test.js b/node_modules/uuid/dist/esm-browser/test/stringify.test.js deleted file mode 100644 index 10fca3a5f5..0000000000 --- a/node_modules/uuid/dist/esm-browser/test/stringify.test.js +++ /dev/null @@ -1,21 +0,0 @@ -import * as assert from 'assert'; -import test, { describe } from 'node:test'; -import stringify, { unsafeStringify } from '../stringify.js'; -const BYTES = Uint8Array.of(0x0f, 0x5a, 0xbc, 0xd1, 0xc1, 0x94, 0x47, 0xf3, 0x90, 0x5b, 0x2d, 0xf7, 0x26, 0x3a, 0x08, 0x4b); -describe('stringify', () => { - test('Stringify Array (unsafe)', () => { - assert.equal(unsafeStringify(BYTES), '0f5abcd1-c194-47f3-905b-2df7263a084b'); - }); - test('Stringify w/ offset (unsafe)', () => { - const bytes = new Uint8Array(19).fill(0); - bytes.set(BYTES, 3); - assert.equal(unsafeStringify(bytes, 3), '0f5abcd1-c194-47f3-905b-2df7263a084b'); - }); - test('Stringify Array (safe)', () => { - assert.equal(stringify(BYTES), '0f5abcd1-c194-47f3-905b-2df7263a084b'); - }); - test('Throws on not enough values (safe)', () => { - const bytes = BYTES.slice(0, 15); - assert.throws(() => stringify(bytes)); - }); -}); diff --git a/node_modules/uuid/dist/esm-browser/test/test_constants.d.ts b/node_modules/uuid/dist/esm-browser/test/test_constants.d.ts deleted file mode 100644 index 959a679fd0..0000000000 --- a/node_modules/uuid/dist/esm-browser/test/test_constants.d.ts +++ /dev/null @@ -1,33 +0,0 @@ -export declare const TESTS: ({ - value: string; - expectedValidate: boolean; - expectedVersion: number; -} | { - value: string; - expectedValidate: boolean; - expectedVersion?: undefined; -} | { - value: undefined; - expectedValidate: boolean; - expectedVersion?: undefined; -} | { - value: null; - expectedValidate: boolean; - expectedVersion?: undefined; -} | { - value: number; - expectedValidate: boolean; - expectedVersion?: undefined; -} | { - value: RegExp; - expectedValidate: boolean; - expectedVersion?: undefined; -} | { - value: Date; - expectedValidate: boolean; - expectedVersion?: undefined; -} | { - value: boolean; - expectedValidate: boolean; - expectedVersion?: undefined; -})[]; diff --git a/node_modules/uuid/dist/esm-browser/test/test_constants.js b/node_modules/uuid/dist/esm-browser/test/test_constants.js deleted file mode 100644 index ec77a2e1cf..0000000000 --- a/node_modules/uuid/dist/esm-browser/test/test_constants.js +++ /dev/null @@ -1,88 +0,0 @@ -import MAX from '../max.js'; -import NIL from '../nil.js'; -export const TESTS = [ - { value: NIL, expectedValidate: true, expectedVersion: 0 }, - { value: MAX, expectedValidate: true, expectedVersion: 15 }, - { value: '00000000-0000-1000-8000-000000000000', expectedValidate: true, expectedVersion: 1 }, - { value: 'ffffffff-ffff-1fff-8fff-ffffffffffff', expectedValidate: true, expectedVersion: 1 }, - { value: '00000000-0000-2000-8000-000000000000', expectedValidate: true, expectedVersion: 2 }, - { value: 'ffffffff-ffff-2fff-bfff-ffffffffffff', expectedValidate: true, expectedVersion: 2 }, - { value: '00000000-0000-3000-8000-000000000000', expectedValidate: true, expectedVersion: 3 }, - { value: 'ffffffff-ffff-3fff-bfff-ffffffffffff', expectedValidate: true, expectedVersion: 3 }, - { value: '00000000-0000-4000-8000-000000000000', expectedValidate: true, expectedVersion: 4 }, - { value: 'ffffffff-ffff-4fff-bfff-ffffffffffff', expectedValidate: true, expectedVersion: 4 }, - { value: '00000000-0000-5000-8000-000000000000', expectedValidate: true, expectedVersion: 5 }, - { value: 'ffffffff-ffff-5fff-bfff-ffffffffffff', expectedValidate: true, expectedVersion: 5 }, - { value: '00000000-0000-6000-8000-000000000000', expectedValidate: true, expectedVersion: 6 }, - { value: 'ffffffff-ffff-6fff-bfff-ffffffffffff', expectedValidate: true, expectedVersion: 6 }, - { value: '00000000-0000-7000-8000-000000000000', expectedValidate: true, expectedVersion: 7 }, - { value: 'ffffffff-ffff-7fff-bfff-ffffffffffff', expectedValidate: true, expectedVersion: 7 }, - { value: '00000000-0000-8000-8000-000000000000', expectedValidate: true, expectedVersion: 8 }, - { value: 'ffffffff-ffff-8fff-bfff-ffffffffffff', expectedValidate: true, expectedVersion: 8 }, - { value: '00000000-0000-9000-8000-000000000000', expectedValidate: false }, - { value: 'ffffffff-ffff-9fff-bfff-ffffffffffff', expectedValidate: false }, - { value: '00000000-0000-a000-8000-000000000000', expectedValidate: false }, - { value: 'ffffffff-ffff-afff-bfff-ffffffffffff', expectedValidate: false }, - { value: '00000000-0000-b000-8000-000000000000', expectedValidate: false }, - { value: 'ffffffff-ffff-bfff-bfff-ffffffffffff', expectedValidate: false }, - { value: '00000000-0000-c000-8000-000000000000', expectedValidate: false }, - { value: 'ffffffff-ffff-cfff-bfff-ffffffffffff', expectedValidate: false }, - { value: '00000000-0000-d000-8000-000000000000', expectedValidate: false }, - { value: 'ffffffff-ffff-dfff-bfff-ffffffffffff', expectedValidate: false }, - { value: '00000000-0000-e000-8000-000000000000', expectedValidate: false }, - { value: 'ffffffff-ffff-efff-bfff-ffffffffffff', expectedValidate: false }, - { value: 'd9428888-122b-11e1-b85c-61cd3cbb3210', expectedValidate: true, expectedVersion: 1 }, - { value: '000003e8-2363-21ef-b200-325096b39f47', expectedValidate: true, expectedVersion: 2 }, - { value: 'a981a0c2-68b1-35dc-bcfc-296e52ab01ec', expectedValidate: true, expectedVersion: 3 }, - { value: '109156be-c4fb-41ea-b1b4-efe1671c5836', expectedValidate: true, expectedVersion: 4 }, - { value: '90123e1c-7512-523e-bb28-76fab9f2f73d', expectedValidate: true, expectedVersion: 5 }, - { value: '1ef21d2f-1207-6660-8c4f-419efbd44d48', expectedValidate: true, expectedVersion: 6 }, - { value: '017f22e2-79b0-7cc3-98c4-dc0c0c07398f', expectedValidate: true, expectedVersion: 7 }, - { value: '0d8f23a0-697f-83ae-802e-48f3756dd581', expectedValidate: true, expectedVersion: 8 }, - { value: '00000000-0000-1000-0000-000000000000', expectedValidate: false }, - { value: '00000000-0000-1000-1000-000000000000', expectedValidate: false }, - { value: '00000000-0000-1000-2000-000000000000', expectedValidate: false }, - { value: '00000000-0000-1000-3000-000000000000', expectedValidate: false }, - { value: '00000000-0000-1000-4000-000000000000', expectedValidate: false }, - { value: '00000000-0000-1000-5000-000000000000', expectedValidate: false }, - { value: '00000000-0000-1000-6000-000000000000', expectedValidate: false }, - { value: '00000000-0000-1000-7000-000000000000', expectedValidate: false }, - { value: '00000000-0000-1000-8000-000000000000', expectedValidate: true, expectedVersion: 1 }, - { value: '00000000-0000-1000-9000-000000000000', expectedValidate: true, expectedVersion: 1 }, - { value: '00000000-0000-1000-a000-000000000000', expectedValidate: true, expectedVersion: 1 }, - { value: '00000000-0000-1000-b000-000000000000', expectedValidate: true, expectedVersion: 1 }, - { value: '00000000-0000-1000-c000-000000000000', expectedValidate: false }, - { value: '00000000-0000-1000-d000-000000000000', expectedValidate: false }, - { value: '00000000-0000-1000-e000-000000000000', expectedValidate: false }, - { value: '00000000-0000-1000-f000-000000000000', expectedValidate: false }, - { value: '00000000000000000000000000000000', expectedValidate: false }, - { value: '', expectedValidate: false }, - { value: 'invalid uuid string', expectedValidate: false }, - { - value: '=Y00a-f*vb*-c-d#-p00f\b-g0h-#i^-j*3&-L00k-\nl---00n-fg000-00p-00r+', - expectedValidate: false, - }, - { value: undefined, expectedValidate: false }, - { value: null, expectedValidate: false }, - { value: 123, expectedValidate: false }, - { value: /regex/, expectedValidate: false }, - { value: new Date(0), expectedValidate: false }, - { value: false, expectedValidate: false }, -]; -for (let charIndex = 0; charIndex < 36; charIndex++) { - if (charIndex === 8 || - charIndex === 13 || - charIndex === 14 || - charIndex === 18 || - charIndex === 23) { - continue; - } - const nilChars = NIL.split(''); - const maxChars = MAX.split(''); - for (let i = 0; i < 4; i++) { - nilChars[charIndex] = (0x0 ^ (1 << i)).toString(16); - TESTS.push({ value: nilChars.join(''), expectedValidate: false }); - maxChars[charIndex] = (0xf ^ (1 << i)).toString(16); - TESTS.push({ value: maxChars.join(''), expectedValidate: false }); - } -} diff --git a/node_modules/uuid/dist/esm-browser/test/v1.test.d.ts b/node_modules/uuid/dist/esm-browser/test/v1.test.d.ts deleted file mode 100644 index cb0ff5c3b5..0000000000 --- a/node_modules/uuid/dist/esm-browser/test/v1.test.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/node_modules/uuid/dist/esm-browser/test/v1.test.js b/node_modules/uuid/dist/esm-browser/test/v1.test.js deleted file mode 100644 index 91e1783bff..0000000000 --- a/node_modules/uuid/dist/esm-browser/test/v1.test.js +++ /dev/null @@ -1,125 +0,0 @@ -import * as assert from 'assert'; -import test, { describe } from 'node:test'; -import parse from '../parse.js'; -import v1, { updateV1State } from '../v1.js'; -const TIME = 1321644961388; -const RFC_V1 = 'c232ab00-9414-11ec-b3c8-9f68deced846'; -const RFC_V1_BYTES = parse(RFC_V1); -const RFC_OPTIONS = { - msecs: 0x17f22e279b0, - nsecs: 0, - clockseq: 0x33c8, - node: Uint8Array.of(0x9f, 0x68, 0xde, 0xce, 0xd8, 0x46), -}; -const RFC_RANDOM = Uint8Array.of(0, 0, 0, 0, 0, 0, 0, 0, RFC_OPTIONS.clockseq >> 8, RFC_OPTIONS.clockseq & 0xff, ...RFC_OPTIONS.node); -function compareV1TimeField(a, b) { - a = a.split('-').slice(0, 3).reverse().join(''); - b = b.split('-').slice(0, 3).reverse().join(''); - return a < b ? -1 : a > b ? 1 : 0; -} -describe('v1', () => { - test('v1 sort order (default)', () => { - const ids = [v1(), v1(), v1(), v1(), v1()]; - const sorted = [...ids].sort(compareV1TimeField); - assert.deepEqual(ids, sorted); - }); - test('v1 sort order (time option)', () => { - const ids = [ - v1({ msecs: TIME - 10 * 3600 * 1000 }), - v1({ msecs: TIME - 1 }), - v1({ msecs: TIME }), - v1({ msecs: TIME + 1 }), - v1({ msecs: TIME + 28 * 24 * 3600 * 1000 }), - ]; - const sorted = [...ids].sort(compareV1TimeField); - assert.deepEqual(ids, sorted); - }); - test('v1(options)', () => { - assert.equal(v1({ msecs: RFC_OPTIONS.msecs, random: RFC_RANDOM }), RFC_V1, 'minimal options'); - assert.equal(v1(RFC_OPTIONS), RFC_V1, 'full options'); - }); - test('v1(options) equality', () => { - assert.notEqual(v1({ msecs: TIME }), v1({ msecs: TIME }), 'UUIDs with minimal options differ'); - assert.equal(v1(RFC_OPTIONS), v1(RFC_OPTIONS), 'UUIDs with full options are identical'); - }); - test('fills one UUID into a buffer as expected', () => { - const buffer = new Uint8Array(16); - const result = v1(RFC_OPTIONS, buffer); - assert.deepEqual(buffer, RFC_V1_BYTES); - assert.strictEqual(buffer, result); - }); - test('fills two UUIDs into a buffer as expected', () => { - const buffer = new Uint8Array(32); - v1(RFC_OPTIONS, buffer, 0); - v1(RFC_OPTIONS, buffer, 16); - const expectedBuf = new Uint8Array(32); - expectedBuf.set(RFC_V1_BYTES); - expectedBuf.set(RFC_V1_BYTES, 16); - assert.deepEqual(buffer, expectedBuf); - }); - test('v1() state transitions', () => { - const PRE_STATE = { - msecs: 10, - nsecs: 20, - clockseq: 0x1234, - node: Uint8Array.of(0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc), - }; - const tests = [ - { - title: 'initial state', - state: {}, - now: 10, - expected: { - msecs: 10, - nsecs: 0, - clockseq: RFC_OPTIONS.clockseq, - node: RFC_OPTIONS.node, - }, - }, - { - title: 'same time interval', - state: { ...PRE_STATE }, - now: PRE_STATE.msecs, - expected: { - ...PRE_STATE, - nsecs: 21, - }, - }, - { - title: 'new time interval', - state: { ...PRE_STATE }, - now: PRE_STATE.msecs + 1, - expected: { - ...PRE_STATE, - msecs: PRE_STATE.msecs + 1, - nsecs: 0, - }, - }, - { - title: 'same time interval (nsecs overflow)', - state: { ...PRE_STATE, nsecs: 9999 }, - now: PRE_STATE.msecs, - expected: { - ...PRE_STATE, - nsecs: 0, - clockseq: RFC_OPTIONS.clockseq, - node: RFC_OPTIONS.node, - }, - }, - { - title: 'time regression', - state: { ...PRE_STATE }, - now: PRE_STATE.msecs - 1, - expected: { - ...PRE_STATE, - msecs: PRE_STATE.msecs - 1, - clockseq: RFC_OPTIONS.clockseq, - node: RFC_OPTIONS.node, - }, - }, - ]; - for (const { title, state, now, expected } of tests) { - assert.deepStrictEqual(updateV1State(state, now, RFC_RANDOM), expected, `Failed: ${title}`); - } - }); -}); diff --git a/node_modules/uuid/dist/esm-browser/test/v35.test.d.ts b/node_modules/uuid/dist/esm-browser/test/v35.test.d.ts deleted file mode 100644 index cb0ff5c3b5..0000000000 --- a/node_modules/uuid/dist/esm-browser/test/v35.test.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/node_modules/uuid/dist/esm-browser/test/v35.test.js b/node_modules/uuid/dist/esm-browser/test/v35.test.js deleted file mode 100644 index 35d38d26e8..0000000000 --- a/node_modules/uuid/dist/esm-browser/test/v35.test.js +++ /dev/null @@ -1,141 +0,0 @@ -import * as assert from 'assert'; -import test, { describe } from 'node:test'; -import md5 from '../md5.js'; -import sha1 from '../sha1.js'; -import v3 from '../v3.js'; -import { stringToBytes } from '../v35.js'; -import v5 from '../v5.js'; -describe('v35', () => { - const HASH_SAMPLES = [ - { - input: stringToBytes(''), - sha1: 'da39a3ee5e6b4b0d3255bfef95601890afd80709', - md5: 'd41d8cd98f00b204e9800998ecf8427e', - }, - { - input: stringToBytes('\t\b\f !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\u00A1\u00A2\u00A3\u00A4\u00A5\u00A6\u00A7\u00A8\u00A9\u00AA\u00AB\u00AC\u00AE\u00AF\u00B0\u00B1\u00B2\u00B3\u00B4\u00B5\u00B6\u00B7\u00B8\u00B9\u00BA\u00BB\u00BC\u00BD\u00BE\u00BF\u00C0\u00C1\u00C2\u00C3\u00C4\u00C5\u00C6\u00C7\u00C8\u00C9\u00CA\u00CB\u00CC\u00CD\u00CE\u00CF\u00D0\u00D1\u00D2\u00D3\u00D4\u00D5\u00D6\u00D7\u00D8\u00D9\u00DA\u00DB\u00DC\u00DD\u00DE\u00DF\u00E0\u00E1\u00E2\u00E3\u00E4\u00E5\u00E6\u00E7\u00E8\u00E9\u00EA\u00EB\u00EC\u00ED\u00EE\u00EF\u00F0\u00F1\u00F2\u00F3\u00F4\u00F5\u00F6\u00F7\u00F8\u00F9\u00FA\u00FB\u00FC\u00FD\u00FE\u00FF'), - sha1: 'ca4a426a3d536f14cfd79011e79e10d64de950a0', - md5: 'e8098ec21950f841731d28749129d3ee', - }, - { - input: stringToBytes('\u00A5\u0104\u018F\u0256\u02B1o\u0315\u038E\u0409\u0500\u0531\u05E1\u05B6\u0920\u0903\u09A4\u0983\u0A20\u0A02\u0AA0\u0A83\u0B06\u0C05\u0C03\u1401\u16A0'), - sha1: 'f2753ebc390e5f637e333c2a4179644a93ae9f65', - md5: '231b309e277b6be8bb3d6c688b7f098b', - }, - ]; - function hashToHex(hash) { - const chars = new Array(hash.length); - for (let i = 0; i < hash.length; i++) { - chars[i] = hash[i].toString(16).padStart(2, '0'); - } - return chars.join(''); - } - HASH_SAMPLES.forEach(function (sample, i) { - test(`sha1(node) HASH_SAMPLES[${i}]`, () => { - assert.equal(hashToHex(sha1(sample.input)), sample.sha1); - }); - }); - HASH_SAMPLES.forEach(function (sample, i) { - test(`md5(node) HASH_SAMPLES[${i}]`, () => { - assert.equal(hashToHex(md5(sample.input)), sample.md5); - }); - }); - test('v3', () => { - assert.strictEqual(v3('hello.example.com', v3.DNS), '9125a8dc-52ee-365b-a5aa-81b0b3681cf6'); - assert.strictEqual(v3('http://example.com/hello', v3.URL), 'c6235813-3ba4-3801-ae84-e0a6ebb7d138'); - assert.strictEqual(v3('hello', '0f5abcd1-c194-47f3-905b-2df7263a084b'), 'a981a0c2-68b1-35dc-bcfc-296e52ab01ec'); - }); - test('v3 namespace.toUpperCase', () => { - assert.strictEqual(v3('hello.example.com', v3.DNS.toUpperCase()), '9125a8dc-52ee-365b-a5aa-81b0b3681cf6'); - assert.strictEqual(v3('http://example.com/hello', v3.URL.toUpperCase()), 'c6235813-3ba4-3801-ae84-e0a6ebb7d138'); - assert.strictEqual(v3('hello', '0f5abcd1-c194-47f3-905b-2df7263a084b'.toUpperCase()), 'a981a0c2-68b1-35dc-bcfc-296e52ab01ec'); - }); - test('v3 namespace string validation', () => { - assert.throws(() => { - v3('hello.example.com', 'zyxwvuts-rqpo-nmlk-jihg-fedcba000000'); - }); - assert.throws(() => { - v3('hello.example.com', 'invalid uuid value'); - }); - assert.ok(v3('hello.example.com', '00000000-0000-0000-0000-000000000000')); - }); - test('v3 namespace buffer validation', () => { - assert.throws(() => { - v3('hello.example.com', new Uint8Array(15)); - }); - assert.throws(() => { - v3('hello.example.com', new Uint8Array(17)); - }); - assert.ok(v3('hello.example.com', new Uint8Array(16).fill(0))); - }); - test('v3 fill buffer', () => { - let buf = new Uint8Array(16); - const expectedUuid = Uint8Array.of(0x91, 0x25, 0xa8, 0xdc, 0x52, 0xee, 0x36, 0x5b, 0xa5, 0xaa, 0x81, 0xb0, 0xb3, 0x68, 0x1c, 0xf6); - const result = v3('hello.example.com', v3.DNS, buf); - assert.deepEqual(buf, expectedUuid); - assert.strictEqual(result, buf); - buf = new Uint8Array(19).fill(0xaa); - const expectedBuf = new Uint8Array(19).fill(0xaa); - expectedBuf.set(expectedUuid, 3); - v3('hello.example.com', v3.DNS, buf, 3); - assert.deepEqual(buf, expectedBuf); - }); - test('v3 undefined/null', () => { - assert.throws(() => v3()); - assert.throws(() => v3('hello')); - assert.throws(() => v3('hello.example.com', undefined)); - assert.throws(() => v3('hello.example.com', null, new Uint8Array(16))); - }); - test('v5', () => { - assert.strictEqual(v5('hello.example.com', v5.DNS), 'fdda765f-fc57-5604-a269-52a7df8164ec'); - assert.strictEqual(v5('http://example.com/hello', v5.URL), '3bbcee75-cecc-5b56-8031-b6641c1ed1f1'); - assert.strictEqual(v5('hello', '0f5abcd1-c194-47f3-905b-2df7263a084b'), '90123e1c-7512-523e-bb28-76fab9f2f73d'); - }); - test('v5 namespace.toUpperCase', () => { - assert.strictEqual(v5('hello.example.com', v5.DNS.toUpperCase()), 'fdda765f-fc57-5604-a269-52a7df8164ec'); - assert.strictEqual(v5('http://example.com/hello', v5.URL.toUpperCase()), '3bbcee75-cecc-5b56-8031-b6641c1ed1f1'); - assert.strictEqual(v5('hello', '0f5abcd1-c194-47f3-905b-2df7263a084b'.toUpperCase()), '90123e1c-7512-523e-bb28-76fab9f2f73d'); - }); - test('v5 namespace string validation', () => { - assert.throws(() => { - v5('hello.example.com', 'zyxwvuts-rqpo-nmlk-jihg-fedcba000000'); - }); - assert.throws(() => { - v5('hello.example.com', 'invalid uuid value'); - }); - assert.ok(v5('hello.example.com', '00000000-0000-0000-0000-000000000000')); - }); - test('v5 namespace buffer validation', () => { - assert.throws(() => { - v5('hello.example.com', new Uint8Array(15)); - }); - assert.throws(() => { - v5('hello.example.com', new Uint8Array(17)); - }); - assert.ok(v5('hello.example.com', new Uint8Array(16).fill(0))); - }); - test('v5 fill buffer', () => { - let buf = new Uint8Array(16); - const expectedUuid = Uint8Array.of(0xfd, 0xda, 0x76, 0x5f, 0xfc, 0x57, 0x56, 0x04, 0xa2, 0x69, 0x52, 0xa7, 0xdf, 0x81, 0x64, 0xec); - const result = v5('hello.example.com', v5.DNS, buf); - assert.deepEqual(buf, expectedUuid); - assert.strictEqual(result, buf); - buf = new Uint8Array(19).fill(0xaa); - const expectedBuf = new Uint8Array(19).fill(0xaa); - expectedBuf.set(expectedUuid, 3); - v5('hello.example.com', v5.DNS, buf, 3); - assert.deepEqual(buf, expectedBuf); - }); - test('v5 undefined/null', () => { - assert.throws(() => v5()); - assert.throws(() => v5('hello')); - assert.throws(() => v5('hello.example.com', undefined)); - assert.throws(() => v5('hello.example.com', null, new Uint8Array(16))); - }); - test('v3/v5 constants', () => { - assert.strictEqual(v3.DNS, '6ba7b810-9dad-11d1-80b4-00c04fd430c8'); - assert.strictEqual(v3.URL, '6ba7b811-9dad-11d1-80b4-00c04fd430c8'); - assert.strictEqual(v5.DNS, '6ba7b810-9dad-11d1-80b4-00c04fd430c8'); - assert.strictEqual(v5.URL, '6ba7b811-9dad-11d1-80b4-00c04fd430c8'); - }); -}); diff --git a/node_modules/uuid/dist/esm-browser/test/v4.test.d.ts b/node_modules/uuid/dist/esm-browser/test/v4.test.d.ts deleted file mode 100644 index cb0ff5c3b5..0000000000 --- a/node_modules/uuid/dist/esm-browser/test/v4.test.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/node_modules/uuid/dist/esm-browser/test/v4.test.js b/node_modules/uuid/dist/esm-browser/test/v4.test.js deleted file mode 100644 index 92c9ce2d58..0000000000 --- a/node_modules/uuid/dist/esm-browser/test/v4.test.js +++ /dev/null @@ -1,58 +0,0 @@ -import * as assert from 'assert'; -import test, { describe } from 'node:test'; -import native from '../native.js'; -import v4 from '../v4.js'; -const randomBytesFixture = Uint8Array.of(0x10, 0x91, 0x56, 0xbe, 0xc4, 0xfb, 0xc1, 0xea, 0x71, 0xb4, 0xef, 0xe1, 0x67, 0x1c, 0x58, 0x36); -const expectedBytes = Uint8Array.of(16, 145, 86, 190, 196, 251, 65, 234, 177, 180, 239, 225, 103, 28, 88, 54); -describe('v4', () => { - test('subsequent UUIDs are different', () => { - const id1 = v4(); - const id2 = v4(); - assert.ok(id1 !== id2); - }); - test('should uses native randomUUID() if no option is passed', async () => { - const mock = (await import('node:test')).default.mock; - if (!mock) { - return; - } - const mockRandomUUID = mock.method(native, 'randomUUID'); - assert.equal(mockRandomUUID.mock.callCount(), 0); - v4(); - assert.equal(mockRandomUUID.mock.callCount(), 1); - mock.restoreAll(); - }); - test('should not use native randomUUID() if an option is passed', async () => { - const mock = (await import('node:test')).default.mock; - if (!mock) { - return; - } - const mockRandomUUID = mock.method(native, 'randomUUID'); - assert.equal(mockRandomUUID.mock.callCount(), 0); - v4({}); - assert.equal(mockRandomUUID.mock.callCount(), 0); - mock.restoreAll(); - }); - test('explicit options.random produces expected result', () => { - const id = v4({ random: randomBytesFixture }); - assert.strictEqual(id, '109156be-c4fb-41ea-b1b4-efe1671c5836'); - }); - test('explicit options.rng produces expected result', () => { - const id = v4({ rng: () => randomBytesFixture }); - assert.strictEqual(id, '109156be-c4fb-41ea-b1b4-efe1671c5836'); - }); - test('fills one UUID into a buffer as expected', () => { - const buffer = new Uint8Array(16); - const result = v4({ random: randomBytesFixture }, buffer); - assert.deepEqual(buffer, expectedBytes); - assert.strictEqual(buffer, result); - }); - test('fills two UUIDs into a buffer as expected', () => { - const buffer = new Uint8Array(32); - v4({ random: randomBytesFixture }, buffer, 0); - v4({ random: randomBytesFixture }, buffer, 16); - const expectedBuf = new Uint8Array(32); - expectedBuf.set(expectedBytes); - expectedBuf.set(expectedBytes, 16); - assert.deepEqual(buffer, expectedBuf); - }); -}); diff --git a/node_modules/uuid/dist/esm-browser/test/v6.test.d.ts b/node_modules/uuid/dist/esm-browser/test/v6.test.d.ts deleted file mode 100644 index cb0ff5c3b5..0000000000 --- a/node_modules/uuid/dist/esm-browser/test/v6.test.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/node_modules/uuid/dist/esm-browser/test/v6.test.js b/node_modules/uuid/dist/esm-browser/test/v6.test.js deleted file mode 100644 index 46cb865cc6..0000000000 --- a/node_modules/uuid/dist/esm-browser/test/v6.test.js +++ /dev/null @@ -1,54 +0,0 @@ -import * as assert from 'assert'; -import test, { describe } from 'node:test'; -import v1ToV6 from '../v1ToV6.js'; -import v6 from '../v6.js'; -import v6ToV1 from '../v6ToV1.js'; -describe('v6', () => { - const V1_ID = 'f1207660-21d2-11ef-8c4f-419efbd44d48'; - const V6_ID = '1ef21d2f-1207-6660-8c4f-419efbd44d48'; - const fullOptions = { - msecs: 0x133b891f705, - nsecs: 0x1538, - clockseq: 0x385c, - node: Uint8Array.of(0x61, 0xcd, 0x3c, 0xbb, 0x32, 0x10), - }; - const EXPECTED_BYTES = Uint8Array.of(0x1e, 0x11, 0x22, 0xbd, 0x94, 0x28, 0x68, 0x88, 0xb8, 0x5c, 0x61, 0xcd, 0x3c, 0xbb, 0x32, 0x10); - test('default behavior', () => { - const id = v6(); - assert.ok(/[0-9a-f]{8}-[0-9a-f]{4}-6[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}/.test(id), 'id is valid v6 UUID'); - }); - test('default behavior (binary type)', () => { - const buffer = new Uint8Array(16); - const result = v6(fullOptions, buffer); - assert.deepEqual(buffer, EXPECTED_BYTES); - assert.strictEqual(buffer, result); - }); - test('all options', () => { - const id = v6(fullOptions); - assert.equal(id, '1e1122bd-9428-6888-b85c-61cd3cbb3210'); - }); - test('sort by creation time', () => { - const ids = []; - for (let i = 0; i < 5; i++) { - ids.push(v6({ msecs: i * 1000 })); - } - assert.deepEqual(ids, ids.slice().sort()); - }); - test('creating at array offset', () => { - const buffer = new Uint8Array(32); - v6(fullOptions, buffer, 0); - v6(fullOptions, buffer, 16); - const expectedBuf = new Uint8Array(32); - expectedBuf.set(EXPECTED_BYTES, 0); - expectedBuf.set(EXPECTED_BYTES, 16); - assert.deepEqual(buffer, expectedBuf); - }); - test('v1 -> v6 conversion', () => { - const id = v1ToV6(V1_ID); - assert.equal(id, V6_ID); - }); - test('v6 -> v1 conversion', () => { - const id = v6ToV1(V6_ID); - assert.equal(id, V1_ID); - }); -}); diff --git a/node_modules/uuid/dist/esm-browser/test/v7.test.d.ts b/node_modules/uuid/dist/esm-browser/test/v7.test.d.ts deleted file mode 100644 index cb0ff5c3b5..0000000000 --- a/node_modules/uuid/dist/esm-browser/test/v7.test.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/node_modules/uuid/dist/esm-browser/test/v7.test.js b/node_modules/uuid/dist/esm-browser/test/v7.test.js deleted file mode 100644 index 69356c8660..0000000000 --- a/node_modules/uuid/dist/esm-browser/test/v7.test.js +++ /dev/null @@ -1,192 +0,0 @@ -import * as assert from 'assert'; -import test, { describe } from 'node:test'; -import parse from '../parse.js'; -import stringify from '../stringify.js'; -import v7, { updateV7State } from '../v7.js'; -const RFC_V7 = '017f22e2-79b0-7cc3-98c4-dc0c0c07398f'; -const RFC_V7_BYTES = parse('017f22e2-79b0-7cc3-98c4-dc0c0c07398f'); -const RFC_MSECS = 0x17f22e279b0; -const RFC_SEQ = (0x0cc3 << 20) | (0x98c4dc >> 2); -const RFC_RANDOM = Uint8Array.of(0x10, 0x91, 0x56, 0xbe, 0xc4, 0xfb, 0x0c, 0xc3, 0x18, 0xc4, 0x6c, 0x0c, 0x0c, 0x07, 0x39, 0x8f); -describe('v7', () => { - test('subsequent UUIDs are different', () => { - const id1 = v7(); - const id2 = v7(); - assert.ok(id1 !== id2); - }); - test('explicit options.random and options.msecs produces expected result', () => { - const id = v7({ - random: RFC_RANDOM, - msecs: RFC_MSECS, - seq: RFC_SEQ, - }); - assert.strictEqual(id, RFC_V7); - }); - test('explicit options.rng produces expected result', () => { - const id = v7({ - rng: () => RFC_RANDOM, - msecs: RFC_MSECS, - seq: RFC_SEQ, - }); - assert.strictEqual(id, RFC_V7); - }); - test('explicit options.msecs produces expected result', () => { - const id = v7({ - msecs: RFC_MSECS, - }); - assert.strictEqual(id.indexOf('017f22e2'), 0); - }); - test('fills one UUID into a buffer as expected', () => { - const buffer = new Uint8Array(16); - const result = v7({ - random: RFC_RANDOM, - msecs: RFC_MSECS, - seq: RFC_SEQ, - }, buffer); - stringify(buffer); - assert.deepEqual(buffer, RFC_V7_BYTES); - assert.strictEqual(buffer, result); - }); - test('fills two UUIDs into a buffer as expected', () => { - const buffer = new Uint8Array(32); - v7({ - random: RFC_RANDOM, - msecs: RFC_MSECS, - seq: RFC_SEQ, - }, buffer, 0); - v7({ - random: RFC_RANDOM, - msecs: RFC_MSECS, - seq: RFC_SEQ, - }, buffer, 16); - const expected = new Uint8Array(32); - expected.set(RFC_V7_BYTES); - expected.set(RFC_V7_BYTES, 16); - assert.deepEqual(buffer, expected); - }); - test('lexicographical sorting is preserved', () => { - let id; - let prior; - let msecs = RFC_MSECS; - for (let i = 0; i < 20000; ++i) { - if (i % 1500 === 0) { - msecs += 1; - } - id = v7({ msecs, seq: i }); - if (prior !== undefined) { - assert.ok(prior < id, `${prior} < ${id}`); - } - prior = id; - } - }); - test('can supply seq', () => { - let seq = 0x12345; - let uuid = v7({ - msecs: RFC_MSECS, - seq, - }); - assert.strictEqual(uuid.substr(0, 25), '017f22e2-79b0-7000-848d-1'); - seq = 0x6fffffff; - uuid = v7({ - msecs: RFC_MSECS, - seq, - }); - assert.strictEqual(uuid.substring(0, 25), '017f22e2-79b0-76ff-bfff-f'); - }); - test('internal seq is reset upon timestamp change', () => { - v7({ - msecs: RFC_MSECS, - seq: 0x6fffffff, - }); - const uuid = v7({ - msecs: RFC_MSECS + 1, - }); - assert.ok(uuid.indexOf('fff') !== 15); - }); - test('v7() state transitions', () => { - const tests = [ - { - title: 'new time interval', - state: { msecs: 1, seq: 123 }, - now: 2, - expected: { - msecs: 2, - seq: 0x6c318c4, - }, - }, - { - title: 'same time interval', - state: { msecs: 1, seq: 123 }, - now: 1, - expected: { - msecs: 1, - seq: 124, - }, - }, - { - title: 'same time interval (sequence rollover)', - state: { msecs: 1, seq: 0xffffffff }, - now: 1, - expected: { - msecs: 2, - seq: 0, - }, - }, - { - title: 'time regression', - state: { msecs: 2, seq: 123 }, - now: 1, - expected: { - msecs: 2, - seq: 124, - }, - }, - { - title: 'time regression (sequence rollover)', - state: { msecs: 2, seq: 0xffffffff }, - now: 1, - expected: { - msecs: 3, - seq: 0, - }, - }, - ]; - for (const { title, state, now, expected } of tests) { - assert.deepStrictEqual(updateV7State(state, now, RFC_RANDOM), expected, `Failed: ${title}`); - } - }); - test('flipping bits changes the result', () => { - const asBigInt = (buf) => buf.reduce((acc, v) => (acc << 8n) | BigInt(v), 0n); - const asNumber = (bits, data) => Number(BigInt.asUintN(bits, data)); - const flip = (data, n) => data ^ (1n << BigInt(127 - n)); - const optionsFrom = (data) => { - const ms = asNumber(48, data >> 80n); - const hi = asNumber(12, data >> 64n); - const lo = asNumber(20, data >> 42n); - const r = BigInt.asUintN(42, data); - return { - msecs: ms, - seq: (hi << 20) | lo, - random: Uint8Array.from([ - ...Array(10).fill(0), - ...Array(6) - .fill(0) - .map((_, i) => asNumber(8, r >> (BigInt(i) * 8n))) - .reverse(), - ]), - }; - }; - const buf = new Uint8Array(16); - const data = asBigInt(v7({}, buf)); - const id = stringify(buf); - const reserved = [48, 49, 50, 51, 64, 65]; - for (let i = 0; i < 128; ++i) { - if (reserved.includes(i)) { - continue; - } - const flipped = flip(data, i); - assert.strictEqual(asBigInt(v7(optionsFrom(flipped), buf)).toString(16), flipped.toString(16), `Unequal uuids at bit ${i}`); - assert.notStrictEqual(stringify(buf), id); - } - }); -}); diff --git a/node_modules/uuid/dist/esm-browser/test/validate.test.d.ts b/node_modules/uuid/dist/esm-browser/test/validate.test.d.ts deleted file mode 100644 index cb0ff5c3b5..0000000000 --- a/node_modules/uuid/dist/esm-browser/test/validate.test.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/node_modules/uuid/dist/esm-browser/test/validate.test.js b/node_modules/uuid/dist/esm-browser/test/validate.test.js deleted file mode 100644 index ac2616532b..0000000000 --- a/node_modules/uuid/dist/esm-browser/test/validate.test.js +++ /dev/null @@ -1,11 +0,0 @@ -import * as assert from 'assert'; -import test, { describe } from 'node:test'; -import validate from '../validate.js'; -import { TESTS } from './test_constants.js'; -describe('validate()', () => { - test('TESTS cases', () => { - for (const { value, expectedValidate } of TESTS) { - assert.strictEqual(validate(value), expectedValidate, `validate(${value}) should be ${expectedValidate}`); - } - }); -}); diff --git a/node_modules/uuid/dist/esm-browser/test/version.test.d.ts b/node_modules/uuid/dist/esm-browser/test/version.test.d.ts deleted file mode 100644 index cb0ff5c3b5..0000000000 --- a/node_modules/uuid/dist/esm-browser/test/version.test.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/node_modules/uuid/dist/esm-browser/test/version.test.js b/node_modules/uuid/dist/esm-browser/test/version.test.js deleted file mode 100644 index 424012ed37..0000000000 --- a/node_modules/uuid/dist/esm-browser/test/version.test.js +++ /dev/null @@ -1,18 +0,0 @@ -import * as assert from 'assert'; -import test, { describe } from 'node:test'; -import version from '../version.js'; -import { TESTS } from './test_constants.js'; -describe('version()', () => { - test('TESTS cases', () => { - for (const { value, expectedValidate, expectedVersion } of TESTS) { - try { - const actualVersion = version(value); - assert.ok(expectedValidate, `version(${value}) should throw`); - assert.strictEqual(actualVersion, expectedVersion); - } - catch { - assert.ok(!expectedValidate, `version(${value}) threw unexpectedly`); - } - } - }); -}); diff --git a/node_modules/uuid/dist/esm-browser/v1.js b/node_modules/uuid/dist/esm-browser/v1.js index d35e0a5908..eee9b01f35 100644 --- a/node_modules/uuid/dist/esm-browser/v1.js +++ b/node_modules/uuid/dist/esm-browser/v1.js @@ -46,10 +46,18 @@ export function updateV1State(state, now, rnds) { return state; } function v1Bytes(rnds, msecs, nsecs, clockseq, node, buf, offset = 0) { + if (rnds.length < 16) { + throw new Error('Random bytes length must be >= 16'); + } if (!buf) { buf = new Uint8Array(16); offset = 0; } + else { + if (offset < 0 || offset + 16 > buf.length) { + throw new RangeError(`UUID byte range ${offset}:${offset + 15} is out of buffer bounds`); + } + } msecs ??= Date.now(); nsecs ??= 0; clockseq ??= ((rnds[8] << 8) | rnds[9]) & 0x3fff; diff --git a/node_modules/uuid/dist/esm-browser/v35.d.ts b/node_modules/uuid/dist/esm-browser/v35.d.ts index 5d1d06daef..a2c132633f 100644 --- a/node_modules/uuid/dist/esm-browser/v35.d.ts +++ b/node_modules/uuid/dist/esm-browser/v35.d.ts @@ -1,7 +1,7 @@ import { UUIDTypes } from './types.js'; -export declare function stringToBytes(str: string): Uint8Array; +export declare function stringToBytes(str: string): Uint8Array; export declare const DNS = "6ba7b810-9dad-11d1-80b4-00c04fd430c8"; export declare const URL = "6ba7b811-9dad-11d1-80b4-00c04fd430c8"; type HashFunction = (bytes: Uint8Array) => Uint8Array; -export default function v35(version: 0x30 | 0x50, hash: HashFunction, value: string | Uint8Array, namespace: UUIDTypes, buf?: Uint8Array, offset?: number): string | Uint8Array; +export default function v35(version: 0x30 | 0x50, hash: HashFunction, value: string | Uint8Array, namespace: UUIDTypes, buf?: Uint8Array, offset?: number): string | Uint8Array; export {}; diff --git a/node_modules/uuid/dist/esm-browser/v4.js b/node_modules/uuid/dist/esm-browser/v4.js index ac79ac5243..dd9067a6e3 100644 --- a/node_modules/uuid/dist/esm-browser/v4.js +++ b/node_modules/uuid/dist/esm-browser/v4.js @@ -6,11 +6,17 @@ function v4(options, buf, offset) { return native.randomUUID(); } options = options || {}; - const rnds = options.random || (options.rng || rng)(); + const rnds = options.random ?? options.rng?.() ?? rng(); + if (rnds.length < 16) { + throw new Error('Random bytes length must be >= 16'); + } rnds[6] = (rnds[6] & 0x0f) | 0x40; rnds[8] = (rnds[8] & 0x3f) | 0x80; if (buf) { offset = offset || 0; + if (offset < 0 || offset + 16 > buf.length) { + throw new RangeError(`UUID byte range ${offset}:${offset + 15} is out of buffer bounds`); + } for (let i = 0; i < 16; ++i) { buf[offset + i] = rnds[i]; } diff --git a/node_modules/uuid/dist/esm-browser/v7.js b/node_modules/uuid/dist/esm-browser/v7.js index e00e295073..482aca7b5c 100644 --- a/node_modules/uuid/dist/esm-browser/v7.js +++ b/node_modules/uuid/dist/esm-browser/v7.js @@ -30,10 +30,18 @@ export function updateV7State(state, now, rnds) { return state; } function v7Bytes(rnds, msecs, seq, buf, offset = 0) { + if (rnds.length < 16) { + throw new Error('Random bytes length must be >= 16'); + } if (!buf) { buf = new Uint8Array(16); offset = 0; } + else { + if (offset < 0 || offset + 16 > buf.length) { + throw new RangeError(`UUID byte range ${offset}:${offset + 15} is out of buffer bounds`); + } + } msecs ??= Date.now(); seq ??= ((rnds[6] * 0x7f) << 24) | (rnds[7] << 16) | (rnds[8] << 8) | rnds[9]; buf[offset++] = (msecs / 0x10000000000) & 0xff; diff --git a/node_modules/uuid/dist/esm/md5.d.ts b/node_modules/uuid/dist/esm/md5.d.ts index 26cb1a01f9..1d00cf700a 100644 --- a/node_modules/uuid/dist/esm/md5.d.ts +++ b/node_modules/uuid/dist/esm/md5.d.ts @@ -1,2 +1,2 @@ -declare function md5(bytes: Uint8Array): Buffer; +declare function md5(bytes: Uint8Array): Buffer; export default md5; diff --git a/node_modules/uuid/dist/esm/parse.d.ts b/node_modules/uuid/dist/esm/parse.d.ts index a316fb1178..86d55ef9c5 100644 --- a/node_modules/uuid/dist/esm/parse.d.ts +++ b/node_modules/uuid/dist/esm/parse.d.ts @@ -1,2 +1,2 @@ -declare function parse(uuid: string): Uint8Array; +declare function parse(uuid: string): Uint8Array; export default parse; diff --git a/node_modules/uuid/dist/esm/rng.d.ts b/node_modules/uuid/dist/esm/rng.d.ts index 73e60cf348..1fbb163599 100644 --- a/node_modules/uuid/dist/esm/rng.d.ts +++ b/node_modules/uuid/dist/esm/rng.d.ts @@ -1 +1 @@ -export default function rng(): Uint8Array; +export default function rng(): Uint8Array; diff --git a/node_modules/uuid/dist/esm/sha1.d.ts b/node_modules/uuid/dist/esm/sha1.d.ts index c37bda8e9f..8e272a55be 100644 --- a/node_modules/uuid/dist/esm/sha1.d.ts +++ b/node_modules/uuid/dist/esm/sha1.d.ts @@ -1,2 +1,2 @@ -declare function sha1(bytes: Uint8Array): Buffer; +declare function sha1(bytes: Uint8Array): Buffer; export default sha1; diff --git a/node_modules/uuid/dist/esm/test/parse.test.d.ts b/node_modules/uuid/dist/esm/test/parse.test.d.ts deleted file mode 100644 index cb0ff5c3b5..0000000000 --- a/node_modules/uuid/dist/esm/test/parse.test.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/node_modules/uuid/dist/esm/test/parse.test.js b/node_modules/uuid/dist/esm/test/parse.test.js deleted file mode 100644 index e5081d2cf4..0000000000 --- a/node_modules/uuid/dist/esm/test/parse.test.js +++ /dev/null @@ -1,48 +0,0 @@ -import * as assert from 'assert'; -import test, { describe } from 'node:test'; -import parse from '../parse.js'; -import stringify from '../stringify.js'; -import uuidv4 from '../v4.js'; -function splitmix32(a) { - return function () { - a |= 0; - a = (a + 0x9e3779b9) | 0; - let t = a ^ (a >>> 16); - t = Math.imul(t, 0x21f0aaad); - t = t ^ (t >>> 15); - t = Math.imul(t, 0x735a2d97); - return ((t = t ^ (t >>> 15)) >>> 0) / 4294967296; - }; -} -const rand = splitmix32(0x12345678); -function rng(bytes = new Uint8Array(16)) { - for (let i = 0; i < 16; i++) { - bytes[i] = rand() * 256; - } - return bytes; -} -describe('parse', () => { - test('String -> bytes parsing', () => { - assert.deepStrictEqual(parse('0f5abcd1-c194-47f3-905b-2df7263a084b'), Uint8Array.from([ - 0x0f, 0x5a, 0xbc, 0xd1, 0xc1, 0x94, 0x47, 0xf3, 0x90, 0x5b, 0x2d, 0xf7, 0x26, 0x3a, 0x08, - 0x4b, - ])); - }); - test('String -> bytes -> string symmetry for assorted uuids', () => { - for (let i = 0; i < 1000; i++) { - const uuid = uuidv4({ rng }); - assert.equal(stringify(parse(uuid)), uuid); - } - }); - test('Case neutrality', () => { - assert.deepStrictEqual(parse('0f5abcd1-c194-47f3-905b-2df7263a084b'), parse('0f5abcd1-c194-47f3-905b-2df7263a084b'.toUpperCase())); - }); - test('Null UUID case', () => { - assert.deepStrictEqual(parse('00000000-0000-0000-0000-000000000000'), Uint8Array.from(new Array(16).fill(0))); - }); - test('UUID validation', () => { - assert.throws(() => parse()); - assert.throws(() => parse('invalid uuid')); - assert.throws(() => parse('zyxwvuts-rqpo-nmlk-jihg-fedcba000000')); - }); -}); diff --git a/node_modules/uuid/dist/esm/test/rng.test.d.ts b/node_modules/uuid/dist/esm/test/rng.test.d.ts deleted file mode 100644 index cb0ff5c3b5..0000000000 --- a/node_modules/uuid/dist/esm/test/rng.test.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/node_modules/uuid/dist/esm/test/rng.test.js b/node_modules/uuid/dist/esm/test/rng.test.js deleted file mode 100644 index e6c1e789b1..0000000000 --- a/node_modules/uuid/dist/esm/test/rng.test.js +++ /dev/null @@ -1,12 +0,0 @@ -import * as assert from 'assert'; -import test, { describe } from 'node:test'; -import rng from '../rng.js'; -describe('rng', () => { - test('Node.js RNG', () => { - const bytes = rng(); - assert.equal(bytes.length, 16); - for (let i = 0; i < bytes.length; ++i) { - assert.equal(typeof bytes[i], 'number'); - } - }); -}); diff --git a/node_modules/uuid/dist/esm/test/stringify.test.d.ts b/node_modules/uuid/dist/esm/test/stringify.test.d.ts deleted file mode 100644 index cb0ff5c3b5..0000000000 --- a/node_modules/uuid/dist/esm/test/stringify.test.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/node_modules/uuid/dist/esm/test/stringify.test.js b/node_modules/uuid/dist/esm/test/stringify.test.js deleted file mode 100644 index 10fca3a5f5..0000000000 --- a/node_modules/uuid/dist/esm/test/stringify.test.js +++ /dev/null @@ -1,21 +0,0 @@ -import * as assert from 'assert'; -import test, { describe } from 'node:test'; -import stringify, { unsafeStringify } from '../stringify.js'; -const BYTES = Uint8Array.of(0x0f, 0x5a, 0xbc, 0xd1, 0xc1, 0x94, 0x47, 0xf3, 0x90, 0x5b, 0x2d, 0xf7, 0x26, 0x3a, 0x08, 0x4b); -describe('stringify', () => { - test('Stringify Array (unsafe)', () => { - assert.equal(unsafeStringify(BYTES), '0f5abcd1-c194-47f3-905b-2df7263a084b'); - }); - test('Stringify w/ offset (unsafe)', () => { - const bytes = new Uint8Array(19).fill(0); - bytes.set(BYTES, 3); - assert.equal(unsafeStringify(bytes, 3), '0f5abcd1-c194-47f3-905b-2df7263a084b'); - }); - test('Stringify Array (safe)', () => { - assert.equal(stringify(BYTES), '0f5abcd1-c194-47f3-905b-2df7263a084b'); - }); - test('Throws on not enough values (safe)', () => { - const bytes = BYTES.slice(0, 15); - assert.throws(() => stringify(bytes)); - }); -}); diff --git a/node_modules/uuid/dist/esm/test/test_constants.d.ts b/node_modules/uuid/dist/esm/test/test_constants.d.ts deleted file mode 100644 index 959a679fd0..0000000000 --- a/node_modules/uuid/dist/esm/test/test_constants.d.ts +++ /dev/null @@ -1,33 +0,0 @@ -export declare const TESTS: ({ - value: string; - expectedValidate: boolean; - expectedVersion: number; -} | { - value: string; - expectedValidate: boolean; - expectedVersion?: undefined; -} | { - value: undefined; - expectedValidate: boolean; - expectedVersion?: undefined; -} | { - value: null; - expectedValidate: boolean; - expectedVersion?: undefined; -} | { - value: number; - expectedValidate: boolean; - expectedVersion?: undefined; -} | { - value: RegExp; - expectedValidate: boolean; - expectedVersion?: undefined; -} | { - value: Date; - expectedValidate: boolean; - expectedVersion?: undefined; -} | { - value: boolean; - expectedValidate: boolean; - expectedVersion?: undefined; -})[]; diff --git a/node_modules/uuid/dist/esm/test/test_constants.js b/node_modules/uuid/dist/esm/test/test_constants.js deleted file mode 100644 index ec77a2e1cf..0000000000 --- a/node_modules/uuid/dist/esm/test/test_constants.js +++ /dev/null @@ -1,88 +0,0 @@ -import MAX from '../max.js'; -import NIL from '../nil.js'; -export const TESTS = [ - { value: NIL, expectedValidate: true, expectedVersion: 0 }, - { value: MAX, expectedValidate: true, expectedVersion: 15 }, - { value: '00000000-0000-1000-8000-000000000000', expectedValidate: true, expectedVersion: 1 }, - { value: 'ffffffff-ffff-1fff-8fff-ffffffffffff', expectedValidate: true, expectedVersion: 1 }, - { value: '00000000-0000-2000-8000-000000000000', expectedValidate: true, expectedVersion: 2 }, - { value: 'ffffffff-ffff-2fff-bfff-ffffffffffff', expectedValidate: true, expectedVersion: 2 }, - { value: '00000000-0000-3000-8000-000000000000', expectedValidate: true, expectedVersion: 3 }, - { value: 'ffffffff-ffff-3fff-bfff-ffffffffffff', expectedValidate: true, expectedVersion: 3 }, - { value: '00000000-0000-4000-8000-000000000000', expectedValidate: true, expectedVersion: 4 }, - { value: 'ffffffff-ffff-4fff-bfff-ffffffffffff', expectedValidate: true, expectedVersion: 4 }, - { value: '00000000-0000-5000-8000-000000000000', expectedValidate: true, expectedVersion: 5 }, - { value: 'ffffffff-ffff-5fff-bfff-ffffffffffff', expectedValidate: true, expectedVersion: 5 }, - { value: '00000000-0000-6000-8000-000000000000', expectedValidate: true, expectedVersion: 6 }, - { value: 'ffffffff-ffff-6fff-bfff-ffffffffffff', expectedValidate: true, expectedVersion: 6 }, - { value: '00000000-0000-7000-8000-000000000000', expectedValidate: true, expectedVersion: 7 }, - { value: 'ffffffff-ffff-7fff-bfff-ffffffffffff', expectedValidate: true, expectedVersion: 7 }, - { value: '00000000-0000-8000-8000-000000000000', expectedValidate: true, expectedVersion: 8 }, - { value: 'ffffffff-ffff-8fff-bfff-ffffffffffff', expectedValidate: true, expectedVersion: 8 }, - { value: '00000000-0000-9000-8000-000000000000', expectedValidate: false }, - { value: 'ffffffff-ffff-9fff-bfff-ffffffffffff', expectedValidate: false }, - { value: '00000000-0000-a000-8000-000000000000', expectedValidate: false }, - { value: 'ffffffff-ffff-afff-bfff-ffffffffffff', expectedValidate: false }, - { value: '00000000-0000-b000-8000-000000000000', expectedValidate: false }, - { value: 'ffffffff-ffff-bfff-bfff-ffffffffffff', expectedValidate: false }, - { value: '00000000-0000-c000-8000-000000000000', expectedValidate: false }, - { value: 'ffffffff-ffff-cfff-bfff-ffffffffffff', expectedValidate: false }, - { value: '00000000-0000-d000-8000-000000000000', expectedValidate: false }, - { value: 'ffffffff-ffff-dfff-bfff-ffffffffffff', expectedValidate: false }, - { value: '00000000-0000-e000-8000-000000000000', expectedValidate: false }, - { value: 'ffffffff-ffff-efff-bfff-ffffffffffff', expectedValidate: false }, - { value: 'd9428888-122b-11e1-b85c-61cd3cbb3210', expectedValidate: true, expectedVersion: 1 }, - { value: '000003e8-2363-21ef-b200-325096b39f47', expectedValidate: true, expectedVersion: 2 }, - { value: 'a981a0c2-68b1-35dc-bcfc-296e52ab01ec', expectedValidate: true, expectedVersion: 3 }, - { value: '109156be-c4fb-41ea-b1b4-efe1671c5836', expectedValidate: true, expectedVersion: 4 }, - { value: '90123e1c-7512-523e-bb28-76fab9f2f73d', expectedValidate: true, expectedVersion: 5 }, - { value: '1ef21d2f-1207-6660-8c4f-419efbd44d48', expectedValidate: true, expectedVersion: 6 }, - { value: '017f22e2-79b0-7cc3-98c4-dc0c0c07398f', expectedValidate: true, expectedVersion: 7 }, - { value: '0d8f23a0-697f-83ae-802e-48f3756dd581', expectedValidate: true, expectedVersion: 8 }, - { value: '00000000-0000-1000-0000-000000000000', expectedValidate: false }, - { value: '00000000-0000-1000-1000-000000000000', expectedValidate: false }, - { value: '00000000-0000-1000-2000-000000000000', expectedValidate: false }, - { value: '00000000-0000-1000-3000-000000000000', expectedValidate: false }, - { value: '00000000-0000-1000-4000-000000000000', expectedValidate: false }, - { value: '00000000-0000-1000-5000-000000000000', expectedValidate: false }, - { value: '00000000-0000-1000-6000-000000000000', expectedValidate: false }, - { value: '00000000-0000-1000-7000-000000000000', expectedValidate: false }, - { value: '00000000-0000-1000-8000-000000000000', expectedValidate: true, expectedVersion: 1 }, - { value: '00000000-0000-1000-9000-000000000000', expectedValidate: true, expectedVersion: 1 }, - { value: '00000000-0000-1000-a000-000000000000', expectedValidate: true, expectedVersion: 1 }, - { value: '00000000-0000-1000-b000-000000000000', expectedValidate: true, expectedVersion: 1 }, - { value: '00000000-0000-1000-c000-000000000000', expectedValidate: false }, - { value: '00000000-0000-1000-d000-000000000000', expectedValidate: false }, - { value: '00000000-0000-1000-e000-000000000000', expectedValidate: false }, - { value: '00000000-0000-1000-f000-000000000000', expectedValidate: false }, - { value: '00000000000000000000000000000000', expectedValidate: false }, - { value: '', expectedValidate: false }, - { value: 'invalid uuid string', expectedValidate: false }, - { - value: '=Y00a-f*vb*-c-d#-p00f\b-g0h-#i^-j*3&-L00k-\nl---00n-fg000-00p-00r+', - expectedValidate: false, - }, - { value: undefined, expectedValidate: false }, - { value: null, expectedValidate: false }, - { value: 123, expectedValidate: false }, - { value: /regex/, expectedValidate: false }, - { value: new Date(0), expectedValidate: false }, - { value: false, expectedValidate: false }, -]; -for (let charIndex = 0; charIndex < 36; charIndex++) { - if (charIndex === 8 || - charIndex === 13 || - charIndex === 14 || - charIndex === 18 || - charIndex === 23) { - continue; - } - const nilChars = NIL.split(''); - const maxChars = MAX.split(''); - for (let i = 0; i < 4; i++) { - nilChars[charIndex] = (0x0 ^ (1 << i)).toString(16); - TESTS.push({ value: nilChars.join(''), expectedValidate: false }); - maxChars[charIndex] = (0xf ^ (1 << i)).toString(16); - TESTS.push({ value: maxChars.join(''), expectedValidate: false }); - } -} diff --git a/node_modules/uuid/dist/esm/test/v1.test.d.ts b/node_modules/uuid/dist/esm/test/v1.test.d.ts deleted file mode 100644 index cb0ff5c3b5..0000000000 --- a/node_modules/uuid/dist/esm/test/v1.test.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/node_modules/uuid/dist/esm/test/v1.test.js b/node_modules/uuid/dist/esm/test/v1.test.js deleted file mode 100644 index 91e1783bff..0000000000 --- a/node_modules/uuid/dist/esm/test/v1.test.js +++ /dev/null @@ -1,125 +0,0 @@ -import * as assert from 'assert'; -import test, { describe } from 'node:test'; -import parse from '../parse.js'; -import v1, { updateV1State } from '../v1.js'; -const TIME = 1321644961388; -const RFC_V1 = 'c232ab00-9414-11ec-b3c8-9f68deced846'; -const RFC_V1_BYTES = parse(RFC_V1); -const RFC_OPTIONS = { - msecs: 0x17f22e279b0, - nsecs: 0, - clockseq: 0x33c8, - node: Uint8Array.of(0x9f, 0x68, 0xde, 0xce, 0xd8, 0x46), -}; -const RFC_RANDOM = Uint8Array.of(0, 0, 0, 0, 0, 0, 0, 0, RFC_OPTIONS.clockseq >> 8, RFC_OPTIONS.clockseq & 0xff, ...RFC_OPTIONS.node); -function compareV1TimeField(a, b) { - a = a.split('-').slice(0, 3).reverse().join(''); - b = b.split('-').slice(0, 3).reverse().join(''); - return a < b ? -1 : a > b ? 1 : 0; -} -describe('v1', () => { - test('v1 sort order (default)', () => { - const ids = [v1(), v1(), v1(), v1(), v1()]; - const sorted = [...ids].sort(compareV1TimeField); - assert.deepEqual(ids, sorted); - }); - test('v1 sort order (time option)', () => { - const ids = [ - v1({ msecs: TIME - 10 * 3600 * 1000 }), - v1({ msecs: TIME - 1 }), - v1({ msecs: TIME }), - v1({ msecs: TIME + 1 }), - v1({ msecs: TIME + 28 * 24 * 3600 * 1000 }), - ]; - const sorted = [...ids].sort(compareV1TimeField); - assert.deepEqual(ids, sorted); - }); - test('v1(options)', () => { - assert.equal(v1({ msecs: RFC_OPTIONS.msecs, random: RFC_RANDOM }), RFC_V1, 'minimal options'); - assert.equal(v1(RFC_OPTIONS), RFC_V1, 'full options'); - }); - test('v1(options) equality', () => { - assert.notEqual(v1({ msecs: TIME }), v1({ msecs: TIME }), 'UUIDs with minimal options differ'); - assert.equal(v1(RFC_OPTIONS), v1(RFC_OPTIONS), 'UUIDs with full options are identical'); - }); - test('fills one UUID into a buffer as expected', () => { - const buffer = new Uint8Array(16); - const result = v1(RFC_OPTIONS, buffer); - assert.deepEqual(buffer, RFC_V1_BYTES); - assert.strictEqual(buffer, result); - }); - test('fills two UUIDs into a buffer as expected', () => { - const buffer = new Uint8Array(32); - v1(RFC_OPTIONS, buffer, 0); - v1(RFC_OPTIONS, buffer, 16); - const expectedBuf = new Uint8Array(32); - expectedBuf.set(RFC_V1_BYTES); - expectedBuf.set(RFC_V1_BYTES, 16); - assert.deepEqual(buffer, expectedBuf); - }); - test('v1() state transitions', () => { - const PRE_STATE = { - msecs: 10, - nsecs: 20, - clockseq: 0x1234, - node: Uint8Array.of(0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc), - }; - const tests = [ - { - title: 'initial state', - state: {}, - now: 10, - expected: { - msecs: 10, - nsecs: 0, - clockseq: RFC_OPTIONS.clockseq, - node: RFC_OPTIONS.node, - }, - }, - { - title: 'same time interval', - state: { ...PRE_STATE }, - now: PRE_STATE.msecs, - expected: { - ...PRE_STATE, - nsecs: 21, - }, - }, - { - title: 'new time interval', - state: { ...PRE_STATE }, - now: PRE_STATE.msecs + 1, - expected: { - ...PRE_STATE, - msecs: PRE_STATE.msecs + 1, - nsecs: 0, - }, - }, - { - title: 'same time interval (nsecs overflow)', - state: { ...PRE_STATE, nsecs: 9999 }, - now: PRE_STATE.msecs, - expected: { - ...PRE_STATE, - nsecs: 0, - clockseq: RFC_OPTIONS.clockseq, - node: RFC_OPTIONS.node, - }, - }, - { - title: 'time regression', - state: { ...PRE_STATE }, - now: PRE_STATE.msecs - 1, - expected: { - ...PRE_STATE, - msecs: PRE_STATE.msecs - 1, - clockseq: RFC_OPTIONS.clockseq, - node: RFC_OPTIONS.node, - }, - }, - ]; - for (const { title, state, now, expected } of tests) { - assert.deepStrictEqual(updateV1State(state, now, RFC_RANDOM), expected, `Failed: ${title}`); - } - }); -}); diff --git a/node_modules/uuid/dist/esm/test/v35.test.d.ts b/node_modules/uuid/dist/esm/test/v35.test.d.ts deleted file mode 100644 index cb0ff5c3b5..0000000000 --- a/node_modules/uuid/dist/esm/test/v35.test.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/node_modules/uuid/dist/esm/test/v35.test.js b/node_modules/uuid/dist/esm/test/v35.test.js deleted file mode 100644 index 35d38d26e8..0000000000 --- a/node_modules/uuid/dist/esm/test/v35.test.js +++ /dev/null @@ -1,141 +0,0 @@ -import * as assert from 'assert'; -import test, { describe } from 'node:test'; -import md5 from '../md5.js'; -import sha1 from '../sha1.js'; -import v3 from '../v3.js'; -import { stringToBytes } from '../v35.js'; -import v5 from '../v5.js'; -describe('v35', () => { - const HASH_SAMPLES = [ - { - input: stringToBytes(''), - sha1: 'da39a3ee5e6b4b0d3255bfef95601890afd80709', - md5: 'd41d8cd98f00b204e9800998ecf8427e', - }, - { - input: stringToBytes('\t\b\f !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\u00A1\u00A2\u00A3\u00A4\u00A5\u00A6\u00A7\u00A8\u00A9\u00AA\u00AB\u00AC\u00AE\u00AF\u00B0\u00B1\u00B2\u00B3\u00B4\u00B5\u00B6\u00B7\u00B8\u00B9\u00BA\u00BB\u00BC\u00BD\u00BE\u00BF\u00C0\u00C1\u00C2\u00C3\u00C4\u00C5\u00C6\u00C7\u00C8\u00C9\u00CA\u00CB\u00CC\u00CD\u00CE\u00CF\u00D0\u00D1\u00D2\u00D3\u00D4\u00D5\u00D6\u00D7\u00D8\u00D9\u00DA\u00DB\u00DC\u00DD\u00DE\u00DF\u00E0\u00E1\u00E2\u00E3\u00E4\u00E5\u00E6\u00E7\u00E8\u00E9\u00EA\u00EB\u00EC\u00ED\u00EE\u00EF\u00F0\u00F1\u00F2\u00F3\u00F4\u00F5\u00F6\u00F7\u00F8\u00F9\u00FA\u00FB\u00FC\u00FD\u00FE\u00FF'), - sha1: 'ca4a426a3d536f14cfd79011e79e10d64de950a0', - md5: 'e8098ec21950f841731d28749129d3ee', - }, - { - input: stringToBytes('\u00A5\u0104\u018F\u0256\u02B1o\u0315\u038E\u0409\u0500\u0531\u05E1\u05B6\u0920\u0903\u09A4\u0983\u0A20\u0A02\u0AA0\u0A83\u0B06\u0C05\u0C03\u1401\u16A0'), - sha1: 'f2753ebc390e5f637e333c2a4179644a93ae9f65', - md5: '231b309e277b6be8bb3d6c688b7f098b', - }, - ]; - function hashToHex(hash) { - const chars = new Array(hash.length); - for (let i = 0; i < hash.length; i++) { - chars[i] = hash[i].toString(16).padStart(2, '0'); - } - return chars.join(''); - } - HASH_SAMPLES.forEach(function (sample, i) { - test(`sha1(node) HASH_SAMPLES[${i}]`, () => { - assert.equal(hashToHex(sha1(sample.input)), sample.sha1); - }); - }); - HASH_SAMPLES.forEach(function (sample, i) { - test(`md5(node) HASH_SAMPLES[${i}]`, () => { - assert.equal(hashToHex(md5(sample.input)), sample.md5); - }); - }); - test('v3', () => { - assert.strictEqual(v3('hello.example.com', v3.DNS), '9125a8dc-52ee-365b-a5aa-81b0b3681cf6'); - assert.strictEqual(v3('http://example.com/hello', v3.URL), 'c6235813-3ba4-3801-ae84-e0a6ebb7d138'); - assert.strictEqual(v3('hello', '0f5abcd1-c194-47f3-905b-2df7263a084b'), 'a981a0c2-68b1-35dc-bcfc-296e52ab01ec'); - }); - test('v3 namespace.toUpperCase', () => { - assert.strictEqual(v3('hello.example.com', v3.DNS.toUpperCase()), '9125a8dc-52ee-365b-a5aa-81b0b3681cf6'); - assert.strictEqual(v3('http://example.com/hello', v3.URL.toUpperCase()), 'c6235813-3ba4-3801-ae84-e0a6ebb7d138'); - assert.strictEqual(v3('hello', '0f5abcd1-c194-47f3-905b-2df7263a084b'.toUpperCase()), 'a981a0c2-68b1-35dc-bcfc-296e52ab01ec'); - }); - test('v3 namespace string validation', () => { - assert.throws(() => { - v3('hello.example.com', 'zyxwvuts-rqpo-nmlk-jihg-fedcba000000'); - }); - assert.throws(() => { - v3('hello.example.com', 'invalid uuid value'); - }); - assert.ok(v3('hello.example.com', '00000000-0000-0000-0000-000000000000')); - }); - test('v3 namespace buffer validation', () => { - assert.throws(() => { - v3('hello.example.com', new Uint8Array(15)); - }); - assert.throws(() => { - v3('hello.example.com', new Uint8Array(17)); - }); - assert.ok(v3('hello.example.com', new Uint8Array(16).fill(0))); - }); - test('v3 fill buffer', () => { - let buf = new Uint8Array(16); - const expectedUuid = Uint8Array.of(0x91, 0x25, 0xa8, 0xdc, 0x52, 0xee, 0x36, 0x5b, 0xa5, 0xaa, 0x81, 0xb0, 0xb3, 0x68, 0x1c, 0xf6); - const result = v3('hello.example.com', v3.DNS, buf); - assert.deepEqual(buf, expectedUuid); - assert.strictEqual(result, buf); - buf = new Uint8Array(19).fill(0xaa); - const expectedBuf = new Uint8Array(19).fill(0xaa); - expectedBuf.set(expectedUuid, 3); - v3('hello.example.com', v3.DNS, buf, 3); - assert.deepEqual(buf, expectedBuf); - }); - test('v3 undefined/null', () => { - assert.throws(() => v3()); - assert.throws(() => v3('hello')); - assert.throws(() => v3('hello.example.com', undefined)); - assert.throws(() => v3('hello.example.com', null, new Uint8Array(16))); - }); - test('v5', () => { - assert.strictEqual(v5('hello.example.com', v5.DNS), 'fdda765f-fc57-5604-a269-52a7df8164ec'); - assert.strictEqual(v5('http://example.com/hello', v5.URL), '3bbcee75-cecc-5b56-8031-b6641c1ed1f1'); - assert.strictEqual(v5('hello', '0f5abcd1-c194-47f3-905b-2df7263a084b'), '90123e1c-7512-523e-bb28-76fab9f2f73d'); - }); - test('v5 namespace.toUpperCase', () => { - assert.strictEqual(v5('hello.example.com', v5.DNS.toUpperCase()), 'fdda765f-fc57-5604-a269-52a7df8164ec'); - assert.strictEqual(v5('http://example.com/hello', v5.URL.toUpperCase()), '3bbcee75-cecc-5b56-8031-b6641c1ed1f1'); - assert.strictEqual(v5('hello', '0f5abcd1-c194-47f3-905b-2df7263a084b'.toUpperCase()), '90123e1c-7512-523e-bb28-76fab9f2f73d'); - }); - test('v5 namespace string validation', () => { - assert.throws(() => { - v5('hello.example.com', 'zyxwvuts-rqpo-nmlk-jihg-fedcba000000'); - }); - assert.throws(() => { - v5('hello.example.com', 'invalid uuid value'); - }); - assert.ok(v5('hello.example.com', '00000000-0000-0000-0000-000000000000')); - }); - test('v5 namespace buffer validation', () => { - assert.throws(() => { - v5('hello.example.com', new Uint8Array(15)); - }); - assert.throws(() => { - v5('hello.example.com', new Uint8Array(17)); - }); - assert.ok(v5('hello.example.com', new Uint8Array(16).fill(0))); - }); - test('v5 fill buffer', () => { - let buf = new Uint8Array(16); - const expectedUuid = Uint8Array.of(0xfd, 0xda, 0x76, 0x5f, 0xfc, 0x57, 0x56, 0x04, 0xa2, 0x69, 0x52, 0xa7, 0xdf, 0x81, 0x64, 0xec); - const result = v5('hello.example.com', v5.DNS, buf); - assert.deepEqual(buf, expectedUuid); - assert.strictEqual(result, buf); - buf = new Uint8Array(19).fill(0xaa); - const expectedBuf = new Uint8Array(19).fill(0xaa); - expectedBuf.set(expectedUuid, 3); - v5('hello.example.com', v5.DNS, buf, 3); - assert.deepEqual(buf, expectedBuf); - }); - test('v5 undefined/null', () => { - assert.throws(() => v5()); - assert.throws(() => v5('hello')); - assert.throws(() => v5('hello.example.com', undefined)); - assert.throws(() => v5('hello.example.com', null, new Uint8Array(16))); - }); - test('v3/v5 constants', () => { - assert.strictEqual(v3.DNS, '6ba7b810-9dad-11d1-80b4-00c04fd430c8'); - assert.strictEqual(v3.URL, '6ba7b811-9dad-11d1-80b4-00c04fd430c8'); - assert.strictEqual(v5.DNS, '6ba7b810-9dad-11d1-80b4-00c04fd430c8'); - assert.strictEqual(v5.URL, '6ba7b811-9dad-11d1-80b4-00c04fd430c8'); - }); -}); diff --git a/node_modules/uuid/dist/esm/test/v4.test.d.ts b/node_modules/uuid/dist/esm/test/v4.test.d.ts deleted file mode 100644 index cb0ff5c3b5..0000000000 --- a/node_modules/uuid/dist/esm/test/v4.test.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/node_modules/uuid/dist/esm/test/v4.test.js b/node_modules/uuid/dist/esm/test/v4.test.js deleted file mode 100644 index 92c9ce2d58..0000000000 --- a/node_modules/uuid/dist/esm/test/v4.test.js +++ /dev/null @@ -1,58 +0,0 @@ -import * as assert from 'assert'; -import test, { describe } from 'node:test'; -import native from '../native.js'; -import v4 from '../v4.js'; -const randomBytesFixture = Uint8Array.of(0x10, 0x91, 0x56, 0xbe, 0xc4, 0xfb, 0xc1, 0xea, 0x71, 0xb4, 0xef, 0xe1, 0x67, 0x1c, 0x58, 0x36); -const expectedBytes = Uint8Array.of(16, 145, 86, 190, 196, 251, 65, 234, 177, 180, 239, 225, 103, 28, 88, 54); -describe('v4', () => { - test('subsequent UUIDs are different', () => { - const id1 = v4(); - const id2 = v4(); - assert.ok(id1 !== id2); - }); - test('should uses native randomUUID() if no option is passed', async () => { - const mock = (await import('node:test')).default.mock; - if (!mock) { - return; - } - const mockRandomUUID = mock.method(native, 'randomUUID'); - assert.equal(mockRandomUUID.mock.callCount(), 0); - v4(); - assert.equal(mockRandomUUID.mock.callCount(), 1); - mock.restoreAll(); - }); - test('should not use native randomUUID() if an option is passed', async () => { - const mock = (await import('node:test')).default.mock; - if (!mock) { - return; - } - const mockRandomUUID = mock.method(native, 'randomUUID'); - assert.equal(mockRandomUUID.mock.callCount(), 0); - v4({}); - assert.equal(mockRandomUUID.mock.callCount(), 0); - mock.restoreAll(); - }); - test('explicit options.random produces expected result', () => { - const id = v4({ random: randomBytesFixture }); - assert.strictEqual(id, '109156be-c4fb-41ea-b1b4-efe1671c5836'); - }); - test('explicit options.rng produces expected result', () => { - const id = v4({ rng: () => randomBytesFixture }); - assert.strictEqual(id, '109156be-c4fb-41ea-b1b4-efe1671c5836'); - }); - test('fills one UUID into a buffer as expected', () => { - const buffer = new Uint8Array(16); - const result = v4({ random: randomBytesFixture }, buffer); - assert.deepEqual(buffer, expectedBytes); - assert.strictEqual(buffer, result); - }); - test('fills two UUIDs into a buffer as expected', () => { - const buffer = new Uint8Array(32); - v4({ random: randomBytesFixture }, buffer, 0); - v4({ random: randomBytesFixture }, buffer, 16); - const expectedBuf = new Uint8Array(32); - expectedBuf.set(expectedBytes); - expectedBuf.set(expectedBytes, 16); - assert.deepEqual(buffer, expectedBuf); - }); -}); diff --git a/node_modules/uuid/dist/esm/test/v6.test.d.ts b/node_modules/uuid/dist/esm/test/v6.test.d.ts deleted file mode 100644 index cb0ff5c3b5..0000000000 --- a/node_modules/uuid/dist/esm/test/v6.test.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/node_modules/uuid/dist/esm/test/v6.test.js b/node_modules/uuid/dist/esm/test/v6.test.js deleted file mode 100644 index 46cb865cc6..0000000000 --- a/node_modules/uuid/dist/esm/test/v6.test.js +++ /dev/null @@ -1,54 +0,0 @@ -import * as assert from 'assert'; -import test, { describe } from 'node:test'; -import v1ToV6 from '../v1ToV6.js'; -import v6 from '../v6.js'; -import v6ToV1 from '../v6ToV1.js'; -describe('v6', () => { - const V1_ID = 'f1207660-21d2-11ef-8c4f-419efbd44d48'; - const V6_ID = '1ef21d2f-1207-6660-8c4f-419efbd44d48'; - const fullOptions = { - msecs: 0x133b891f705, - nsecs: 0x1538, - clockseq: 0x385c, - node: Uint8Array.of(0x61, 0xcd, 0x3c, 0xbb, 0x32, 0x10), - }; - const EXPECTED_BYTES = Uint8Array.of(0x1e, 0x11, 0x22, 0xbd, 0x94, 0x28, 0x68, 0x88, 0xb8, 0x5c, 0x61, 0xcd, 0x3c, 0xbb, 0x32, 0x10); - test('default behavior', () => { - const id = v6(); - assert.ok(/[0-9a-f]{8}-[0-9a-f]{4}-6[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}/.test(id), 'id is valid v6 UUID'); - }); - test('default behavior (binary type)', () => { - const buffer = new Uint8Array(16); - const result = v6(fullOptions, buffer); - assert.deepEqual(buffer, EXPECTED_BYTES); - assert.strictEqual(buffer, result); - }); - test('all options', () => { - const id = v6(fullOptions); - assert.equal(id, '1e1122bd-9428-6888-b85c-61cd3cbb3210'); - }); - test('sort by creation time', () => { - const ids = []; - for (let i = 0; i < 5; i++) { - ids.push(v6({ msecs: i * 1000 })); - } - assert.deepEqual(ids, ids.slice().sort()); - }); - test('creating at array offset', () => { - const buffer = new Uint8Array(32); - v6(fullOptions, buffer, 0); - v6(fullOptions, buffer, 16); - const expectedBuf = new Uint8Array(32); - expectedBuf.set(EXPECTED_BYTES, 0); - expectedBuf.set(EXPECTED_BYTES, 16); - assert.deepEqual(buffer, expectedBuf); - }); - test('v1 -> v6 conversion', () => { - const id = v1ToV6(V1_ID); - assert.equal(id, V6_ID); - }); - test('v6 -> v1 conversion', () => { - const id = v6ToV1(V6_ID); - assert.equal(id, V1_ID); - }); -}); diff --git a/node_modules/uuid/dist/esm/test/v7.test.d.ts b/node_modules/uuid/dist/esm/test/v7.test.d.ts deleted file mode 100644 index cb0ff5c3b5..0000000000 --- a/node_modules/uuid/dist/esm/test/v7.test.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/node_modules/uuid/dist/esm/test/v7.test.js b/node_modules/uuid/dist/esm/test/v7.test.js deleted file mode 100644 index 69356c8660..0000000000 --- a/node_modules/uuid/dist/esm/test/v7.test.js +++ /dev/null @@ -1,192 +0,0 @@ -import * as assert from 'assert'; -import test, { describe } from 'node:test'; -import parse from '../parse.js'; -import stringify from '../stringify.js'; -import v7, { updateV7State } from '../v7.js'; -const RFC_V7 = '017f22e2-79b0-7cc3-98c4-dc0c0c07398f'; -const RFC_V7_BYTES = parse('017f22e2-79b0-7cc3-98c4-dc0c0c07398f'); -const RFC_MSECS = 0x17f22e279b0; -const RFC_SEQ = (0x0cc3 << 20) | (0x98c4dc >> 2); -const RFC_RANDOM = Uint8Array.of(0x10, 0x91, 0x56, 0xbe, 0xc4, 0xfb, 0x0c, 0xc3, 0x18, 0xc4, 0x6c, 0x0c, 0x0c, 0x07, 0x39, 0x8f); -describe('v7', () => { - test('subsequent UUIDs are different', () => { - const id1 = v7(); - const id2 = v7(); - assert.ok(id1 !== id2); - }); - test('explicit options.random and options.msecs produces expected result', () => { - const id = v7({ - random: RFC_RANDOM, - msecs: RFC_MSECS, - seq: RFC_SEQ, - }); - assert.strictEqual(id, RFC_V7); - }); - test('explicit options.rng produces expected result', () => { - const id = v7({ - rng: () => RFC_RANDOM, - msecs: RFC_MSECS, - seq: RFC_SEQ, - }); - assert.strictEqual(id, RFC_V7); - }); - test('explicit options.msecs produces expected result', () => { - const id = v7({ - msecs: RFC_MSECS, - }); - assert.strictEqual(id.indexOf('017f22e2'), 0); - }); - test('fills one UUID into a buffer as expected', () => { - const buffer = new Uint8Array(16); - const result = v7({ - random: RFC_RANDOM, - msecs: RFC_MSECS, - seq: RFC_SEQ, - }, buffer); - stringify(buffer); - assert.deepEqual(buffer, RFC_V7_BYTES); - assert.strictEqual(buffer, result); - }); - test('fills two UUIDs into a buffer as expected', () => { - const buffer = new Uint8Array(32); - v7({ - random: RFC_RANDOM, - msecs: RFC_MSECS, - seq: RFC_SEQ, - }, buffer, 0); - v7({ - random: RFC_RANDOM, - msecs: RFC_MSECS, - seq: RFC_SEQ, - }, buffer, 16); - const expected = new Uint8Array(32); - expected.set(RFC_V7_BYTES); - expected.set(RFC_V7_BYTES, 16); - assert.deepEqual(buffer, expected); - }); - test('lexicographical sorting is preserved', () => { - let id; - let prior; - let msecs = RFC_MSECS; - for (let i = 0; i < 20000; ++i) { - if (i % 1500 === 0) { - msecs += 1; - } - id = v7({ msecs, seq: i }); - if (prior !== undefined) { - assert.ok(prior < id, `${prior} < ${id}`); - } - prior = id; - } - }); - test('can supply seq', () => { - let seq = 0x12345; - let uuid = v7({ - msecs: RFC_MSECS, - seq, - }); - assert.strictEqual(uuid.substr(0, 25), '017f22e2-79b0-7000-848d-1'); - seq = 0x6fffffff; - uuid = v7({ - msecs: RFC_MSECS, - seq, - }); - assert.strictEqual(uuid.substring(0, 25), '017f22e2-79b0-76ff-bfff-f'); - }); - test('internal seq is reset upon timestamp change', () => { - v7({ - msecs: RFC_MSECS, - seq: 0x6fffffff, - }); - const uuid = v7({ - msecs: RFC_MSECS + 1, - }); - assert.ok(uuid.indexOf('fff') !== 15); - }); - test('v7() state transitions', () => { - const tests = [ - { - title: 'new time interval', - state: { msecs: 1, seq: 123 }, - now: 2, - expected: { - msecs: 2, - seq: 0x6c318c4, - }, - }, - { - title: 'same time interval', - state: { msecs: 1, seq: 123 }, - now: 1, - expected: { - msecs: 1, - seq: 124, - }, - }, - { - title: 'same time interval (sequence rollover)', - state: { msecs: 1, seq: 0xffffffff }, - now: 1, - expected: { - msecs: 2, - seq: 0, - }, - }, - { - title: 'time regression', - state: { msecs: 2, seq: 123 }, - now: 1, - expected: { - msecs: 2, - seq: 124, - }, - }, - { - title: 'time regression (sequence rollover)', - state: { msecs: 2, seq: 0xffffffff }, - now: 1, - expected: { - msecs: 3, - seq: 0, - }, - }, - ]; - for (const { title, state, now, expected } of tests) { - assert.deepStrictEqual(updateV7State(state, now, RFC_RANDOM), expected, `Failed: ${title}`); - } - }); - test('flipping bits changes the result', () => { - const asBigInt = (buf) => buf.reduce((acc, v) => (acc << 8n) | BigInt(v), 0n); - const asNumber = (bits, data) => Number(BigInt.asUintN(bits, data)); - const flip = (data, n) => data ^ (1n << BigInt(127 - n)); - const optionsFrom = (data) => { - const ms = asNumber(48, data >> 80n); - const hi = asNumber(12, data >> 64n); - const lo = asNumber(20, data >> 42n); - const r = BigInt.asUintN(42, data); - return { - msecs: ms, - seq: (hi << 20) | lo, - random: Uint8Array.from([ - ...Array(10).fill(0), - ...Array(6) - .fill(0) - .map((_, i) => asNumber(8, r >> (BigInt(i) * 8n))) - .reverse(), - ]), - }; - }; - const buf = new Uint8Array(16); - const data = asBigInt(v7({}, buf)); - const id = stringify(buf); - const reserved = [48, 49, 50, 51, 64, 65]; - for (let i = 0; i < 128; ++i) { - if (reserved.includes(i)) { - continue; - } - const flipped = flip(data, i); - assert.strictEqual(asBigInt(v7(optionsFrom(flipped), buf)).toString(16), flipped.toString(16), `Unequal uuids at bit ${i}`); - assert.notStrictEqual(stringify(buf), id); - } - }); -}); diff --git a/node_modules/uuid/dist/esm/test/validate.test.d.ts b/node_modules/uuid/dist/esm/test/validate.test.d.ts deleted file mode 100644 index cb0ff5c3b5..0000000000 --- a/node_modules/uuid/dist/esm/test/validate.test.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/node_modules/uuid/dist/esm/test/validate.test.js b/node_modules/uuid/dist/esm/test/validate.test.js deleted file mode 100644 index ac2616532b..0000000000 --- a/node_modules/uuid/dist/esm/test/validate.test.js +++ /dev/null @@ -1,11 +0,0 @@ -import * as assert from 'assert'; -import test, { describe } from 'node:test'; -import validate from '../validate.js'; -import { TESTS } from './test_constants.js'; -describe('validate()', () => { - test('TESTS cases', () => { - for (const { value, expectedValidate } of TESTS) { - assert.strictEqual(validate(value), expectedValidate, `validate(${value}) should be ${expectedValidate}`); - } - }); -}); diff --git a/node_modules/uuid/dist/esm/test/version.test.d.ts b/node_modules/uuid/dist/esm/test/version.test.d.ts deleted file mode 100644 index cb0ff5c3b5..0000000000 --- a/node_modules/uuid/dist/esm/test/version.test.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/node_modules/uuid/dist/esm/test/version.test.js b/node_modules/uuid/dist/esm/test/version.test.js deleted file mode 100644 index 424012ed37..0000000000 --- a/node_modules/uuid/dist/esm/test/version.test.js +++ /dev/null @@ -1,18 +0,0 @@ -import * as assert from 'assert'; -import test, { describe } from 'node:test'; -import version from '../version.js'; -import { TESTS } from './test_constants.js'; -describe('version()', () => { - test('TESTS cases', () => { - for (const { value, expectedValidate, expectedVersion } of TESTS) { - try { - const actualVersion = version(value); - assert.ok(expectedValidate, `version(${value}) should throw`); - assert.strictEqual(actualVersion, expectedVersion); - } - catch { - assert.ok(!expectedValidate, `version(${value}) threw unexpectedly`); - } - } - }); -}); diff --git a/node_modules/uuid/dist/esm/v1.js b/node_modules/uuid/dist/esm/v1.js index d35e0a5908..eee9b01f35 100644 --- a/node_modules/uuid/dist/esm/v1.js +++ b/node_modules/uuid/dist/esm/v1.js @@ -46,10 +46,18 @@ export function updateV1State(state, now, rnds) { return state; } function v1Bytes(rnds, msecs, nsecs, clockseq, node, buf, offset = 0) { + if (rnds.length < 16) { + throw new Error('Random bytes length must be >= 16'); + } if (!buf) { buf = new Uint8Array(16); offset = 0; } + else { + if (offset < 0 || offset + 16 > buf.length) { + throw new RangeError(`UUID byte range ${offset}:${offset + 15} is out of buffer bounds`); + } + } msecs ??= Date.now(); nsecs ??= 0; clockseq ??= ((rnds[8] << 8) | rnds[9]) & 0x3fff; diff --git a/node_modules/uuid/dist/esm/v35.d.ts b/node_modules/uuid/dist/esm/v35.d.ts index 5d1d06daef..a2c132633f 100644 --- a/node_modules/uuid/dist/esm/v35.d.ts +++ b/node_modules/uuid/dist/esm/v35.d.ts @@ -1,7 +1,7 @@ import { UUIDTypes } from './types.js'; -export declare function stringToBytes(str: string): Uint8Array; +export declare function stringToBytes(str: string): Uint8Array; export declare const DNS = "6ba7b810-9dad-11d1-80b4-00c04fd430c8"; export declare const URL = "6ba7b811-9dad-11d1-80b4-00c04fd430c8"; type HashFunction = (bytes: Uint8Array) => Uint8Array; -export default function v35(version: 0x30 | 0x50, hash: HashFunction, value: string | Uint8Array, namespace: UUIDTypes, buf?: Uint8Array, offset?: number): string | Uint8Array; +export default function v35(version: 0x30 | 0x50, hash: HashFunction, value: string | Uint8Array, namespace: UUIDTypes, buf?: Uint8Array, offset?: number): string | Uint8Array; export {}; diff --git a/node_modules/uuid/dist/esm/v4.js b/node_modules/uuid/dist/esm/v4.js index ac79ac5243..dd9067a6e3 100644 --- a/node_modules/uuid/dist/esm/v4.js +++ b/node_modules/uuid/dist/esm/v4.js @@ -6,11 +6,17 @@ function v4(options, buf, offset) { return native.randomUUID(); } options = options || {}; - const rnds = options.random || (options.rng || rng)(); + const rnds = options.random ?? options.rng?.() ?? rng(); + if (rnds.length < 16) { + throw new Error('Random bytes length must be >= 16'); + } rnds[6] = (rnds[6] & 0x0f) | 0x40; rnds[8] = (rnds[8] & 0x3f) | 0x80; if (buf) { offset = offset || 0; + if (offset < 0 || offset + 16 > buf.length) { + throw new RangeError(`UUID byte range ${offset}:${offset + 15} is out of buffer bounds`); + } for (let i = 0; i < 16; ++i) { buf[offset + i] = rnds[i]; } diff --git a/node_modules/uuid/dist/esm/v7.js b/node_modules/uuid/dist/esm/v7.js index e00e295073..482aca7b5c 100644 --- a/node_modules/uuid/dist/esm/v7.js +++ b/node_modules/uuid/dist/esm/v7.js @@ -30,10 +30,18 @@ export function updateV7State(state, now, rnds) { return state; } function v7Bytes(rnds, msecs, seq, buf, offset = 0) { + if (rnds.length < 16) { + throw new Error('Random bytes length must be >= 16'); + } if (!buf) { buf = new Uint8Array(16); offset = 0; } + else { + if (offset < 0 || offset + 16 > buf.length) { + throw new RangeError(`UUID byte range ${offset}:${offset + 15} is out of buffer bounds`); + } + } msecs ??= Date.now(); seq ??= ((rnds[6] * 0x7f) << 24) | (rnds[7] << 16) | (rnds[8] << 8) | rnds[9]; buf[offset++] = (msecs / 0x10000000000) & 0xff; diff --git a/node_modules/uuid/package.json b/node_modules/uuid/package.json index 77cd378859..a7461c0737 100644 --- a/node_modules/uuid/package.json +++ b/node_modules/uuid/package.json @@ -1,6 +1,6 @@ { "name": "uuid", - "version": "11.0.3", + "version": "11.0.4", "description": "RFC9562 UUIDs", "type": "module", "funding": [ @@ -44,35 +44,32 @@ "./dist/cjs/index.js": "./dist/cjs-browser/index.js" }, "files": [ - "CHANGELOG.md", - "CONTRIBUTING.md", - "LICENSE.md", - "README.md", - "dist" + "dist", + "!dist/**/test" ], "devDependencies": { "@babel/eslint-parser": "7.25.9", - "@commitlint/cli": "19.5.0", - "@commitlint/config-conventional": "19.5.0", - "@eslint/js": "9.13.0", + "@commitlint/cli": "19.6.1", + "@commitlint/config-conventional": "19.6.0", + "@eslint/js": "9.17.0", "@types/eslint__js": "8.42.3", "bundlewatch": "0.4.0", "commander": "12.1.0", - "eslint": "9.13.0", + "eslint": "9.17.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-prettier": "5.2.1", - "globals": "15.11.0", - "husky": "9.1.6", + "globals": "15.14.0", + "husky": "9.1.7", "jest": "29.7.0", - "lint-staged": "15.2.10", - "neostandard": "0.11.7", + "lint-staged": "15.2.11", + "neostandard": "0.12.0", "npm-run-all": "4.1.5", - "prettier": "3.3.3", - "release-please": "16.14.3", - "runmd": "1.3.9", + "prettier": "3.4.2", + "release-please": "16.15.0", + "runmd": "1.4.1", "standard-version": "9.5.0", - "typescript": "5.6.3", - "typescript-eslint": "8.11.0" + "typescript": "5.7.2", + "typescript-eslint": "8.18.2" }, "optionalDevDependencies": { "@wdio/browserstack-service": "9.2.1", @@ -130,5 +127,5 @@ "postchangelog": "prettier --write CHANGELOG.md" } }, - "packageManager": "npm@10.9.0" + "packageManager": "npm@11.0.0" } diff --git a/package-lock.json b/package-lock.json index 07c04d3b27..47ff1dc938 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39,7 +39,7 @@ "node-forge": "^1.3.1", "path": "^0.12.7", "semver": "^7.6.3", - "uuid": "^11.0.3", + "uuid": "^11.0.4", "zlib": "^1.0.5" }, "devDependencies": { @@ -56,8 +56,8 @@ "@types/node": "20.9.0", "@types/semver": "^7.5.8", "@types/sinon": "^17.0.3", - "@typescript-eslint/eslint-plugin": "^8.18.2", - "@typescript-eslint/parser": "^8.18.2", + "@typescript-eslint/eslint-plugin": "^8.19.0", + "@typescript-eslint/parser": "^8.19.0", "ava": "^5.3.1", "eslint": "^8.57.1", "eslint-import-resolver-typescript": "^3.7.0", @@ -1371,17 +1371,17 @@ "license": "MIT" }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.18.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.18.2.tgz", - "integrity": "sha512-adig4SzPLjeQ0Tm+jvsozSGiCliI2ajeURDGHjZ2llnA+A67HihCQ+a3amtPhUakd1GlwHxSRvzOZktbEvhPPg==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.19.0.tgz", + "integrity": "sha512-NggSaEZCdSrFddbctrVjkVZvFC6KGfKfNK0CU7mNK/iKHGKbzT4Wmgm08dKpcZECBu9f5FypndoMyRHkdqfT1Q==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "8.18.2", - "@typescript-eslint/type-utils": "8.18.2", - "@typescript-eslint/utils": "8.18.2", - "@typescript-eslint/visitor-keys": "8.18.2", + "@typescript-eslint/scope-manager": "8.19.0", + "@typescript-eslint/type-utils": "8.19.0", + "@typescript-eslint/utils": "8.19.0", + "@typescript-eslint/visitor-keys": "8.19.0", "graphemer": "^1.4.0", "ignore": "^5.3.1", "natural-compare": "^1.4.0", @@ -1401,14 +1401,14 @@ } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": { - "version": "8.18.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.18.2.tgz", - "integrity": "sha512-YJFSfbd0CJjy14r/EvWapYgV4R5CHzptssoag2M7y3Ra7XNta6GPAJPPP5KGB9j14viYXyrzRO5GkX7CRfo8/g==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.19.0.tgz", + "integrity": "sha512-hkoJiKQS3GQ13TSMEiuNmSCvhz7ujyqD1x3ShbaETATHrck+9RaDdUbt+osXaUuns9OFwrDTTrjtwsU8gJyyRA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.18.2", - "@typescript-eslint/visitor-keys": "8.18.2" + "@typescript-eslint/types": "8.19.0", + "@typescript-eslint/visitor-keys": "8.19.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -1419,9 +1419,9 @@ } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": { - "version": "8.18.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.18.2.tgz", - "integrity": "sha512-Z/zblEPp8cIvmEn6+tPDIHUbRu/0z5lqZ+NvolL5SvXWT5rQy7+Nch83M0++XzO0XrWRFWECgOAyE8bsJTl1GQ==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.19.0.tgz", + "integrity": "sha512-8XQ4Ss7G9WX8oaYvD4OOLCjIQYgRQxO+qCiR2V2s2GxI9AUpo7riNwo6jDhKtTcaJjT8PY54j2Yb33kWtSJsmA==", "dev": true, "license": "MIT", "engines": { @@ -1433,14 +1433,14 @@ } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": { - "version": "8.18.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.18.2.tgz", - "integrity": "sha512-WXAVt595HjpmlfH4crSdM/1bcsqh+1weFRWIa9XMTx/XHZ9TCKMcr725tLYqWOgzKdeDrqVHxFotrvWcEsk2Tg==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.19.0.tgz", + "integrity": "sha512-WW9PpDaLIFW9LCbucMSdYUuGeFUz1OkWYS/5fwZwTA+l2RwlWFdJvReQqMUMBw4yJWJOfqd7An9uwut2Oj8sLw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.18.2", - "@typescript-eslint/visitor-keys": "8.18.2", + "@typescript-eslint/types": "8.19.0", + "@typescript-eslint/visitor-keys": "8.19.0", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", @@ -1460,16 +1460,16 @@ } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": { - "version": "8.18.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.18.2.tgz", - "integrity": "sha512-Cr4A0H7DtVIPkauj4sTSXVl+VBWewE9/o40KcF3TV9aqDEOWoXF3/+oRXNby3DYzZeCATvbdksYsGZzplwnK/Q==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.19.0.tgz", + "integrity": "sha512-PTBG+0oEMPH9jCZlfg07LCB2nYI0I317yyvXGfxnvGvw4SHIOuRnQ3kadyyXY6tGdChusIHIbM5zfIbp4M6tCg==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "8.18.2", - "@typescript-eslint/types": "8.18.2", - "@typescript-eslint/typescript-estree": "8.18.2" + "@typescript-eslint/scope-manager": "8.19.0", + "@typescript-eslint/types": "8.19.0", + "@typescript-eslint/typescript-estree": "8.19.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -1484,13 +1484,13 @@ } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": { - "version": "8.18.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.18.2.tgz", - "integrity": "sha512-zORcwn4C3trOWiCqFQP1x6G3xTRyZ1LYydnj51cRnJ6hxBlr/cKPckk+PKPUw/fXmvfKTcw7bwY3w9izgx5jZw==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.19.0.tgz", + "integrity": "sha512-mCFtBbFBJDCNCWUl5y6sZSCHXw1DEFEk3c/M3nRK2a4XUB8StGFtmcEMizdjKuBzB6e/smJAAWYug3VrdLMr1w==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.18.2", + "@typescript-eslint/types": "8.19.0", "eslint-visitor-keys": "^4.2.0" }, "engines": { @@ -1541,16 +1541,16 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "8.18.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.18.2.tgz", - "integrity": "sha512-y7tcq4StgxQD4mDr9+Jb26dZ+HTZ/SkfqpXSiqeUXZHxOUyjWDKsmwKhJ0/tApR08DgOhrFAoAhyB80/p3ViuA==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.19.0.tgz", + "integrity": "sha512-6M8taKyOETY1TKHp0x8ndycipTVgmp4xtg5QpEZzXxDhNvvHOJi5rLRkLr8SK3jTgD5l4fTlvBiRdfsuWydxBw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/scope-manager": "8.18.2", - "@typescript-eslint/types": "8.18.2", - "@typescript-eslint/typescript-estree": "8.18.2", - "@typescript-eslint/visitor-keys": "8.18.2", + "@typescript-eslint/scope-manager": "8.19.0", + "@typescript-eslint/types": "8.19.0", + "@typescript-eslint/typescript-estree": "8.19.0", + "@typescript-eslint/visitor-keys": "8.19.0", "debug": "^4.3.4" }, "engines": { @@ -1566,14 +1566,14 @@ } }, "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": { - "version": "8.18.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.18.2.tgz", - "integrity": "sha512-YJFSfbd0CJjy14r/EvWapYgV4R5CHzptssoag2M7y3Ra7XNta6GPAJPPP5KGB9j14viYXyrzRO5GkX7CRfo8/g==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.19.0.tgz", + "integrity": "sha512-hkoJiKQS3GQ13TSMEiuNmSCvhz7ujyqD1x3ShbaETATHrck+9RaDdUbt+osXaUuns9OFwrDTTrjtwsU8gJyyRA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.18.2", - "@typescript-eslint/visitor-keys": "8.18.2" + "@typescript-eslint/types": "8.19.0", + "@typescript-eslint/visitor-keys": "8.19.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -1584,9 +1584,9 @@ } }, "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": { - "version": "8.18.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.18.2.tgz", - "integrity": "sha512-Z/zblEPp8cIvmEn6+tPDIHUbRu/0z5lqZ+NvolL5SvXWT5rQy7+Nch83M0++XzO0XrWRFWECgOAyE8bsJTl1GQ==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.19.0.tgz", + "integrity": "sha512-8XQ4Ss7G9WX8oaYvD4OOLCjIQYgRQxO+qCiR2V2s2GxI9AUpo7riNwo6jDhKtTcaJjT8PY54j2Yb33kWtSJsmA==", "dev": true, "license": "MIT", "engines": { @@ -1598,14 +1598,14 @@ } }, "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": { - "version": "8.18.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.18.2.tgz", - "integrity": "sha512-WXAVt595HjpmlfH4crSdM/1bcsqh+1weFRWIa9XMTx/XHZ9TCKMcr725tLYqWOgzKdeDrqVHxFotrvWcEsk2Tg==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.19.0.tgz", + "integrity": "sha512-WW9PpDaLIFW9LCbucMSdYUuGeFUz1OkWYS/5fwZwTA+l2RwlWFdJvReQqMUMBw4yJWJOfqd7An9uwut2Oj8sLw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.18.2", - "@typescript-eslint/visitor-keys": "8.18.2", + "@typescript-eslint/types": "8.19.0", + "@typescript-eslint/visitor-keys": "8.19.0", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", @@ -1625,13 +1625,13 @@ } }, "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": { - "version": "8.18.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.18.2.tgz", - "integrity": "sha512-zORcwn4C3trOWiCqFQP1x6G3xTRyZ1LYydnj51cRnJ6hxBlr/cKPckk+PKPUw/fXmvfKTcw7bwY3w9izgx5jZw==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.19.0.tgz", + "integrity": "sha512-mCFtBbFBJDCNCWUl5y6sZSCHXw1DEFEk3c/M3nRK2a4XUB8StGFtmcEMizdjKuBzB6e/smJAAWYug3VrdLMr1w==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.18.2", + "@typescript-eslint/types": "8.19.0", "eslint-visitor-keys": "^4.2.0" }, "engines": { @@ -1700,14 +1700,14 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.18.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.18.2.tgz", - "integrity": "sha512-AB/Wr1Lz31bzHfGm/jgbFR0VB0SML/hd2P1yxzKDM48YmP7vbyJNHRExUE/wZsQj2wUCvbWH8poNHFuxLqCTnA==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.19.0.tgz", + "integrity": "sha512-TZs0I0OSbd5Aza4qAMpp1cdCYVnER94IziudE3JU328YUHgWu9gwiwhag+fuLeJ2LkWLXI+F/182TbG+JaBdTg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/typescript-estree": "8.18.2", - "@typescript-eslint/utils": "8.18.2", + "@typescript-eslint/typescript-estree": "8.19.0", + "@typescript-eslint/utils": "8.19.0", "debug": "^4.3.4", "ts-api-utils": "^1.3.0" }, @@ -1724,14 +1724,14 @@ } }, "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/scope-manager": { - "version": "8.18.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.18.2.tgz", - "integrity": "sha512-YJFSfbd0CJjy14r/EvWapYgV4R5CHzptssoag2M7y3Ra7XNta6GPAJPPP5KGB9j14viYXyrzRO5GkX7CRfo8/g==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.19.0.tgz", + "integrity": "sha512-hkoJiKQS3GQ13TSMEiuNmSCvhz7ujyqD1x3ShbaETATHrck+9RaDdUbt+osXaUuns9OFwrDTTrjtwsU8gJyyRA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.18.2", - "@typescript-eslint/visitor-keys": "8.18.2" + "@typescript-eslint/types": "8.19.0", + "@typescript-eslint/visitor-keys": "8.19.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -1742,9 +1742,9 @@ } }, "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": { - "version": "8.18.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.18.2.tgz", - "integrity": "sha512-Z/zblEPp8cIvmEn6+tPDIHUbRu/0z5lqZ+NvolL5SvXWT5rQy7+Nch83M0++XzO0XrWRFWECgOAyE8bsJTl1GQ==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.19.0.tgz", + "integrity": "sha512-8XQ4Ss7G9WX8oaYvD4OOLCjIQYgRQxO+qCiR2V2s2GxI9AUpo7riNwo6jDhKtTcaJjT8PY54j2Yb33kWtSJsmA==", "dev": true, "license": "MIT", "engines": { @@ -1756,14 +1756,14 @@ } }, "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": { - "version": "8.18.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.18.2.tgz", - "integrity": "sha512-WXAVt595HjpmlfH4crSdM/1bcsqh+1weFRWIa9XMTx/XHZ9TCKMcr725tLYqWOgzKdeDrqVHxFotrvWcEsk2Tg==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.19.0.tgz", + "integrity": "sha512-WW9PpDaLIFW9LCbucMSdYUuGeFUz1OkWYS/5fwZwTA+l2RwlWFdJvReQqMUMBw4yJWJOfqd7An9uwut2Oj8sLw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.18.2", - "@typescript-eslint/visitor-keys": "8.18.2", + "@typescript-eslint/types": "8.19.0", + "@typescript-eslint/visitor-keys": "8.19.0", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", @@ -1783,16 +1783,16 @@ } }, "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/utils": { - "version": "8.18.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.18.2.tgz", - "integrity": "sha512-Cr4A0H7DtVIPkauj4sTSXVl+VBWewE9/o40KcF3TV9aqDEOWoXF3/+oRXNby3DYzZeCATvbdksYsGZzplwnK/Q==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.19.0.tgz", + "integrity": "sha512-PTBG+0oEMPH9jCZlfg07LCB2nYI0I317yyvXGfxnvGvw4SHIOuRnQ3kadyyXY6tGdChusIHIbM5zfIbp4M6tCg==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "8.18.2", - "@typescript-eslint/types": "8.18.2", - "@typescript-eslint/typescript-estree": "8.18.2" + "@typescript-eslint/scope-manager": "8.19.0", + "@typescript-eslint/types": "8.19.0", + "@typescript-eslint/typescript-estree": "8.19.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -1807,13 +1807,13 @@ } }, "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": { - "version": "8.18.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.18.2.tgz", - "integrity": "sha512-zORcwn4C3trOWiCqFQP1x6G3xTRyZ1LYydnj51cRnJ6hxBlr/cKPckk+PKPUw/fXmvfKTcw7bwY3w9izgx5jZw==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.19.0.tgz", + "integrity": "sha512-mCFtBbFBJDCNCWUl5y6sZSCHXw1DEFEk3c/M3nRK2a4XUB8StGFtmcEMizdjKuBzB6e/smJAAWYug3VrdLMr1w==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.18.2", + "@typescript-eslint/types": "8.19.0", "eslint-visitor-keys": "^4.2.0" }, "engines": { @@ -7692,13 +7692,14 @@ "license": "MIT" }, "node_modules/uuid": { - "version": "11.0.3", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.0.3.tgz", - "integrity": "sha512-d0z310fCWv5dJwnX1Y/MncBAqGMKEzlBb1AOf7z9K8ALnd0utBX/msg/fA0+sbyN1ihbMsLhrBlnl1ak7Wa0rg==", + "version": "11.0.4", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.0.4.tgz", + "integrity": "sha512-IzL6VtTTYcAhA/oghbFJ1Dkmqev+FpQWnCBaKq/gUluLxliWvO8DPFWfIviRmYbtaavtSQe4WBL++rFjdcGWEg==", "funding": [ "https://github.com/sponsors/broofa", "https://github.com/sponsors/ctavan" ], + "license": "MIT", "bin": { "uuid": "dist/esm/bin/uuid" } diff --git a/package.json b/package.json index d573531ed6..b143b1be27 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "node-forge": "^1.3.1", "path": "^0.12.7", "semver": "^7.6.3", - "uuid": "^11.0.3", + "uuid": "^11.0.4", "zlib": "^1.0.5" }, "//": [ @@ -72,8 +72,8 @@ "@types/node": "20.9.0", "@types/semver": "^7.5.8", "@types/sinon": "^17.0.3", - "@typescript-eslint/eslint-plugin": "^8.18.2", - "@typescript-eslint/parser": "^8.18.2", + "@typescript-eslint/eslint-plugin": "^8.19.0", + "@typescript-eslint/parser": "^8.19.0", "ava": "^5.3.1", "eslint": "^8.57.1", "eslint-import-resolver-typescript": "^3.7.0",