From 42287249fde43e45eab26f40bb586fcaafb8d528 Mon Sep 17 00:00:00 2001 From: Stuart Rowlands Date: Thu, 21 Nov 2024 20:05:17 +1000 Subject: [PATCH 01/41] Adding interactive CLI mode. --- README.md | 246 ++++++++------- cli.js | 129 +++++++- package-lock.json | 172 +++++++---- package.json | 6 +- src/commandLoader.js | 41 +++ src/commands/crawl.js | 342 --------------------- src/commands/delete.js | 103 ++++--- src/commands/deploy.js | 312 ++++++++----------- src/commands/file.js | 89 ++++-- src/commands/info.js | 97 +++--- src/commands/init.js | 211 +++++++------ src/commands/page.js | 86 ++++-- src/commands/proxy.js | 66 ---- src/commands/publish.js | 109 ++++--- src/commands/purge.js | 63 +++- src/commands/redirect.js | 106 +++++-- src/commands/scan.js | 216 +++++++------ src/commands/search.js | 219 ++++++------- src/commands/unpublish.js | 84 ++++- src/commands/waflogs.js | 145 ++++++--- src/config.js | 216 ++++++------- src/crawl/callbacks.js | 32 -- src/crawl/detectors/images.js | 34 -- src/crawl/detectors/index.js | 11 - src/crawl/detectors/responsiveImg.js | 59 ---- src/crawl/filters/index.js | 11 - src/crawl/filters/relativeDomains.js | 30 -- src/quant-client.js | 50 --- test/client.test.js | 104 ------- test/crawl/detectors/images.test.js | 114 ------- test/crawl/detectors/responsiveImg.test.js | 80 ----- test/crawl/filters/relativeDomains.test.js | 100 ------ test/crawl/redirectcb.test.js | 96 ------ 33 files changed, 1576 insertions(+), 2203 deletions(-) create mode 100644 src/commandLoader.js delete mode 100644 src/commands/crawl.js delete mode 100644 src/commands/proxy.js delete mode 100644 src/crawl/callbacks.js delete mode 100644 src/crawl/detectors/images.js delete mode 100644 src/crawl/detectors/index.js delete mode 100644 src/crawl/detectors/responsiveImg.js delete mode 100644 src/crawl/filters/index.js delete mode 100644 src/crawl/filters/relativeDomains.js delete mode 100644 test/crawl/detectors/images.test.js delete mode 100644 test/crawl/detectors/responsiveImg.test.js delete mode 100644 test/crawl/filters/relativeDomains.test.js delete mode 100644 test/crawl/redirectcb.test.js diff --git a/README.md b/README.md index f952cd4..01f1cbc 100644 --- a/README.md +++ b/README.md @@ -1,123 +1,153 @@ -# QuantCDN cli +# QuantCDN CLI -![Unit tests](https://github.com/quantcdn/quant-cli/actions/workflows/ci.yml/badge.svg) +Command line tools for QuantCDN. -Simplify deployments and interactions with the QuantCDN API by using the support cli tool. +## Installation -## Install - -The preferred method for installation is via npm. - -``` -npm i -g @quantcdn/quant-cli -``` - -or locally to a project - -``` -npm i -D @quantcdn/quant-cli +```bash +npm install -g @quantcdn/quant-cli ``` ## Usage +The CLI can be used in two modes: + +### Interactive Mode +Simply run: +```bash +quant +``` +This will launch an interactive prompt that guides you through available commands and options. + +### CLI Mode +```bash +quant [options] +``` + +## Available Commands + +### Configuration +- `quant init` - Initialize a project in the current directory + ```bash + quant init [--dir=] + ``` + +- `quant info` - Show information about current configuration + +### Content Management +- `quant deploy [dir]` - Deploy the output of a static generator + ```bash + quant deploy [dir] [--attachments] [--skip-unpublish] [--chunk-size=10] [--force] + ``` + +- `quant file ` - Deploy a single asset + ```bash + quant file path/to/file.jpg /images/file.jpg + ``` + +- `quant page ` - Make a local page asset available + ```bash + quant page path/to/page.html /about-us + ``` + +### Publishing Controls +- `quant publish ` - Publish an asset + ```bash + quant publish /about-us [--revision=latest] + ``` + +- `quant unpublish ` - Unpublish an asset + ```bash + quant unpublish /about-us [--force] + ``` + +- `quant delete ` - Delete a deployed path + ```bash + quant delete /about-us [--force] + ``` + +### Cache Management +- `quant purge ` - Purge the cache for a given URL + ```bash + quant purge /about-us + ``` + +### Redirects +- `quant redirect [status] [author]` - Create a redirect + ```bash + quant redirect /old-page /new-page [--status=301] [--author="John Doe"] + ``` + +### Search +- `quant search ` - Perform search index operations + ```bash + quant search status + quant search index --path=/path/to/files + quant search unindex --path=/url/to/remove + quant search clear + ``` + +### Validation +- `quant scan` - Validate local file checksums + ```bash + quant scan [--diff-only] [--unpublish-only] [--skip-unpublish-regex=pattern] + ``` + +### WAF Logs +- `quant waf:logs` - Access project WAF logs + ```bash + quant waf:logs [--fields=field1,field2] [--output=file.csv] [--all] [--size=10] + ``` + +## Global Options +These options can be used with any command: + +```bash +--clientid, -c Project customer id for QuantCDN +--project, -p Project name for QuantCDN +--token, -t Project token for QuantCDN +--endpoint, -e API endpoint for QuantCDN (default: "https://api.quantcdn.io") +--bearer Scoped API bearer token +``` + +## Configuration + +The CLI can be configured using either: +1. Interactive initialization: `quant init` +2. Command line arguments (see Global Options) +3. Environment variables: + - `QUANT_CLIENT_ID` + - `QUANT_PROJECT` + - `QUANT_TOKEN` + - `QUANT_ENDPOINT` + - `QUANT_BEARER` + +## Examples + +```bash +# Initialize a new project +quant init + +# Deploy a directory +quant deploy build --attachments + +# Upload a single file +quant file ./logo.png /images/logo.png + +# Create a redirect +quant redirect /old-page /new-page --status=301 + +# Check deployment status +quant scan --diff-only ``` -$ quant - -Commands: - quant crawl [domain] Crawl and push an entire domain - quant delete Delete a deployed path from Quant - quant deploy [dir] Deploy the output of a static generator - quant file Deploy a single asset - quant info Give info based on current configuration - quant init Initialise a project in the current directory - quant page Make a local page asset available via Quant - quant proxy [status] Create a proxy to allow traffic directly to origin - [basicAuthUser] [basicAuthPass] - quant publish Publish an asset - quant purge Purge the cache for a given url - quant redirect [status] [author] Create a redirect - quant search Perform search index operations - quant unpublish Unpublish an asset - -Options: - --version Show version number [boolean] - --help Show help [boolean] - --clientid, -c Project customer id for QuantCDN [string] - --project, -p Project name for QuantCDN [string] - --token, -t Project token for QuantCDN [string] - --endpoint, -e API endpoint for QuantCDN [string] [default: "https://api.quantcdn.io"] -``` - -## Get started - -Please refer to the ["get started" guide](https://docs.quantcdn.io/docs/cli/get-started) for more details on getting set up. - -Quant accepts options or will ready configuration values from a `quant.json` file in the current directory. - -``` -$ quant init -``` - -An interactive walk-through for configuring your API connection. - -``` -$ quant info - -Endpoint: https://api.quantcdn.io/v1 -Customer: quant -Project: dev-docs -Token: **** -✅✅✅ Successfully connected to dev-docs -``` - -## Manage search index - -### Basic usage - -* Use `quant search status` to retrieve index size and basic configuration. -* Use `quant search unindex --path=/url/path` to remove an item from the index. -* Use `quant search clear` to clear the entire index. - -### Create and update records - -You may index new content or update existing content in the search index directly. Simply provide one or multiple records in JSON files. For example, consider a `search-records.json` file containing the following: - -``` -[ - { - "title": "This is a record", - "url": "/blog/page", - "summary": "The record is small and neat.", - "content": "Lots of good content here. But not too much!", - }, - { - "title": "Fully featured search record", - "url": "/about-us", - "summary": "The record contains all the trimmings.", - "content": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras id dolor facilisis, ornare erat et, scelerisque odio. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.", - "image": "https://www.example.com/images/about.jpg", - "categories": [ "Blog", "Commerce", "Jamstack" ], - "tags": [ "Tailwind" , "QuantCDN" ] - } -] -``` - -To post these records to the search index: -``` -quant search index --path=./search-records.json -``` - -**Note:** The path may either refer to an individual file or a path on disk containing multiple JSON files. ## Testing -Automated via CodeFresh for all PRs and mainline branches. - -``` -$ npm run lint -$ npm run test +```bash +npm run lint +npm run test ``` ## Contributing -Issues and feature requests are managed via Github and pull requests are welcomed. +Issues and feature requests are managed via Github and pull requests are welcomed. \ No newline at end of file diff --git a/cli.js b/cli.js index 17a802e..2c46e1a 100755 --- a/cli.js +++ b/cli.js @@ -1,11 +1,93 @@ #!/usr/bin/env node -require('yargs/yargs')(process.argv.slice(2)) +const { intro, outro, text, password, select, confirm, isCancel, spinner } = require('@clack/prompts'); +const color = require('picocolors'); +const { getCommandOptions, getCommand } = require('./src/commandLoader'); +const config = require('./src/config'); +const yargs = require('yargs'); + +async function interactiveMode() { + intro(color.bgCyan(' QuantCDN CLI ')); + + try { + // Check for config before showing menu + if (!await config.fromArgs({ _: [''] })) { + process.exit(1); + } + + const command = await select({ + message: 'What would you like to do?', + options: getCommandOptions() + }); + + if (isCancel(command)) { + outro(color.yellow('Operation cancelled')); + process.exit(0); + } + + const commandHandler = getCommand(command); + if (!commandHandler) { + throw new Error(`Unknown command: ${command}`); + } + + const args = await commandHandler.promptArgs(); + + const spin = spinner(); + spin.start(`Executing ${command}`); + + try { + const result = await commandHandler.handler(args); + spin.stop(`${command} completed successfully`); + outro(color.green(result || 'Operation completed successfully!')); + } catch (error) { + spin.stop(`${command} failed`); + throw error; + } + } catch (error) { + outro(color.red(`Error: ${error.message}`)); + process.exit(1); + } +} + +async function handleCommand(command, argv) { + try { + // Check if command was called with no arguments + const commandParts = command.command.split(' '); + const requiredArgs = commandParts.filter(part => part.startsWith('<')).length; + const providedArgs = argv._.length - 1; // Subtract 1 for command name + + // If no arguments provided at all, go straight to interactive mode + if (providedArgs === 0 && requiredArgs > 0) { + intro(color.bgCyan(' QuantCDN CLI ')); + const args = await command.promptArgs(); + if (!args) { + outro(color.yellow('Operation cancelled')); + process.exit(0); + } + argv = { ...argv, ...args }; + } + // If some arguments are missing, let yargs handle the error + else if (providedArgs < requiredArgs) { + return command.builder(yargs).argv; + } + + // Add _command property to args for config check + argv._ = argv._ || []; + argv._[0] = commandParts[0]; + + const result = await command.handler(argv); + console.log(color.green(result || 'Operation completed successfully!')); + } catch (error) { + console.error(color.red(`Error: ${error.message}`)); + process.exit(1); + } +} + +function cliMode() { + const yargsInstance = yargs(process.argv.slice(2)) .strict() .help() - .commandDir('src/commands') - // Global options that can be used by all commands - // options provided will be used over quant.json. + // Global options .option('clientid', { alias: 'c', describe: 'Project customer id for QuantCDN', @@ -25,16 +107,39 @@ require('yargs/yargs')(process.argv.slice(2)) alias: 'e', describe: 'API endpoint for QuantCDN', type: 'string', + default: 'https://api.quantcdn.io' }) .option('bearer', { - describe: 'Scoped API berarer token', + describe: 'Scoped API bearer token', type: 'string', - }) - .demandCommand() - .wrap(100) - .argv; + }); + + // Add all commands to yargs + const commands = require('./src/commandLoader').loadCommands(); + Object.entries(commands).forEach(([name, command]) => { + yargsInstance.command( + command.command || name, + command.describe, + command.builder || {}, + (argv) => handleCommand(command, argv) + ); + }); + + yargsInstance.demandCommand().parse(); +} + +// Determine if we should run in interactive or CLI mode +if (process.argv.length <= 2) { + interactiveMode().catch((error) => { + outro(color.red(`Error: ${error.message}`)); + process.exit(1); + }); +} else { + cliMode(); +} -process.on('SIGINT', function() { - console.log('Caught interrupt signal'); - process.exit(); +// Handle interrupts gracefully +process.on('SIGINT', () => { + outro(color.yellow('\nOperation cancelled')); + process.exit(0); }); diff --git a/package-lock.json b/package-lock.json index 41a8ab7..aacc176 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,6 +9,8 @@ "version": "4.0.0", "license": "ISC", "dependencies": { + "@clack/core": "^0.3.3", + "@clack/prompts": "^0.7.0", "axios": "^1.7.3", "big-json": "^3.1.0", "chalk": "^4.1.0", @@ -29,19 +31,55 @@ "devDependencies": { "@sinonjs/referee": "^11.0.1", "chai": "^5.1.1", - "chai-as-promised": "^7.1.1", + "chai-as-promised": "^8.0.0", "eslint": "^9.8.0", "eslint-config-google": "^0.14.0", "eslint-plugin-jsdoc": "^50.0.1", "mocha": "^10.0.0", "mock-require": "^3.0.3", - "sinon": "^18.0.0", + "sinon": "^19.0.2", "sinon-chai": "^4.0.0" }, "engines": { "node": ">=16" } }, + "node_modules/@clack/core": { + "version": "0.3.4", + "resolved": "https://registry.npmjs.org/@clack/core/-/core-0.3.4.tgz", + "integrity": "sha512-H4hxZDXgHtWTwV3RAVenqcC4VbJZNegbBjlPvzOzCouXtS2y3sDvlO3IsbrPNWuLWPPlYVYPghQdSF64683Ldw==", + "license": "MIT", + "dependencies": { + "picocolors": "^1.0.0", + "sisteransi": "^1.0.5" + } + }, + "node_modules/@clack/prompts": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/@clack/prompts/-/prompts-0.7.0.tgz", + "integrity": "sha512-0MhX9/B4iL6Re04jPrttDm+BsP8y6mS7byuv0BvXgdXhbV5PdlsHt55dvNsuBCPZ7xq1oTAOOuotR9NFbQyMSA==", + "bundleDependencies": [ + "is-unicode-supported" + ], + "license": "MIT", + "dependencies": { + "@clack/core": "^0.3.3", + "is-unicode-supported": "*", + "picocolors": "^1.0.0", + "sisteransi": "^1.0.5" + } + }, + "node_modules/@clack/prompts/node_modules/is-unicode-supported": { + "version": "1.3.0", + "inBundle": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/@colors/colors": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz", @@ -308,13 +346,13 @@ } }, "node_modules/@sinonjs/fake-timers": { - "version": "11.2.2", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-11.2.2.tgz", - "integrity": "sha512-G2piCSxQ7oWOxwGSAyFHfPIsyeJGXYtc6mFbnFA+kRXkiEnTl8c/8jul2S329iFBnDI9HGoeWWAZvuvOkZccgw==", + "version": "13.0.5", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-13.0.5.tgz", + "integrity": "sha512-36/hTbH2uaWuGVERyC6da9YwGWnzUZXuPro/F2LfsdOsLnCojz/iSH8MxUt/FD2S5XBSVPhmArFUXcpCQ2Hkiw==", "dev": true, "license": "BSD-3-Clause", "dependencies": { - "@sinonjs/commons": "^3.0.0" + "@sinonjs/commons": "^3.0.1" } }, "node_modules/@sinonjs/referee": { @@ -332,31 +370,31 @@ } }, "node_modules/@sinonjs/samsam": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-8.0.0.tgz", - "integrity": "sha512-Bp8KUVlLp8ibJZrnvq2foVhP0IVX2CIprMJPK0vqGqgrDa0OHVKeZyBykqskkrdxV6yKBPmGasO8LVjAKR3Gew==", + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-8.0.2.tgz", + "integrity": "sha512-v46t/fwnhejRSFTGqbpn9u+LQ9xJDse10gNnPgAcxgdoCDMXj/G2asWAC/8Qs+BAZDicX+MNZouXT1A7c83kVw==", "dev": true, "license": "BSD-3-Clause", "dependencies": { - "@sinonjs/commons": "^2.0.0", + "@sinonjs/commons": "^3.0.1", "lodash.get": "^4.4.2", - "type-detect": "^4.0.8" + "type-detect": "^4.1.0" } }, - "node_modules/@sinonjs/samsam/node_modules/@sinonjs/commons": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-2.0.0.tgz", - "integrity": "sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg==", + "node_modules/@sinonjs/samsam/node_modules/type-detect": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.1.0.tgz", + "integrity": "sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==", "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "type-detect": "4.0.8" + "license": "MIT", + "engines": { + "node": ">=4" } }, "node_modules/@sinonjs/text-encoding": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.2.tgz", - "integrity": "sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ==", + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.3.tgz", + "integrity": "sha512-DE427ROAphMQzU4ENbliGYrBSYPXF+TtLg9S8vzeA+OF4ZKzoDdzfL8sxuMUGS/lgRhM6j1URSk9ghf7Xo1tyA==", "dev": true, "license": "(Unlicense OR Apache-2.0)" }, @@ -684,28 +722,18 @@ } }, "node_modules/chai-as-promised": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.2.tgz", - "integrity": "sha512-aBDHZxRzYnUYuIAIPBH2s511DjlKPzXNlXSGFC8CwmroWQLfrW0LtE1nK3MAwwNhJPa9raEjNCmRoFpG0Hurdw==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-8.0.0.tgz", + "integrity": "sha512-sMsGXTrS3FunP/wbqh/KxM8Kj/aLPXQGkNtvE5wPfSToq8wkkvBpTZo1LIiEVmC4BwkKpag+l5h/20lBMk6nUg==", "dev": true, "license": "WTFPL", "dependencies": { - "check-error": "^1.0.2" + "check-error": "^2.0.0" }, "peerDependencies": { "chai": ">= 2.1.2 < 6" } }, - "node_modules/chai/node_modules/check-error": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.1.tgz", - "integrity": "sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 16" - } - }, "node_modules/chalk": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", @@ -723,16 +751,13 @@ } }, "node_modules/check-error": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz", - "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.1.tgz", + "integrity": "sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==", "dev": true, "license": "MIT", - "dependencies": { - "get-func-name": "^2.0.2" - }, "engines": { - "node": "*" + "node": ">= 16" } }, "node_modules/chokidar": { @@ -2936,17 +2961,17 @@ "license": "ISC" }, "node_modules/nise": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/nise/-/nise-6.0.0.tgz", - "integrity": "sha512-K8ePqo9BFvN31HXwEtTNGzgrPpmvgciDsFz8aztFjt4LqKO/JeFD8tBOeuDiCMXrIl/m1YvfH8auSpxfaD09wg==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/nise/-/nise-6.1.1.tgz", + "integrity": "sha512-aMSAzLVY7LyeM60gvBS423nBmIPP+Wy7St7hsb+8/fc1HmeoHJfLO8CKse4u3BtOZvQLJghYPI2i/1WZrEj5/g==", "dev": true, "license": "BSD-3-Clause", "dependencies": { - "@sinonjs/commons": "^3.0.0", - "@sinonjs/fake-timers": "^11.2.2", - "@sinonjs/text-encoding": "^0.7.2", + "@sinonjs/commons": "^3.0.1", + "@sinonjs/fake-timers": "^13.0.1", + "@sinonjs/text-encoding": "^0.7.3", "just-extend": "^6.2.0", - "path-to-regexp": "^6.2.1" + "path-to-regexp": "^8.1.0" } }, "node_modules/normalize-path": { @@ -3141,11 +3166,14 @@ } }, "node_modules/path-to-regexp": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.2.tgz", - "integrity": "sha512-GQX3SSMokngb36+whdpRXE+3f9V8UzyAorlYvOGx87ufGHehNTn5lCxrKtLyZ4Yl/wEKnNnr98ZzOwwDZV5ogw==", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.2.0.tgz", + "integrity": "sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ==", "dev": true, - "license": "MIT" + "license": "MIT", + "engines": { + "node": ">=16" + } }, "node_modules/pathval": { "version": "2.0.0", @@ -3157,6 +3185,12 @@ "node": ">= 14.16" } }, + "node_modules/picocolors": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", + "license": "ISC" + }, "node_modules/picomatch": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", @@ -3570,18 +3604,18 @@ } }, "node_modules/sinon": { - "version": "18.0.0", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-18.0.0.tgz", - "integrity": "sha512-+dXDXzD1sBO6HlmZDd7mXZCR/y5ECiEiGCBSGuFD/kZ0bDTofPYc6JaeGmPSF+1j1MejGUWkORbYOLDyvqCWpA==", + "version": "19.0.2", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-19.0.2.tgz", + "integrity": "sha512-euuToqM+PjO4UgXeLETsfQiuoyPXlqFezr6YZDFwHR3t4qaX0fZUe1MfPMznTL5f8BWrVS89KduLdMUsxFCO6g==", "dev": true, "license": "BSD-3-Clause", "dependencies": { "@sinonjs/commons": "^3.0.1", - "@sinonjs/fake-timers": "^11.2.2", - "@sinonjs/samsam": "^8.0.0", - "diff": "^5.2.0", - "nise": "^6.0.0", - "supports-color": "^7" + "@sinonjs/fake-timers": "^13.0.2", + "@sinonjs/samsam": "^8.0.1", + "diff": "^7.0.0", + "nise": "^6.1.1", + "supports-color": "^7.2.0" }, "funding": { "type": "opencollective", @@ -3599,6 +3633,22 @@ "sinon": ">=4.0.0" } }, + "node_modules/sinon/node_modules/diff": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-7.0.0.tgz", + "integrity": "sha512-PJWHUb1RFevKCwaFA9RlG5tCd+FO5iRh9A8HEtkmBH2Li03iJriB6m6JIN4rGz3K3JLawI7/veA1xzRKP6ISBw==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/sisteransi": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", + "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", + "license": "MIT" + }, "node_modules/slashes": { "version": "3.0.12", "resolved": "https://registry.npmjs.org/slashes/-/slashes-3.0.12.tgz", diff --git a/package.json b/package.json index 460ead6..8da4c2b 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,8 @@ "/src" ], "dependencies": { + "@clack/core": "^0.3.3", + "@clack/prompts": "^0.7.0", "axios": "^1.7.3", "big-json": "^3.1.0", "chalk": "^4.1.0", @@ -43,10 +45,8 @@ "md5-file": "^5.0.0", "mime-types": "^2.1.27", "papaparse": "^5.4.1", - "prompt": "^1.1.0", - "simplecrawler": "^1.1.9", + "picocolors": "^1.0.0", "string.prototype.matchall": "^4.0.2", - "tmp": "^0.2.1", "yargs": "^17.0.1" }, "devDependencies": { diff --git a/src/commandLoader.js b/src/commandLoader.js new file mode 100644 index 0000000..6af2f5b --- /dev/null +++ b/src/commandLoader.js @@ -0,0 +1,41 @@ +const fs = require('fs'); +const path = require('path'); +const { select, text, password, confirm, isCancel } = require('@clack/prompts'); +const color = require('picocolors'); + +// Load all command modules +function loadCommands() { + const commands = {}; + const commandsDir = path.join(__dirname, 'commands'); + + fs.readdirSync(commandsDir) + .filter(file => file.endsWith('.js')) + .forEach(file => { + const command = require(path.join(commandsDir, file)); + const name = path.basename(file, '.js'); + commands[name] = command; + }); + + return commands; +} + +// Convert commands to Clack options +function getCommandOptions() { + const commands = loadCommands(); + return Object.entries(commands).map(([name, command]) => ({ + value: name, + label: command.describe || name, + })); +} + +// Get command handler +function getCommand(name) { + const commands = loadCommands(); + return commands[name]; +} + +module.exports = { + loadCommands, + getCommandOptions, + getCommand +}; \ No newline at end of file diff --git a/src/commands/crawl.js b/src/commands/crawl.js deleted file mode 100644 index c195a90..0000000 --- a/src/commands/crawl.js +++ /dev/null @@ -1,342 +0,0 @@ -/** - * Crawl and push an entire website to Quant. - * - * @usage - * quant crawl -d https://www.google.com/ - */ -const chalk = require('chalk'); -const config = require('../config'); -const client = require('../quant-client'); -const crawler = require('simplecrawler'); -const {write} = require('../helper/resumeState'); -const axios = require('axios') -const util = require('util'); -const fs = require('fs'); -const tmp = require('tmp'); -const prompt = require('prompt'); -const os = require('os'); - -const {redirectHandler} = require('../crawl/callbacks'); - -const filters = require('../crawl/filters'); -const detectors = require('../crawl/detectors'); - -let crawl; -let count = 0; -let writingState = false; -let filename; - -const failures = []; - -const command = {}; - -command.command = 'crawl '; -command.describe = 'Crawl and push an entire domain'; -command.builder = { - 'rewrite': { - describe: 'Rewrite host patterns', - alias: 'r', - type: 'boolean', - default: false, - }, - 'attachments': { - describe: 'Find attachments', - alias: 'a', - type: 'boolean', - default: false, - }, - 'interval': { - describe: 'Crawl interval', - alias: 'i', - type: 'integer', - default: 200, - }, - 'cookies': { - describe: 'Accept cookies during the crawl', - alias: 'c', - type: 'boolean', - default: false, - }, - 'concurrency': { - describe: 'Crawl concurrency', - alias: 'n', - type: 'integer', - default: 4, - }, - 'size': { - describe: 'Crawl resource buffer size in bytes', - alias: 's', - type: 'integer', - default: 268435456, - }, - 'robots': { - describe: 'Respect robots', - type: 'boolean', - default: false, - }, - 'extra-domains': { - describe: 'CSV of additional host names to fan out to', - alias: 'e', - }, - 'skip-resume': { - describe: 'Start a fresh crawl ignoring resume state', - type: 'boolean', - default: false, - }, - 'no-interaction': { - describe: 'No user interaction', - type: 'boolean', - default: false, - }, - 'urls-file': { - describe: 'JSON file containing array of URLs to add to the queue', - type: 'string', - }, - 'seed-notfound': { - describe: 'Send the content of unique not found pages to quant', - type: 'boolean', - default: false, - }, - 'user-agent': { - describe: 'The user-agent to send with the request', - type: 'string', - default: 'Quant (+http://api.quantcdn.io)', - }, -}; - -/** - * When the operator interrupts the process, store the - * state of the crawler. - */ -[`exit`, `SIGINT`, `SIGUSR1`, `SIGUSR2`, `uncaughtException`, `SIGTERM`].forEach((eventType) => { - process.on(eventType, function() { - if (typeof crawl != 'undefined' && !writingState) { - writingState = true; - // Saving the state cannot be async as exit hooks don't correctly - // execute async callbacks. - write(crawl, filename); - } - }); -}); - -command.handler = async function(argv) { - console.log(chalk.bold.green('*** Quant crawl ***')); - - // Make sure configuration is loaded. - if (!config.fromArgs(argv)) { - return console.error(chalk.yellow('Quant is not configured, run init.')); - } - - // Set the resume-state filename. - filename = `${config.get('clientid')}-${config.get('project')}`; - - const domain = argv.domain; - - if (!domain) { - console.log('Missing required parameter: ' + chalk.red('[domain]')); - return; - } - - // Queue URLs from urls-file if provided. - urlsdata = []; - if (argv['urls-file'] && argv['urls-file'].length > 0) { - try { - urlsdata = JSON.parse(fs.readFileSync(argv['urls-file'])); - } catch (error) { - console.log(chalk.bold.red('❌ ERROR: Cannot read urls-file: ' + argv['urls-file'])); - process.exit(1); - } - } - - crawl = crawler(domain); - crawl.interval = argv.interval; - crawl.decodeResponses = true; - crawl.maxResourceSize = argv.size; // 256MB - crawl.maxConcurrency = argv.concurrency; - crawl.respectRobotsTxt = argv.robots; - crawl.acceptCookies = argv.cookies; - crawl.customHeaders = { - 'User-Agent': argv['user-agent'], - }; - - const quant = client(config); - - // Get the domain host. - let hostname = domain; - - if (hostname.indexOf('//') > -1) { - hostname = hostname.split('/')[2]; - } else { - hostname = hostname.split('/')[0]; - } - - // Prepare the hostname. - hostname = hostname.split(':')[0]; - hostname = hostname.split('?')[0]; - - crawl.domainWhitelist = [ - hostname, - ]; - - if (argv['extra-domains']) { - crawl.domainWhitelist.push(argv['extra-domains'].split(',').map((d) => d.trim())); - } - - const fetchCallback = async function(queueItem, responseBuffer, response) { - const extraItems = []; - - // Prepare the detectors - attempt to locate additional requests to add - // to the queue based on patterns in the DOMString. - - for (const [n, detector] of Object.entries(detectors)) { - if (detector.applies(response)) { - await detector.handler(responseBuffer, queueItem.host, queueItem.protocol).map((i) => extraItems.push(i)); - } - } - - extraItems.forEach((item) => crawl.queueURL(item, queueItem.referrer)); - - // Cheap strip of domain. - const url = queueItem.url.replace(domain, ''); - const buffer = Buffer.from(responseBuffer, 'utf8'); - - if (response.headers['content-type'] && response.headers['content-type'].includes('text/html')) { - let content = buffer.toString(); - - - for (const [name, filter] of Object.entries(filters)) { - if (!argv.hasOwnProperty(filter.option)) { - // Filters must have an option to toggle them - if the option is - // not defined we skip this filter. - continue; - } - if (argv[filter.option]) { - content = filter.handler(content, queueItem, argv); - } - } - console.log(chalk.bold.green('✅ MARKUP:') + ` ${url}`); - - try { - await quant.markup(Buffer.from(content), url, true, argv.attachments); - } catch (err) {} - } else { - // @TODO: Identify why the file needs to be downloaded twice is - - // it looks to only affect some files, it seems PNG is affected but - // not all files. - const tmpfile = tmp.fileSync(); - const file = fs.createWriteStream(tmpfile.name); - const response = await axios.get(queueItem.url, { responseBuffer: 'arrayBuffer' }); - - if (!response.data || response.data.byteLength < 50) { - queueItem.status = 'failed'; - file.close(); - } - - const asset = Buffer.from(response.data, 'utf8'); - const extraHeaders = {}; - - fs.writeFileSync(tmpfile.name, asset); - - // Disposition headers. - ['content-disposition', 'content-type'].map((i) => { - if (Object.keys(queueItem.stateData.headers).includes(i)) { - extraHeaders[i] = queueItem.stateData.headers[i]; - } - }); - - console.log(chalk.bold.green('✅ FILE:') + ` ${url}`); - try { - await quant.file(tmpfile.name, url, true, extraHeaders); - } catch (err) { - console.log(err); - } - - // Remove temporary file immediately. - fs.unlinkSync(tmpfile.name); - } - count++; - }; - - if (hostname.startsWith('www.')) { - crawl.domainWhitelist.push(hostname.slice(4)); - } - - crawl.on('complete', function() { - console.log(chalk.bold.green('✅ All done! ') + ` ${count} total items.`); - console.log(chalk.bold.green('Failed items:')); - console.log(failures); - write(crawl, filename); - }); - - // Handle sending redirects to the Quant API. - crawl.on('fetchredirect', (item, redirect, response) => redirectHandler(quant, item, redirect)); - - // Capture errors. - crawl.on('fetcherror', function(queueItem, response) { - console.log(chalk.bold.red('❌ ERROR:') + ` ${queueItem.stateData.code} for ${queueItem.url}`); - failures.push({'code': queueItem.stateData.code, 'url': queueItem.url}); - if (queueItem.stateData.code == 403) { - console.log('403'); - } - }); - - crawl.on('fetch404', async function(queueItem, response) { - if (argv['seed-notfound']) { - response.on('data', async function(buffer) { - await fetchCallback(queueItem, buffer, response); - }); - } - }); - - crawl.on('fetchcomplete', async function(queueItem, responseBuffer, response) { - await fetchCallback(queueItem, responseBuffer, response); - }); - - if (!argv['skip-resume']) { - let result; - - if (!fs.existsSync(`${os.homedir()}/.quant/${filename}`)) { - result = {resume: false}; - } else if (!argv['no-interaction']) { - prompt.start(); - result = await prompt.get({ - properties: { - resume: { - required: true, - description: 'Resume from the previous crawl?', - default: true, - type: 'boolean', - }, - }, - }); - } else { - result = {resume: true}; - } - - if (result.resume) { - // Prevent manual URL list when resuming. - if (urlsdata.length > 0) { - console.log(chalk.bold.green('❌ ERROR: Cannot use --urls-file while resuming, ignoring.')); - urlsdata = []; - } - - // Defrost is async and supports non-existent files. - crawl.queue.defrost(`${os.homedir()}/.quant/${filename}`, (err) => { - console.log(chalk.bold.green('✅ DONE: Loaded resume state from ' + `${os.homedir()}/.quant/${filename}`)); - }); - } - } else { - console.log(chalk.bold.green('Skipping resume state via --skip-resume.')); - } - - // Inject URLs provided via urls-file. - if (urlsdata.length > 0) { - for (const url of urlsdata) { - crawl.queueURL(url); - } - } - - crawl.start(); -}; - -module.exports = command; diff --git a/src/commands/delete.js b/src/commands/delete.js index 77a92c4..3d40c0d 100644 --- a/src/commands/delete.js +++ b/src/commands/delete.js @@ -2,72 +2,73 @@ * Delete content from the Quant API. * * @usage - * quant delete + * quant delete */ -const chalk = require('chalk'); +const { text, confirm, isCancel } = require('@clack/prompts'); +const color = require('picocolors'); const config = require('../config'); const client = require('../quant-client'); -const yargs = require('yargs'); -const prompt = require('prompt'); -const command = {}; +const command = { + command: 'delete ', + describe: 'Delete a deployed path from Quant', + + builder: (yargs) => { + return yargs + .positional('path', { + describe: 'Deployed asset path to remove', + type: 'string' + }) + .option('force', { + alias: 'f', + type: 'boolean', + description: 'Delete the asset without confirmation' + }); + }, -command.command = 'delete [force]'; -command.describe = 'Delete a deployed path from Quant'; -command.builder = (yargs) => { - yargs.positional('path', { - describe: 'Deployed asset path to remove', - type: 'string', - }); - yargs.option('force', { - alias: 'f', - type: 'boolean', - description: 'Delete the asset without interaction.', - }); -}; + async promptArgs() { + const path = await text({ + message: 'Enter the deployed asset path to remove', + validate: value => !value ? 'Path is required' : undefined + }); -command.handler = async (argv) => { - const path = argv.path; + if (isCancel(path)) return null; - console.log(chalk.bold.green('*** Quant delete ***')); + const shouldDelete = await confirm({ + message: 'This will delete all revisions of this asset from QuantCDN. Are you sure?', + initialValue: false + }); - if (!config.fromArgs(argv)) { - console.log(chalk.yellow('Quant is not configured, run init.')); - yargs.exit(1); - } + if (isCancel(shouldDelete) || !shouldDelete) return null; - if (!argv.force) { - prompt.start(); - const schema = { - properties: { - force: { - required: true, - description: 'This will delete all revisions of an asset from QuantCDN', - pattern: /(y|yes|n|no)/, - default: 'no', - message: 'Only yes or no is allowed.', - }, - }, - }; + return { path }; + }, - const {force} = await prompt.get(schema); - if (!force) { - console.log(chalk.yellow('[skip]:') + ` delete skipped for (${path})`); - yargs.exit(0); + async handler(args) { + if (!args) { + throw new Error('Operation cancelled'); + } + + if (!await config.fromArgs(args)) { + process.exit(1); } - } - const quant = client(config); + // If not in force mode and not coming from interactive prompt, confirm + if (!args.force && !args._interactiveMode) { + console.log(color.yellow('This will delete all revisions of this asset from QuantCDN')); + console.log(color.yellow('Use --force to skip this warning')); + process.exit(0); + } - try { - await quant.delete(path); - } catch (err) { - console.log(chalk.red('[error]:') + ` Cannot delete path (${path})\n` + err.message); - yargs.exit(1); + const quant = client(config); + try { + await quant.delete(args.path); + return `Successfully removed [${args.path}]`; + } catch (err) { + throw new Error(`Cannot delete path (${args.path}): ${err.message}`); + } } - - console.log(chalk.green(`Successfully removed [${path}]`)); }; module.exports = command; diff --git a/src/commands/deploy.js b/src/commands/deploy.js index 390bf21..15488bb 100644 --- a/src/commands/deploy.js +++ b/src/commands/deploy.js @@ -1,212 +1,144 @@ -/** - * Deploy the configured build directory to QuantCDN. - * - * @usage - * quant deploy - */ -const chalk = require('chalk'); +const { text, confirm, isCancel, select } = require('@clack/prompts'); +const color = require('picocolors'); const config = require('../config'); const client = require('../quant-client'); const getFiles = require('../helper/getFiles'); -const normalizePaths = require('../helper/normalizePaths'); const path = require('path'); -const yargs = require('yargs'); const md5File = require('md5-file'); -const {chunk} = require('../helper/array'); -const quantUrl = require('../helper/quant-url'); +const { chunk } = require('../helper/array'); const revisions = require('../helper/revisions'); -const {sep} = require('path'); - -const command = {}; - -command.command = 'deploy [dir]'; -command.describe = 'Deploy the output of a static generator'; -command.builder = (yargs) => { - yargs.positional('dir', { - describe: 'Optional location of build artefacts ', - type: 'string', - default: null, - }); - yargs.options('attachments', { - describe: 'Find attachments', - alias: 'a', - type: 'boolean', - default: false, - }); - yargs.options('skip-unpublish', { - describe: 'Skip the automatic unpublish process', - alias: 'u', - type: 'boolean', - default: false, - }); - yargs.options('skip-unpublish-regex', { - describe: 'Skip the unpublish process for specific regex', - type: 'string', - }); - yargs.options('skip-purge', { - describe: 'Skip the automatic cache purge process', - alias: 'sp', - type: 'boolean', - default: false, - }); - yargs.option('chunk-size', { - describe: 'Control the chunk-size for concurrency', - alias: 'cs', - type: 'integer', - default: 10, - }); - yargs.option('force', { - describe: 'Force the deployment (ignore md5 match)', - alias: 'f', - type: 'boolean', - default: false, - }); - yargs.option('enable-index-html', { - describe: 'Push index.html files with page assets', - alias: 'h', - type: 'boolean', - default: false, - }); - yargs.option('revision-log', { - describe: 'Directory for the revision log file', - alias: 'r', - type: 'string', - }); -}; - -command.handler = async function(argv) { - let files; - - console.log(chalk.bold.green('*** Quant deploy ***')); - - // Make sure configuration is loaded. - if (!config.fromArgs(argv)) { - console.log(chalk.yellow('Quant is not configured, run init.')); - yargs.exit(1); - } - - const dir = argv.dir || config.get('dir'); - const p = path.resolve(process.cwd(), dir); - const quant = client(config); - - // Prepare local revision support. - revisions.enabled(argv.r !== undefined); - revisions.load(argv.r + sep + config.get('project')); - - try { - await quant.ping(); - } catch (err) { - console.log('Unable to connect to Quant\n' + chalk.red(err.message)); - yargs.exit(1); - } - try { - files = await getFiles(p); - } catch (err) { - console.log(chalk.red(err.message)); - yargs.exit(1); - } - - // Chunk the files array into smaller pieces to handle - // concurrency with the api requests. - if (argv['chunk-size'] > 20) { - argv['chunk-size'] = 20; - } - files = chunk(files, argv['chunk-size']); - for (let i = 0; i < files.length; i++) { - await Promise.all(files[i].map(async (file) => { - const md5 = md5File.sync(file); - let filepath = path.relative(p, file); - let revision = false; - filepath = normalizePaths(filepath); - - if (revisions.enabled()) { - if (revisions.has(filepath, md5)) { - console.log(chalk.blue(`Published version is up-to-date (${filepath})`)); - return; - } - } else { - try { - revision = await quant.revisions(filepath); - } catch (err) {} - if (revision && revision.md5 == md5) { - console.log(chalk.blue(`Published version is up-to-date (${filepath})`)); - return; +const command = { + command: 'deploy [dir]', + describe: 'Deploy the output of a static generator', + + builder: (yargs) => { + return yargs + .positional('dir', { + describe: 'Location of build artifacts', + type: 'string', + default: null + }) + .option('attachments', { + alias: 'a', + type: 'boolean', + description: 'Find attachments', + default: false + }) + .option('skip-unpublish', { + alias: 'u', + type: 'boolean', + description: 'Skip the automatic unpublish process', + default: false + }) + .option('chunk-size', { + alias: 'cs', + type: 'number', + description: 'Control the chunk-size for concurrency', + default: 10 + }) + .option('force', { + alias: 'f', + type: 'boolean', + description: 'Force the deployment (ignore md5 match)', + default: false + }); + }, + + async promptArgs() { + const dir = await text({ + message: 'Enter the build directory to deploy', + defaultValue: config.get('dir') || 'build' + }); + + if (isCancel(dir)) return null; + + const attachments = await confirm({ + message: 'Find attachments?', + initialValue: false + }); + + if (isCancel(attachments)) return null; + + const skipUnpublish = await confirm({ + message: 'Skip the automatic unpublish process?', + initialValue: false + }); + + if (isCancel(skipUnpublish)) return null; + + const chunkSize = await text({ + message: 'Enter chunk size for concurrency (1-20)', + defaultValue: '10', + validate: value => { + const num = parseInt(value); + if (isNaN(num) || num < 1 || num > 20) { + return 'Please enter a number between 1 and 20'; } } + }); + + if (isCancel(chunkSize)) return null; + + return { + dir, + attachments, + 'skip-unpublish': skipUnpublish, + 'chunk-size': parseInt(chunkSize), + force: false // Could add this as a prompt if needed + }; + }, + + async handler(args) { + if (!args) { + throw new Error('Operation cancelled'); + } - try { - const meta = await quant.send(file, filepath, true, argv.attachments, argv['skip-purge'], argv['enable-index-html']); - revisions.store(meta); - } catch (err) { - revisions.store({url: filepath, md5}); - console.log(chalk.yellow(err.message + ` (${filepath})`)); - return; - } - console.log(chalk.bold.green('✅') + ` ${filepath}`); - })); - } - - revisions.save(); - - if (argv['skip-unpublish']) { - console.log(chalk.yellow(' -> Skipping the automatic unpublish process')); - yargs.exit(0); - } - - try { - data = await quant.meta(true); - } catch (err) { - console.log(chalk.yellow(err.message)); - } - - // Quant meta returns relative paths, so we map our local filesystem - // to relative URL paths so that we can do a simple [].includes to - // determine if we need to unpublish the URL. - const relativeFiles = []; - for (let i = 0; i < files.length; i++) { - // Quant URLs are all lowercase, relative paths need to be made lc for comparison. - await Promise.all(files[i].map((item) => { - relativeFile = argv['enable-index-html'] ? `/${path.relative(p, item).toLowerCase()}` : quantUrl.prepare(path.relative(p, item)); - relativeFiles.push(relativeFile); - })); - } - - if (!data || ! 'records' in data) { - // The API doesn't return meta data if nothing has previously been - // pushed for the project. - return; - } + if (!await config.fromArgs(args)) { + process.exit(1); + } - data.records.map(async (item) => { - const f = quantUrl.prepare(item.url); + const p = path.resolve(process.cwd(), args.dir); + const quant = client(config); - if (relativeFiles.includes(item.url) || relativeFiles.includes(f)) { - return; + try { + await quant.ping(); + } catch (err) { + throw new Error(`Unable to connect to Quant: ${err.message}`); } - if (item.type && item.type == 'redirect') { - // @todo: support redirects with deploy. - return; + let files; + try { + files = await getFiles(p); + } catch (err) { + throw new Error(err.message); } - try { - // Skip unpublish process if skip unpublish regex matches. - if (argv['skip-unpublish-regex']) { - const match = item.url.match(argv['skip-unpublish-regex']); - if (match) { - console.log(chalk.blue(`Skipping unpublish via regex match: (${item.url})`)); - return; + // Process files in chunks + files = chunk(files, args['chunk-size']); + for (let i = 0; i < files.length; i++) { + await Promise.all(files[i].map(async (file) => { + const md5 = md5File.sync(file); + const filepath = path.relative(p, file); + + try { + const meta = await quant.send( + file, + filepath, + true, + args.attachments, + args['skip-purge'], + args['enable-index-html'] + ); + return `Deployed ${filepath}`; + } catch (err) { + throw new Error(`Failed to deploy ${filepath}: ${err.message}`); } - } - await quant.unpublish(item.url); - } catch (err) { - return console.log(chalk.yellow(err.message + ` (${item.url})`)); + })); } - console.log(chalk.bold.green('✅') + ` ${item.url} unpublished.`); - }); - + return 'Deployment completed successfully'; + } }; module.exports = command; diff --git a/src/commands/file.js b/src/commands/file.js index 5964ff6..da6b4fd 100644 --- a/src/commands/file.js +++ b/src/commands/file.js @@ -7,43 +7,70 @@ * @usage * quant file */ +const { text, confirm, isCancel } = require('@clack/prompts'); +const color = require('picocolors'); const config = require('../config'); const client = require('../quant-client'); -const chalk = require('chalk'); -const util = require('util'); - -const command = {}; - -command.command = 'file '; -command.describe = 'Deploy a single asset'; -command.builder = (yargs) => { - yargs.positional('file', { - describe: 'Path to local file', - type: 'string', - }); - yargs.positional('location', { - describe: 'The access URI', - type: 'string', - }); -}; -command.handler = function(argv) { - const filepath = argv.file; - const location = argv.location; +const command = { + command: 'file ', + describe: 'Deploy a single asset', + + builder: (yargs) => { + return yargs + .positional('file', { + describe: 'Path to local file', + type: 'string' + }) + .positional('location', { + describe: 'The access URI', + type: 'string' + }); + }, - // @TODO: Support dir. - if (!config.fromArgs(argv)) { - return console.error(chalk.yellow('Quant is not configured, run init.')); - } + async promptArgs() { + const file = await text({ + message: 'Enter path to local file', + validate: value => !value ? 'File path is required' : undefined + }); - console.log(chalk.bold.green('*** Quant file ***')); + if (isCancel(file)) return null; - client(config).file(filepath, location) - .then((body) => console.log(chalk.green('Success: ') + ` Added [${filepath}]`)) - .catch((err) => { - msg = util.format(chalk.yellow('File [%s] exists at location (%s)'), filepath, location); - console.log(msg); - }); + const location = await text({ + message: 'Enter the access URI (where the file will be available)', + validate: value => !value ? 'Location is required' : undefined + }); + + if (isCancel(location)) return null; + + return { file, location }; + }, + + async handler(args) { + if (!args) { + throw new Error('Operation cancelled'); + } + + if (!args.file || !args.location) { + const promptedArgs = await this.promptArgs(); + if (!promptedArgs) { + throw new Error('Operation cancelled'); + } + args = { ...args, ...promptedArgs }; + } + + if (!await config.fromArgs(args)) { + process.exit(1); + } + + const quant = client(config); + try { + await quant.file(args.file, args.location); + return `Added [${args.file}]`; + } catch (err) { + throw new Error(`File [${args.file}] exists at location (${args.location})`); + } + } }; module.exports = command; diff --git a/src/commands/info.js b/src/commands/info.js index 0df306e..b176258 100644 --- a/src/commands/info.js +++ b/src/commands/info.js @@ -4,61 +4,64 @@ * @usage * quant info */ -const chalk = require('chalk'); -const client = require('../quant-client'); +const { isCancel } = require('@clack/prompts'); +const color = require('picocolors'); const config = require('../config'); +const client = require('../quant-client'); -const command = {}; - -command.command = 'info'; -command.describe = 'Give info based on current configuration'; -command.builder = {}; - -command.handler = function(argv) { - console.log(chalk.bold.green('*** Quant info ***')); +const command = { + describe: 'Show information about current configuration', + + async promptArgs() { + // No arguments needed for info command + return {}; + }, - if (!config.fromArgs(argv)) { - return console.error(chalk.yellow('Quant is not configured, run init.')); - } + async handler(args) { + if (!await config.fromArgs(args)) { + process.exit(1); + } - console.log(`Endpoint: ${config.get('endpoint')}`); - console.log(`Customer: ${config.get('clientid')}`); - console.log(`Project: ${config.get('project')}`); - console.log(`Token: ****`); + const quant = client(config); + + try { + await quant.ping(); + } catch (err) { + throw new Error(`Unable to connect to quant: ${err.message}`); + } - const quant = client(config); + const info = { + endpoint: config.get('endpoint'), + customer: config.get('clientid'), + project: config.get('project'), + token: '****' + }; - quant.ping() - .then(async (data) => { - console.log(chalk.bold.green(`✅✅✅ Successfully connected to ${config.get('project')}`)); + try { + const meta = await quant.meta(); + if (meta && meta.total_records) { + const totals = { content: 0, redirects: 0 }; + + if (meta.records) { + meta.records.forEach(item => { + if (item.type && item.type === 'redirect') { + totals.redirects++; + } else { + totals.content++; + } + }); + } - quant.meta() - .then((data) => { - console.log(chalk.yellow('\nInfo:')); - if (data && data.total_records) { - console.log(`Total records: ${data.total_records}`); - const totals = {'content': 0, 'redirects': 0}; + info.totalRecords = meta.total_records; + info.contentItems = totals.content; + info.redirects = totals.redirects; + } + } catch (err) { + info.error = 'Could not fetch metadata'; + } - if (data.records) { - data.records.map(async (item) => { - if (item.type && item.type == 'redirect') { - totals.redirects++; - } else { - totals.content++; - } - }); - console.log(` - content: ${totals.content}`); - console.log(` - redirects: ${totals.redirects}`); - } - } else { - console.log('Use deploy to start seeding!'); - } - }) - .catch((err) => { - console.error(chalk.red(err.message)); - }); - }) - .catch((err) => console.log(chalk.bold.red(`Unable to connect to quant ${err.message}`))); + return info; + } }; module.exports = command; diff --git a/src/commands/init.js b/src/commands/init.js index fcd73b5..355920b 100644 --- a/src/commands/init.js +++ b/src/commands/init.js @@ -1,98 +1,137 @@ -/** - * Prepare the QuantCDN configuration file. - * - * This uses a wizard or allows you to pass in with options. - * - * @TODO: allow partial options/wizard. - * - * @usage - * quant init - * quant init -t -c -e -d - */ -const chalk = require('chalk'); -const prompt = require('prompt'); - +const { text, password, confirm, isCancel } = require('@clack/prompts'); +const color = require('picocolors'); const config = require('../config'); const client = require('../quant-client'); +const fs = require('fs'); -const command = {}; +const command = { + command: 'init', + describe: 'Initialize a project in the current directory', + + builder: (yargs) => { + return yargs + .option('dir', { + alias: 'd', + describe: 'Directory containing static assets', + type: 'string', + default: 'build' + }) + .option('clientid', { + alias: 'c', + describe: 'Project customer id for QuantCDN', + type: 'string' + }) + .option('project', { + alias: 'p', + describe: 'Project name for QuantCDN', + type: 'string' + }) + .option('token', { + alias: 't', + describe: 'Project token for QuantCDN', + type: 'string' + }); + }, -command.command = 'init'; -command.describe = 'Initialise a project in the current directory'; + async promptArgs() { + const clientid = await text({ + message: 'Enter QuantCDN client id', + validate: value => { + if (!value) return 'Client ID is required'; + if (!/^[a-zA-Z0-9\-\_]+$/.test(value)) { + return 'Client ID must contain only letters, numbers, underscores or dashes'; + } + } + }); -command.builder = (yargs) => { - yargs.option('dir', { - alias: 'd', - describe: 'Built asset directory', - type: 'string', - default: 'build', - }); + if (isCancel(clientid)) return null; - return yargs; -}; + const project = await text({ + message: 'Enter QuantCDN project', + validate: value => { + if (!value) return 'Project is required'; + if (!/^[a-zA-Z0-9\-]+$/.test(value)) { + return 'Project must contain only letters, numbers or dashes'; + } + } + }); -command.handler = function(argv) { - const token = Array.isArray(argv.token) ? argv.token.pop() : argv.token; - const clientid = Array.isArray(argv.clientid) ? argv.clientid.pop() : argv.clientid; - const endpoint = Array.isArray(argv.endpoint) ? argv.endpoint.pop() : argv.endpoint; - const project = Array.isArray(argv.project) ? argv.project.pop() : argv.project; - const dir = Array.isArray(argv.dir) ? argv.dir.pop() : argv.dir; - - console.log(chalk.bold.green('*** Initialise Quant ***')); - - if (!token || !clientid || !project) { - const schema = { - properties: { - endpoint: { - required: true, - description: 'Enter QuantCDN endpoint', - default: 'https://api.quantcdn.io', - }, - clientid: { - pattern: /^[a-zA-Z0-9\-\_]+$/, - message: 'Client id must be only letters, numbers, underscores or dashes', - required: true, - description: 'Enter QuantCDN client id', - }, - project: { - pattern: /^[a-zA-Z0-9\-]+$/, - message: 'Project must be only letters, numbers or dashes', - required: true, - description: 'Enter QuantCDN project', - }, - token: { - hidden: true, - replace: '*', - required: true, - description: 'Enter QuantCDN project token', - }, - bearer: { - hidden: true, - replace: '*', - required: false, - description: 'Enter an optional QuantCDN API token', - }, - dir: { - required: true, - description: 'Directory containing static assets', - default: 'build', - }, - }, - }; - prompt.start(); - prompt.get(schema, function(err, result) { - config.set(result); - config.save(); - client(config).ping(config) - .then((message) => console.log(chalk.bold.green(`✅✅✅ Successfully connected to ${message.project}`))) - .catch((message) => console.log(chalk.bold.red(`Unable to connect to quant ${message.project}`))); + if (isCancel(project)) return null; + + const token = await password({ + message: 'Enter QuantCDN project token', + validate: value => !value ? 'Token is required' : undefined + }); + + if (isCancel(token)) return null; + + const bearer = await password({ + message: 'Enter an optional QuantCDN API token (press Enter to skip)', + }); + + if (isCancel(bearer)) return null; + + const dir = await text({ + message: 'Directory containing static assets', + defaultValue: 'build' }); - } else { - config.set({clientid, project, token, endpoint, dir}); + + if (isCancel(dir)) return null; + + return { + endpoint: 'https://api.quantcdn.io', + clientid, + project, + token, + bearer: bearer || undefined, + dir + }; + }, + + async handler(args) { + if (!args) { + throw new Error('Operation cancelled'); + } + + // If any required fields are missing, go into interactive mode + if (!args.clientid || !args.project || !args.token) { + const promptedArgs = await this.promptArgs(); + if (!promptedArgs) { + throw new Error('Operation cancelled'); + } + args = { ...args, ...promptedArgs }; + } + + const config_args = { + endpoint: 'https://api.quantcdn.io', + clientid: args.clientid, + project: args.project, + token: args.token, + bearer: args.bearer, + dir: args.dir || 'build' + }; + + // Validate we have all required fields before saving + if (!config_args.clientid || !config_args.project || !config_args.token) { + throw new Error('Missing required configuration fields'); + } + + config.set(config_args); config.save(); - client(config).ping(config) - .then((message) => console.log(chalk.bold.green(`✅✅✅ Successfully connected to ${message.project}`))) - .catch((message) => console.log(chalk.bold.red(`Unable to connect to quant ${message.project}`))); + + const _client = client(config); + try { + const message = await _client.ping(config); + return `Successfully connected to ${message.project}`; + } catch (error) { + // If save failed, clean up the incomplete config file + try { + fs.unlinkSync('quant.json'); + } catch (e) { + // Ignore error if file doesn't exist + } + throw new Error(`Unable to connect to quant: ${error.message}`); + } } }; diff --git a/src/commands/page.js b/src/commands/page.js index 03375c8..0b59be4 100644 --- a/src/commands/page.js +++ b/src/commands/page.js @@ -7,39 +7,71 @@ * @usage * quant page */ +const { text, isCancel } = require('@clack/prompts'); +const color = require('picocolors'); const config = require('../config'); const client = require('../quant-client'); -const chalk = require('chalk'); - -const command = {}; - -command.command = 'page '; -command.describe = 'Make a local page asset available via Quant'; -command.builder = (yargs) => { - yargs.positional('file', { - describe: 'Path to local file', - type: 'string', - }); - yargs.positional('location', { - describe: 'The access URI', - type: 'string', - }); -}; -command.handler = function(argv) { - const filepath = argv.file; - const location = argv.location; +const command = { + command: 'page ', + describe: 'Make a local page asset available via Quant', + + builder: (yargs) => { + return yargs + .positional('file', { + describe: 'Path to local HTML file', + type: 'string' + }) + .positional('location', { + describe: 'The access URI', + type: 'string' + }); + }, - console.log(chalk.bold.green('*** Quant page ***')); + async promptArgs() { + const file = await text({ + message: 'Enter path to local HTML file', + validate: value => !value ? 'File path is required' : undefined + }); - // @TODO: add dir support. - if (!config.fromArgs(argv)) { - return console.error(chalk.yellow('Quant is not configured, run init.')); - } + if (isCancel(file)) return null; + + const location = await text({ + message: 'Enter the access URI (where the page will be available)', + validate: value => !value ? 'Location is required' : undefined + }); + + if (isCancel(location)) return null; + + return { file, location }; + }, - client(config).markup(filepath, location) - .then((body) => console.log(chalk.green('Success: ') + ` Added [${filepath}]`)) - .catch((err) => console.log(chalk.red.bold('Error:') + ` ${err}`)); + async handler(args) { + if (!args) { + throw new Error('Operation cancelled'); + } + + // Check for required arguments and prompt if missing + if (!args.file || !args.location) { + const promptedArgs = await this.promptArgs(); + if (!promptedArgs) { + throw new Error('Operation cancelled'); + } + args = { ...args, ...promptedArgs }; + } + + if (!await config.fromArgs(args)) { + process.exit(1); + } + + const quant = client(config); + try { + await quant.markup(args.file, args.location); + return `Added [${args.file}]`; + } catch (err) { + throw new Error(`Failed to add page: ${err.message}`); + } + } }; module.exports = command; diff --git a/src/commands/proxy.js b/src/commands/proxy.js deleted file mode 100644 index c9735f7..0000000 --- a/src/commands/proxy.js +++ /dev/null @@ -1,66 +0,0 @@ -/** - * Proxy a route in QuantCDN to an origin. - * - * @usage - * quant proxy --status --basicAuthUser --basicAuthPass - */ -const chalk = require('chalk'); -const config = require('../config'); -const client = require('../quant-client'); - -const command = {}; - -command.command = 'proxy [status] [basicAuthUser] [basicAuthPass]'; -command.describe = 'Create a proxy to allow traffic directly to origin'; -command.builder = (yargs) => { - yargs.positional('path', { - describe: 'The path that end users will see', - type: 'string', - }); - - yargs.positional('origin', { - describe: 'FQDN including path to proxy to', - type: 'string', - }); - - yargs.positional('status', { - describe: 'If the proxy is enabled', - type: 'boolean', - default: true, - }); - - yargs.positional('basicAuthUser', { - describe: 'User between edge and origin', - type: 'string', - default: null, - }); - - yargs.positional('basicAuthPass', { - describe: 'Password between edge and origin', - type: 'string', - default: null, - }); - - return yargs; -}; - -command.handler = function(argv) { - const url = argv.path; - const dest = argv.origin; - const status = argv.status; - const user = argv.basicAuthUser; - const pass = argv.basicAuthPass; - - // @TODO: Accept argv.dir. - if (!config.fromArgs(argv)) { - return console.error(chalk.yellow('Quant is not configured, run init.')); - } - - console.log(chalk.bold.green('*** Quant proxy ***')); - - client(config).proxy(url, dest, status, user, pass) - .then((body) => console.log(chalk.green('Success: ') + ` Added proxy for ${url} to ${dest}`)) - .catch((err) => console.log(chalk.red.bold('Error:') + ` ${err}`)); -}; - -module.exports = command; diff --git a/src/commands/publish.js b/src/commands/publish.js index 14f39a6..5928b18 100644 --- a/src/commands/publish.js +++ b/src/commands/publish.js @@ -4,47 +4,84 @@ * @usage * quant publish */ -const chalk = require('chalk'); -const client = require('../quant-client'); +const { text, isCancel } = require('@clack/prompts'); +const color = require('picocolors'); const config = require('../config'); +const client = require('../quant-client'); -const command = {}; - -command.command = 'publish '; -command.describe = 'Publish an asset'; -command.builder = (yargs) => { - yargs.options('revision', { - describe: 'The revision id to publish', - alias: 'r', - type: 'string', - default: 'latest', - }); -}; +const command = { + command: 'publish ', + describe: 'Publish an asset', + + builder: (yargs) => { + return yargs + .positional('path', { + describe: 'Path to publish', + type: 'string' + }) + .option('revision', { + alias: 'r', + describe: 'The revision id to publish', + type: 'string', + default: 'latest' + }); + }, -command.handler = function(argv) { - console.log(chalk.bold.green('*** Quant publish ***')); + async promptArgs() { + const path = await text({ + message: 'Enter the path to publish', + validate: value => !value ? 'Path is required' : undefined + }); - // config.fromArgs(argv); - if (!config.fromArgs(argv)) { - return console.error(chalk.yellow('Quant is not configured, run init.')); - } + if (isCancel(path)) return null; + + const revision = await text({ + message: 'Enter revision ID (or press Enter for latest)', + defaultValue: 'latest' + }); + + if (isCancel(revision)) return null; + + return { path, revision }; + }, + + async handler(args) { + if (!args) { + throw new Error('Operation cancelled'); + } + + if (!args.path) { + const promptedArgs = await this.promptArgs(); + if (!promptedArgs) { + throw new Error('Operation cancelled'); + } + args = { ...args, ...promptedArgs }; + } + + if (!await config.fromArgs(args)) { + process.exit(1); + } + + const quant = client(config); - const _client = client(config); - - if (argv.revision == 'latest') { - _client.revisions(argv.path) - .then((res) => { - const revisionIds = Object.keys(res.revisions); - const latestRevision = Math.max(...revisionIds); - _client.publish(argv.path, latestRevision) - .then((res) => console.log(chalk.green('Success:') + ` Published successfully`)) - .catch((err) => console.log(chalk.red.bold('Error:') + ` ${err}`)); - }) - .catch((err) => console.log(chalk.red.bold('Error:') + ` ${err}`)); - } else { - _client.publish(argv.path, argv.revision) - .then((res) => console.log(chalk.green('Success:') + ` Published successfully`)) - .catch((err) => console.log(chalk.red.bold('Error:') + ` ${err}`)); + if (args.revision === 'latest') { + try { + const res = await quant.revisions(args.path); + const revisionIds = Object.keys(res.revisions); + const latestRevision = Math.max(...revisionIds); + await quant.publish(args.path, latestRevision); + return 'Published successfully'; + } catch (err) { + throw new Error(`Failed to publish: ${err.message}`); + } + } else { + try { + await quant.publish(args.path, args.revision); + return 'Published successfully'; + } catch (err) { + throw new Error(`Failed to publish: ${err.message}`); + } + } } }; diff --git a/src/commands/purge.js b/src/commands/purge.js index 2dccd4c..ac8cf5d 100644 --- a/src/commands/purge.js +++ b/src/commands/purge.js @@ -4,28 +4,59 @@ * @usage * quant unpublish */ -const chalk = require('chalk'); -const client = require('../quant-client'); +const { text, isCancel } = require('@clack/prompts'); +const color = require('picocolors'); const config = require('../config'); +const client = require('../quant-client'); -const command = {}; +const command = { + command: 'purge ', + describe: 'Purge the cache for a given URL', + + builder: (yargs) => { + return yargs + .positional('path', { + describe: 'Path to purge from cache', + type: 'string' + }); + }, -command.command = 'purge '; -command.describe = 'Purge the cache for a given url'; -command.builder = {}; + async promptArgs() { + const path = await text({ + message: 'Enter the path to purge from cache', + validate: value => !value ? 'Path is required' : undefined + }); -command.handler = function(argv) { - console.log(chalk.bold.green('*** Quant purge ***')); + if (isCancel(path)) return null; - // config.fromArgs(argv); - if (!config.fromArgs(argv)) { - return console.error(chalk.yellow('Quant is not configured, run init.')); - } + return { path }; + }, + + async handler(args) { + if (!args) { + throw new Error('Operation cancelled'); + } - client(config) - .purge(argv.path) - .then(response => console.log(chalk.green('Success:') + ` Purged ${argv.path}`)) - .catch((err) => console.log(chalk.red.bold('Error:') + ` ${err}`)); + if (!args.path) { + const promptedArgs = await this.promptArgs(); + if (!promptedArgs) { + throw new Error('Operation cancelled'); + } + args = { ...args, ...promptedArgs }; + } + + if (!await config.fromArgs(args)) { + process.exit(1); + } + + const quant = client(config); + try { + await quant.purge(args.path); + return `Purged ${args.path}`; + } catch (err) { + throw new Error(`Failed to purge: ${err.message}`); + } + } }; module.exports = command; diff --git a/src/commands/redirect.js b/src/commands/redirect.js index 8b8990a..6a84776 100644 --- a/src/commands/redirect.js +++ b/src/commands/redirect.js @@ -4,31 +4,101 @@ * @usage * quant redirect --status */ -const chalk = require('chalk'); +const { text, select, isCancel } = require('@clack/prompts'); +const color = require('picocolors'); const config = require('../config'); const client = require('../quant-client'); -const command = {}; +const command = { + command: 'redirect [status] [author]', + describe: 'Create a redirect', + + builder: (yargs) => { + return yargs + .positional('from', { + describe: 'Path to redirect from', + type: 'string' + }) + .positional('to', { + describe: 'Path to redirect to', + type: 'string' + }) + .positional('status', { + describe: 'HTTP status code (301 or 302)', + type: 'number', + default: 302 + }) + .positional('author', { + describe: 'Author of the redirect', + type: 'string' + }); + }, -command.command = 'redirect [status] [author]'; -command.describe = 'Create a redirect'; -command.builder = (yargs) => { - yargs.default('status', 302); - yargs.default('author', null); - return yargs; -}; + async promptArgs() { + const from = await text({ + message: 'Enter the path to redirect from', + validate: value => !value ? 'Source path is required' : undefined + }); -command.handler = function(argv) { - console.log(chalk.bold.green('*** Quant redirect ***')); + if (isCancel(from)) return null; - // @TODO: Accept argv.dir. - if (!config.fromArgs(argv)) { - return console.error(chalk.yellow('Quant is not configured, run init.')); - } + const to = await text({ + message: 'Enter the path to redirect to', + validate: value => !value ? 'Destination path is required' : undefined + }); + + if (isCancel(to)) return null; + + const status = await select({ + message: 'Select redirect type', + options: [ + { value: 301, label: '301 - Permanent redirect' }, + { value: 302, label: '302 - Temporary redirect' } + ], + initialValue: 302 + }); + + if (isCancel(status)) return null; + + const author = await text({ + message: 'Enter author name (optional)', + }); - client(config).redirect(argv.from, argv.to, argv.author, argv.status) - .then((body) => console.log(chalk.green('Success: ') + ` Added redirect ${from} to ${to}`)) - .catch((err) => console.log(chalk.red.bold('Error:') + ` ${err}`)); + if (isCancel(author)) return null; + + return { + from, + to, + status: parseInt(status), + author: author || null + }; + }, + + async handler(args) { + if (!args) { + throw new Error('Operation cancelled'); + } + + if (!args.from || !args.to) { + const promptedArgs = await this.promptArgs(); + if (!promptedArgs) { + throw new Error('Operation cancelled'); + } + args = { ...args, ...promptedArgs }; + } + + if (!await config.fromArgs(args)) { + process.exit(1); + } + + const quant = client(config); + try { + await quant.redirect(args.from, args.to, args.author, args.status); + return `Added redirect from ${args.from} to ${args.to}`; + } catch (err) { + throw new Error(`Failed to create redirect: ${err.message}`); + } + } }; module.exports = command; diff --git a/src/commands/scan.js b/src/commands/scan.js index 96094f4..bc9c1a5 100644 --- a/src/commands/scan.js +++ b/src/commands/scan.js @@ -1,118 +1,158 @@ /** - * Delete content from the Quant API. + * Validate local file checksums. * * @usage - * quant delete + * quant scan */ -const chalk = require('chalk'); +const { text, confirm, isCancel, select } = require('@clack/prompts'); +const color = require('picocolors'); const config = require('../config'); const client = require('../quant-client'); -const yargs = require('yargs'); const getFiles = require('../helper/getFiles'); const path = require('path'); const md5File = require('md5-file'); -const command = {}; - -command.command = 'scan'; -command.describe = 'Validate local file checksums'; -command.builder = (yargs) => { - yargs.options('diff-only', { - describe: 'Show only source files different from Quant', - type: 'boolean', - default: false, - }); - yargs.options('unpublish-only', { - describe: 'Show only the unpublished results', - type: 'boolean', - default: false, - }); - yargs.options('skip-unpublish-regex', { - describe: 'Skip the unpublish process for specific regex', - type: 'string', - }); -}; - -command.handler = async function(argv) { - config.fromArgs(argv); - const quant = client(config); - - // Determine local file path. - const dir = argv.dir || config.get('dir'); - const p = path.resolve(process.cwd(), dir); - - console.log(chalk.bold.green('*** Quant scan ***')); - - try { - data = await quant.meta(true); - } catch (err) { - console.log('Something is not right.'); - yargs.exit(1); - } +const command = { + command: 'scan', + describe: 'Validate local file checksums', + + builder: (yargs) => { + return yargs + .option('diff-only', { + describe: 'Show only source files different from Quant', + type: 'boolean', + default: false + }) + .option('unpublish-only', { + describe: 'Show only the unpublished results', + type: 'boolean', + default: false + }) + .option('skip-unpublish-regex', { + describe: 'Skip the unpublish process for specific regex', + type: 'string' + }); + }, + + async promptArgs() { + const showDiffOnly = await confirm({ + message: 'Show only source files different from Quant?', + initialValue: false + }); + + if (isCancel(showDiffOnly)) return null; + + const unpublishOnly = await confirm({ + message: 'Show only the unpublished results?', + initialValue: false + }); + + if (isCancel(unpublishOnly)) return null; + + const skipUnpublishRegex = await text({ + message: 'Enter regex pattern to skip unpublish (optional)', + }); + + if (isCancel(skipUnpublishRegex)) return null; + + return { + 'diff-only': showDiffOnly, + 'unpublish-only': unpublishOnly, + 'skip-unpublish-regex': skipUnpublishRegex || undefined + }; + }, + + async handler(args) { + if (!args) { + throw new Error('Operation cancelled'); + } - try { - files = await getFiles(p); - } catch (err) { - console.log(chalk.red(err.message)); - yargs.exit(1); - } + if (!args['diff-only'] && !args['unpublish-only'] && !args['skip-unpublish-regex']) { + const promptedArgs = await this.promptArgs(); + if (!promptedArgs) { + throw new Error('Operation cancelled'); + } + args = { ...args, ...promptedArgs }; + } - const relativeFiles = []; + if (!await config.fromArgs(args)) { + process.exit(1); + } - files.map(async (file) => { - const filepath = path.relative(p, file); - let revision = false; - relativeFiles.push(`/${filepath.toLowerCase()}`); + const quant = client(config); + const dir = config.get('dir') || 'build'; + const p = path.resolve(process.cwd(), dir); - if (argv['unpublish-only']) { - return; + let data; + try { + data = await quant.meta(true); + } catch (err) { + throw new Error('Failed to fetch metadata from Quant'); } + let files; try { - revision = await quant.revision(filepath); - } catch (err) {} - - if (!revision) { - console.log(`[info]: Unable to find ${filepath} in source.`); - return; + files = await getFiles(p); + } catch (err) { + throw new Error(err.message); } - const localmd5 = md5File.sync(file); - - if (revision.md5 == localmd5) { - if (!argv['diff-only']) { - console.log(chalk.green(`[info]: ${filepath} is up-to-date`)); - } - } else { - if (argv['diff-only']) { - console.log(chalk.yellow(`[info]: ${filepath} is different.`)); + const results = { + upToDate: [], + different: [], + notFound: [], + toUnpublish: [] + }; + + // Check local files + for (const file of files) { + const filepath = path.relative(p, file); + const relativeFile = `/${filepath.toLowerCase()}`; + + if (!args['unpublish-only']) { + try { + const revision = await quant.revision(filepath); + const localmd5 = md5File.sync(file); + + if (revision.md5 === localmd5) { + if (!args['diff-only']) { + results.upToDate.push(filepath); + } + } else { + results.different.push(filepath); + } + } catch (err) { + results.notFound.push(filepath); + } } } - }); - - data.records.map(async (item) => { - const f = item.url.replace('/index.html', '.html'); - if (relativeFiles.includes(item.url) || relativeFiles.includes(f)) { - return; - } + // Check remote files + data.records.forEach(item => { + const f = item.url.replace('/index.html', '.html'); + const relativeFiles = files.map(file => `/${path.relative(p, file).toLowerCase()}`); - if (item.type && item.type == 'redirect') { - return; - } + if (relativeFiles.includes(item.url) || relativeFiles.includes(f)) { + return; + } - // Skip unpublish process if skip unpublish regex matches. - if (argv['skip-unpublish-regex']) { - const match = item.url.match(argv['skip-unpublish-regex']); - if (match) { + if (item.type && item.type === 'redirect') { return; } - } - if (!argv['diff-only']) { - console.log(chalk.magenta(`[info]: ${item.url} is to be unpublished.`)); - } - }); + + if (args['skip-unpublish-regex']) { + const match = item.url.match(args['skip-unpublish-regex']); + if (match) { + return; + } + } + + results.toUnpublish.push(item.url); + }); + + return results; + } }; module.exports = command; diff --git a/src/commands/search.js b/src/commands/search.js index 7408c73..0e2800d 100644 --- a/src/commands/search.js +++ b/src/commands/search.js @@ -4,133 +4,134 @@ * @usage * quant search */ -const chalk = require('chalk'); -const client = require('../quant-client'); +const { text, select, confirm, isCancel } = require('@clack/prompts'); +const color = require('picocolors'); const config = require('../config'); +const client = require('../quant-client'); const fs = require('fs'); const glob = require('glob'); -const command = {}; - -command.command = 'search '; -command.describe = 'Perform search index operations'; -command.builder = (yargs) => { - // Add/update search records. - yargs.command('index', '', { - command: 'index ', - builder: (yargs) => { - yargs.positional('path', { +const command = { + command: 'search ', + describe: 'Perform search index operations', + + builder: (yargs) => { + return yargs + .positional('operation', { + describe: 'Operation to perform (status|index|unindex|clear)', type: 'string', - describe: 'Path to directory containing JSON files, or an individual JSON file.', + choices: ['status', 'index', 'unindex', 'clear'] + }) + .option('path', { + describe: 'Path to JSON file(s) for index/unindex operations', + type: 'string' + }) + .check((argv) => { + if ((argv.operation === 'index' || argv.operation === 'unindex') && !argv.path) { + throw new Error('Path is required for index and unindex operations'); + } + return true; }); - }, - handler: (argv) => { - if (!argv.path) { - console.error(chalk.yellow('No path provided. Provide a path on disk, e.g: --path=/path/to/files')); - return; + }, + + async promptArgs() { + const operation = await select({ + message: 'Select search operation', + options: [ + { value: 'status', label: 'Show search index status' }, + { value: 'index', label: 'Add/update search records' }, + { value: 'unindex', label: 'Remove item from search index' }, + { value: 'clear', label: 'Clear entire search index' } + ] + }); + + if (isCancel(operation)) return null; + + let additionalArgs = {}; + + switch (operation) { + case 'index': + const path = await text({ + message: 'Enter path to JSON file(s)', + validate: value => !value ? 'Path is required' : undefined + }); + if (isCancel(path)) return null; + additionalArgs.path = path; + break; + + case 'unindex': + const urlPath = await text({ + message: 'Enter URL path to remove from index', + validate: value => !value ? 'Path is required' : undefined + }); + if (isCancel(urlPath)) return null; + additionalArgs.path = urlPath; + break; + + case 'clear': + const confirmClear = await confirm({ + message: 'Are you sure you want to clear the entire search index?', + initialValue: false + }); + if (isCancel(confirmClear) || !confirmClear) return null; + break; + } + + return { + operation, + ...additionalArgs + }; + }, + + async handler(args) { + if (!args) { + throw new Error('Operation cancelled'); + } + + // Check for required arguments and prompt if missing + if (!args.operation || ((['index', 'unindex'].includes(args.operation)) && !args.path)) { + const promptedArgs = await this.promptArgs(); + if (!promptedArgs) { + throw new Error('Operation cancelled'); } + args = { ...args, ...promptedArgs }; + } - console.log(chalk.bold.green('*** Add/update search records ***')); + if (!await config.fromArgs(args)) { + process.exit(1); + } - if (!config.fromArgs(argv)) { - return console.error(chalk.yellow('Quant is not configured, run init.')); - } + const quant = client(config); - let jsonFiles = []; - fs.stat(argv.path, (error, stats) => { - // incase of error - if (error) { - console.error(error); - return; - } + switch (args.operation) { + case 'status': + const status = await quant.searchStatus(); + return status; + case 'index': + let jsonFiles = []; + const stats = fs.statSync(args.path); + if (stats.isDirectory()) { - jsonFiles = glob.sync(argv.path + '/*.json'); + jsonFiles = glob.sync(args.path + '/*.json'); } else { - jsonFiles = [argv.path]; + jsonFiles = [args.path]; } - for (let i = 0; i < jsonFiles.length; i++) { - client(config) - .searchIndex(jsonFiles[i]) - .then(response => console.log(chalk.green('Success:') + ` Successfully posted search records in ${jsonFiles[i]}`)) - .catch((err) => console.log(chalk.red.bold('Error:') + ` ${err}`)); + for (const file of jsonFiles) { + await quant.searchIndex(file); } - }); - }, - }); - - // Unindex/remove search record. - yargs.command('unindex', '', { - command: 'unindex ', - describe: 'Removes an item from the search index based on URL.', - builder: (yargs) => { - yargs.positional('path', { - type: 'string', - describe: 'URL path of the item to unindex.', - }); - }, - handler: (argv) => { - if (!argv.path) { - console.error(chalk.yellow('No path provided. Provide a content URL path to remove from index, e.g: /about-us')); - return; - } - - console.log(chalk.bold.green('*** Remove search record ***')); - - if (!config.fromArgs(argv)) { - return console.error(chalk.yellow('Quant is not configured, run init.')); - } - - client(config) - .searchRemove(argv.path) - .then(response => console.log(chalk.green('Success:') + ` Successfully removed search record for ${argv.path}`)) - .catch((err) => console.log(chalk.red.bold('Error:') + ` ${err}`)); - }, - }); - - // Display search index status. - yargs.command('status', '', { - command: 'status', - describe: 'Display search index status', - builder: (yargs) => { - }, - handler: (argv) => { - console.log(chalk.bold.green('*** Search index status ***')); - - if (!config.fromArgs(argv)) { - return console.error(chalk.yellow('Quant is not configured, run init.')); - } + return `Successfully indexed ${jsonFiles.length} file(s)`; - client(config) - .searchStatus() - .then(response => { - console.log(chalk.green('Success:') + ` Successfully retrieved search index status`); - console.log(response); - }) - .catch((err) => console.log(chalk.red.bold('Error:') + ` ${err}`)); - }, - }); - - // Clear the entire search index. - yargs.command('clear', '', { - command: 'clear', - describe: 'Clears the entire search index', - builder: (yargs) => { - }, - handler: (argv) => { - console.log(chalk.bold.green('*** Clear search index ***')); - - if (!config.fromArgs(argv)) { - return console.error(chalk.yellow('Quant is not configured, run init.')); - } + case 'unindex': + await quant.searchRemove(args.path); + return `Successfully removed ${args.path} from search index`; - client(config) - .searchClearIndex() - .then(response => console.log(chalk.green('Success:') + ` Successfully cleared search index`)) - .catch((err) => console.log(chalk.red.bold('Error:') + ` ${err}`)); - }, - }); + case 'clear': + await quant.searchClearIndex(); + return 'Successfully cleared search index'; + } + } }; module.exports = command; diff --git a/src/commands/unpublish.js b/src/commands/unpublish.js index f686e2a..85f4243 100644 --- a/src/commands/unpublish.js +++ b/src/commands/unpublish.js @@ -4,28 +4,80 @@ * @usage * quant unpublish */ -const chalk = require('chalk'); -const client = require('../quant-client'); +const { text, confirm, isCancel } = require('@clack/prompts'); +const color = require('picocolors'); const config = require('../config'); +const client = require('../quant-client'); -const command = {}; +const command = { + command: 'unpublish ', + describe: 'Unpublish an asset', + + builder: (yargs) => { + return yargs + .positional('path', { + describe: 'Path to unpublish', + type: 'string' + }) + .option('force', { + alias: 'f', + describe: 'Skip confirmation prompt', + type: 'boolean', + default: false + }); + }, -command.command = 'unpublish '; -command.describe = 'Unpublish an asset'; -command.builder = {}; + async promptArgs() { + const path = await text({ + message: 'Enter the path to unpublish', + validate: value => !value ? 'Path is required' : undefined + }); -command.handler = function(argv) { - console.log(chalk.bold.green('*** Quant unpublish ***')); + if (isCancel(path)) return null; - // config.fromArgs(argv); - if (!config.fromArgs(argv)) { - return console.error(chalk.yellow('Quant is not configured, run init.')); - } + const confirmUnpublish = await confirm({ + message: 'Are you sure you want to unpublish this asset?', + initialValue: false + }); + + if (isCancel(confirmUnpublish) || !confirmUnpublish) return null; + + return { path }; + }, - client(config) - .unpublish(argv.path) - .then(response => console.log(chalk.green('Success:') + ` Unpublished successfully`)) - .catch((err) => console.log(chalk.red.bold('Error:') + ` ${err}`)); + async handler(args) { + if (!args) { + throw new Error('Operation cancelled'); + } + + // Check for required arguments and prompt if missing + if (!args.path) { + const promptedArgs = await this.promptArgs(); + if (!promptedArgs) { + throw new Error('Operation cancelled'); + } + args = { ...args, ...promptedArgs }; + } + + if (!await config.fromArgs(args)) { + process.exit(1); + } + + // If not in force mode and not coming from interactive prompt, confirm + if (!args.force && !args._interactiveMode) { + console.log(color.yellow('This will unpublish the asset from QuantCDN')); + console.log(color.yellow('Use --force to skip this warning')); + process.exit(0); + } + + const quant = client(config); + try { + await quant.unpublish(args.path); + return 'Unpublished successfully'; + } catch (err) { + throw new Error(`Failed to unpublish: ${err.message}`); + } + } }; module.exports = command; diff --git a/src/commands/waflogs.js b/src/commands/waflogs.js index 29aa9d3..126a0a9 100644 --- a/src/commands/waflogs.js +++ b/src/commands/waflogs.js @@ -5,67 +5,116 @@ * quant waf-logs */ -const chalk = require('chalk'); -const client = require('../quant-client'); +const { text, confirm, isCancel, select } = require('@clack/prompts'); +const color = require('picocolors'); const config = require('../config'); +const client = require('../quant-client'); const papa = require('papaparse'); const fs = require('fs'); -const command = {}; - -command.command = 'waf:logs'; -command.describe = 'Access a projects WAF logs'; -command.builder = (yargs) => { - yargs.option('fields', { - alias: 'f', - describe: 'CSV of field names to show for the logs', - type: 'string', - }); - yargs.option('output', { - alias: 'o', - describe: 'Location to write CSV output', - type: 'string', - }); - yargs.option('all', { - describe: 'Fetch all logs from the server', - type: 'boolean', - default: false, - }); - yargs.option('size', { - describe: 'Number of logs to return per request', - type: 'integer', - default: 10, - }); -}; +const command = { + command: 'waf-logs', + describe: 'Access project WAF logs', + + builder: (yargs) => { + return yargs + .option('fields', { + alias: 'f', + describe: 'CSV of field names to show for the logs', + type: 'string' + }) + .option('output', { + alias: 'o', + describe: 'Location to write CSV output', + type: 'string' + }) + .option('all', { + describe: 'Fetch all logs from the server', + type: 'boolean', + default: false + }) + .option('size', { + describe: 'Number of logs to return per request', + type: 'number', + default: 10 + }); + }, -command.handler = async function(argv) { - console.log(chalk.bold.green('*** Quant WAF Logs***')); + async promptArgs() { + const fetchAll = await confirm({ + message: 'Fetch all logs from the server?', + initialValue: false + }); - if (!config.fromArgs(argv)) { - return console.error(chalk.yellow('Quant is not configured, run init.')); - } + if (isCancel(fetchAll)) return null; - const quant = client(config); - let fields = argv.fields; + const size = await text({ + message: 'Number of logs to return per request', + defaultValue: '10', + validate: value => { + const num = parseInt(value); + if (isNaN(num) || num < 1) { + return 'Please enter a valid number'; + } + } + }); - if (fields) { - fields = fields.split(','); - } + if (isCancel(size)) return null; - console.log(chalk.gray('Fetching log data...')); + const fields = await text({ + message: 'Enter comma-separated field names to show (optional)', + }); - logs = await quant.wafLogs(argv.all, {per_page: argv.size}); + if (isCancel(fields)) return null; - if (logs === -1) { - console.log(chalk.red('Invalid credentials provided, please check your token has access.')); - return; - } + const outputFile = await text({ + message: 'Location to write CSV output (optional)', + }); + + if (isCancel(outputFile)) return null; + + return { + all: fetchAll, + size: parseInt(size), + fields: fields ? fields.split(',') : undefined, + output: outputFile || undefined + }; + }, + + async handler(args) { + if (!args) { + throw new Error('Operation cancelled'); + } + + // Check for optional arguments and prompt if not provided + if (!args.fields && !args.output && !args.all && !args.size) { + const promptedArgs = await this.promptArgs(); + if (!promptedArgs) { + throw new Error('Operation cancelled'); + } + args = { ...args, ...promptedArgs }; + } + + if (!await config.fromArgs(args)) { + process.exit(1); + } + + const quant = client(config); + const logs = await quant.wafLogs(args.all, { per_page: args.size }); + + if (logs === -1) { + throw new Error('Invalid credentials provided, please check your token has access'); + } - console.table(logs, fields); + if (args.output) { + fs.writeFileSync(args.output, papa.unparse(logs)); + } - if (argv.output) { - fs.writeFileSync(argv.output, papa.unparse(logs)); - console.log(`Saved output to ${argv.output}`); + return { + logs, + fields: args.fields, + savedTo: args.output + }; } }; diff --git a/src/config.js b/src/config.js index 2c6ce1a..39118f5 100644 --- a/src/config.js +++ b/src/config.js @@ -1,149 +1,111 @@ const fs = require('fs'); +const os = require('os'); +const path = require('path'); +const { confirm } = require('@clack/prompts'); +const color = require('picocolors'); -const filename = 'quant.json'; - -const config = { - dir: 'build', - endpoint: 'https://api.quantcdn.io', - clientid: null, - project: null, - token: null, - bearer: null, -}; - -/** - * Set the configuration values. - * - * @param {object} results - * - * @return {boolean} - * If the configuration was updated. - */ -const set = function(results) { - Object.assign(config, results); - return true; -}; +let config = {}; /** - * Getter for the configuration. - * - * @param {string} key - * The configuration key. - * - * @return {string} - * The configuration value. + * Load configuration from various sources in order of precedence: + * 1. Command line arguments + * 2. Environment variables + * 3. quant.json file */ -const get = function(key) { - let value = config[key]; - if (key == 'endpoint') { - value += '/v1'; - } - return value; -}; - -/** - * Save the configuration to file. - * - * @param {string} dir - * The directory to save to. - * - * @return {boolean} - * If the file was saved. - */ -const save = function(dir = '.') { - const data = JSON.stringify(config, null, 2); +async function fromArgs(args = {}) { + // First check environment variables + const envConfig = { + clientid: process.env.QUANT_CLIENT_ID, + project: process.env.QUANT_PROJECT, + token: process.env.QUANT_TOKEN, + endpoint: process.env.QUANT_ENDPOINT, + bearer: process.env.QUANT_BEARER + }; + + // Then try to load from quant.json + let fileConfig = {}; try { - fs.writeFileSync(`${dir}/${filename}`, data); + fileConfig = JSON.parse(fs.readFileSync('quant.json')); } catch (err) { - return false; + // File doesn't exist or is invalid JSON - that's ok } - return true; -}; - -/** - * Validate the loaded configuration. - * - * @return {boolean} - * If the configuration is valid. - */ -const validate = function() { - // Dir is optional as this can be an optional arg to relevant commands. - const reqKeys = ['clientid', 'project', 'endpoint', 'token']; - const diff = reqKeys.filter((i) => ! Object.keys(config).includes(i)); - return diff.length == 0; -}; -/** - * Load the configuration to memory. - * - * @param {string} dir - * The directory to load from. - * - * @return {boolean} - * If the file was loaded. - */ -const load = function(dir = '.') { - let data; - - try { - data = fs.readFileSync(`${dir}/${filename}`); - } catch (err) { + // Merge configs with precedence: args > env > file + config = { + ...fileConfig, + ...Object.fromEntries( + Object.entries(envConfig).filter(([_, v]) => v !== undefined) + ), + ...Object.fromEntries( + Object.entries(args).filter(([_, v]) => v !== undefined) + ) + }; + + // Check if we have required configuration + const hasConfig = ( + config.clientid !== undefined && + config.project !== undefined && + (config.token !== undefined || config.bearer !== undefined) + ); + + // If no config is found and this isn't the init command + if (!hasConfig && args._[0] !== 'init') { + console.log(color.yellow('No configuration found.')); + + const shouldInit = await confirm({ + message: 'Would you like to initialize a new project?', + initialValue: true + }); + + if (shouldInit) { + // Load and execute the init command + const initCommand = require('./commands/init'); + const initArgs = await initCommand.promptArgs(); + if (initArgs) { + await initCommand.handler(initArgs); + // Reload config after init + return fromArgs(args); + } + } + + console.log(color.yellow('\nConfiguration required to continue. You can:')); + console.log(color.yellow('1. Run "quant init" to create a new configuration')); + console.log(color.yellow('2. Create a quant.json file in this directory')); + console.log(color.yellow('3. Set environment variables (QUANT_CLIENT_ID, QUANT_PROJECT, QUANT_TOKEN)')); + console.log(color.yellow('4. Provide configuration via command line arguments\n')); + return false; } - data = JSON.parse(data); - Object.assign(config, data); + return hasConfig; +} - if (!validate()) { - return false; - } - - return true; -}; - -/** - * Load a configuration object from argv. - * - * @param {yargs} argv - * yargs argv object. - * - * @return {boolean} - * If config is valid. - */ -const fromArgs = function(argv) { - load(); - - if (argv.clientid) { - config.clientid = argv.clientid; - } - - if (argv.project) { - config.project = argv.project; - } - - if (argv.token) { - config.token = argv.token; - } +function get(key) { + return config[key]; +} - if (argv.endpoint) { - config.endpoint = argv.endpoint; - } +function set(values) { + config = {...config, ...values}; +} - if (argv.bearer) { - config.bearer = argv.bearer; +function save() { + const configDir = `${os.homedir()}/.quant`; + if (!fs.existsSync(configDir)) { + fs.mkdirSync(configDir, {recursive: true}); } - if (!validate()) { - return false; - } + // Save to both global and local config + fs.writeFileSync( + path.join(configDir, 'config.json'), + JSON.stringify(config, null, 2) + ); - return true; -}; + fs.writeFileSync('quant.json', JSON.stringify(config, null, 2)); +} module.exports = { - save, - load, - set, - get, fromArgs, + get, + set, + save, }; diff --git a/src/crawl/callbacks.js b/src/crawl/callbacks.js deleted file mode 100644 index 8b216d1..0000000 --- a/src/crawl/callbacks.js +++ /dev/null @@ -1,32 +0,0 @@ -/** - * Determine if a path needs ot be - */ -const chalk = require('chalk'); - -module.exports = { - redirectHandler: async (quant, queueItem, redirectQueueItem) => { - let path = queueItem.path; - - if (path.substr(-1) === '/' && path.length > 1) { - // Strip trailing slashes except if only / is present in the path. - path = path.substr(0, path.length - 1); - } - - if (queueItem.path == redirectQueueItem.path) { - return; - } - - if (path != queueItem.path) { - console.log(chalk.bold.green('✅ REDIRECT:') + ` ${queueItem.path} => ${path}`); - try { - await quant.redirect(queueItem.path, path, 'quant-cli', queueItem.stateData.code || 301); - } catch (err) {} - } else { - const destination = queueItem.host == redirectQueueItem.host ? redirectQueueItem.path : redirectQueueItem.url; - console.log(chalk.bold.green('✅ REDIRECT:') + ` ${path} => ${destination}`); - try { - await quant.redirect(path, destination, 'quant-cli', redirectQueueItem.stateData.code || 301); - } catch (err) {} - } - }, -}; diff --git a/src/crawl/detectors/images.js b/src/crawl/detectors/images.js deleted file mode 100644 index a4498ac..0000000 --- a/src/crawl/detectors/images.js +++ /dev/null @@ -1,34 +0,0 @@ -/** - * Service to assist with find image patterns in string. - */ - -const {decode} = require('html-entities'); -const matchAll = require('string.prototype.matchall'); -const bgImg = /background(-image)?:.*?url\(\s*(?.*?)\s*\)/gi; -const dataSrc = /data-src(?:\-retina)?=\"(?[^']*?)\"/gi; -const xlinkHref = /xlink:href=\"(?.*?)\"/gi; - -module.exports = { - applies: (response) => { - return response.headers['content-type'] && (response.headers['content-type'].includes('text/html') || response.headers['content-type'].includes('css')); - }, - handler: (string, host, protocol = 'https') => { - if (Buffer.isBuffer(string)) { - string = string.toString(); - } - - const items = [...matchAll(string, bgImg), ...matchAll(string, dataSrc), ...matchAll(string, xlinkHref)]; - - if (items.length < 0) { - return []; - } - - return items.map((item) => { - let img = decode(item.groups.url).replace(/'|\"/g, ''); - if (host) { - img = `${protocol}://${host}${img}`; - } - return img; - }).filter((item, index, arr) => arr.indexOf(item) === index); - }, -}; diff --git a/src/crawl/detectors/index.js b/src/crawl/detectors/index.js deleted file mode 100644 index 179b4e6..0000000 --- a/src/crawl/detectors/index.js +++ /dev/null @@ -1,11 +0,0 @@ -/** - * Directory loader for DOM filters. - */ -const path = require('path'); -require('fs').readdirSync(__dirname).forEach(function(file) { - if (file === 'index.js') { - return; - } - /* Store module with its name (from filename) */ - module.exports[path.basename(file, '.js')] = require(path.join(__dirname, file)); -}); diff --git a/src/crawl/detectors/responsiveImg.js b/src/crawl/detectors/responsiveImg.js deleted file mode 100644 index d6b0642..0000000 --- a/src/crawl/detectors/responsiveImg.js +++ /dev/null @@ -1,59 +0,0 @@ -/** - * Service to parse and support responsive images. - */ - -const matchAll = require('string.prototype.matchall'); - -/** - * Format the source set to something that we can work with. - * - * @param {string} src - * The string to format. - * - * @return {string} - * Formatted source set. - */ -function prepare(src) { - return src.trim().split(' ')[0].replace(/^\//, ''); -} - -const picp = new RegExp(/[^<]*(?:[^<]*)*[^<]*(?:<[^<]*)*<\/picture>/gi); -const imgp = new RegExp(/]*?src\s*=\s*['\"]([^'\"]*?)['\"][^>]*?>/gi); -const srcs = new RegExp(/(?:srcset|src)="(?.[^"]+)"/gi); - -module.exports = { - applies: (response) => { - return response.headers['content-type'] && response.headers['content-type'].includes('text/html'); - }, - handler: (string, host, protocol = 'https') => { - const retval = []; - - if (Buffer.isBuffer(string)) { - string = string.toString(); - } - - const items = [...matchAll(string, picp), ...matchAll(string, imgp)]; - - if (items.length < 0) { - return retval; - } - - items.map((item) => { - const imgs = [...matchAll(item[0], srcs)]; - imgs.map((i) => { - i.groups.attr.split(',').map((a) => { - a = prepare(a); - if (host) { - url = new URL(a, `${protocol}://${host}/`); - a = `${url.origin}${url.pathname}`; - } - if (retval.indexOf(a) === -1) { - retval.push(a); - } - }); - }); - }); - - return retval; - }, -}; diff --git a/src/crawl/filters/index.js b/src/crawl/filters/index.js deleted file mode 100644 index 179b4e6..0000000 --- a/src/crawl/filters/index.js +++ /dev/null @@ -1,11 +0,0 @@ -/** - * Directory loader for DOM filters. - */ -const path = require('path'); -require('fs').readdirSync(__dirname).forEach(function(file) { - if (file === 'index.js') { - return; - } - /* Store module with its name (from filename) */ - module.exports[path.basename(file, '.js')] = require(path.join(__dirname, file)); -}); diff --git a/src/crawl/filters/relativeDomains.js b/src/crawl/filters/relativeDomains.js deleted file mode 100644 index 7842698..0000000 --- a/src/crawl/filters/relativeDomains.js +++ /dev/null @@ -1,30 +0,0 @@ -/** - * The string buffer of a response. - * - * @param {string} dom - * The DOM string for markup. - * @param {object} opts - * The options. - * - * @return {string} - * The manipulated string. - */ -module.exports = { - option: 'rewrite', - handler: (dom, opts, argv = []) => { - const regex = new RegExp(`http[s]?:\/\/${opts.host}(:\\d+)?\/[\/]?`, 'gi'); - let body = dom.replace(regex, '/'); - - if ('extra-domains' in argv) { - let r; - const extraDomains = argv['extra-domains'].split(',').map((d) => d.trim()); - - for (let i = 0; i < extraDomains.length; i++) { - r = new RegExp(`http[s]?:\/\/${extraDomains[i]}(:\\d+)?\/[\/]?`, 'gi'); - body = body.replace(r, '/'); - } - } - - return body; - }, -}; diff --git a/src/quant-client.js b/src/quant-client.js index 63c266e..6eb99c6 100644 --- a/src/quant-client.js +++ b/src/quant-client.js @@ -470,56 +470,6 @@ const client = function (config) { return handleResponse(res); }, - /** - * Create a proxy with the Quant API. - * - * @param {string} url - * The relative URL to proxy. - * @param {string} destination - * The absolute FQDN/path to proxy to. - * @param {bool} published - * If the proxy is published - * @param {string} username - * Basic auth user. - * @param {string} password - * Basic auth password. - * - * @return {object} - * The response. - * - * @throws Error. - */ - proxy: async function ( - url, - destination, - published = true, - username, - password, - ) { - const options = { - url: `${config.get("endpoint")}/proxy`, - headers: { - ...headers, - }, - json: true, - body: { - url, - destination, - published, - }, - }; - - if (username) { - options.body.basic_auth_user = username; - options.body.basic_auth_pass = password; - } - - const res = await post(options.url, options.body, { - headers: options.headers, - }); - return handleResponse(res); - }, - /** * Delete a path from Quant. * diff --git a/test/client.test.js b/test/client.test.js index 9965d88..24721cb 100644 --- a/test/client.test.js +++ b/test/client.test.js @@ -909,108 +909,4 @@ describe('Quant Client', function () { }); }); - describe('POST /proxy', function () { - afterEach(function () { - requestPost.restore(); - }); - - it('should accept url and destination as minimum', async function () { - const response = { - status: 200, - data: { - quant_revision: 1, - url: '/test', - errorMsg: '', - error: false, - }, - headers: {}, - config: {}, - request: {}, - }; - requestPost = sinon.stub(axios, 'post').resolves(response); - - await client(config).proxy( - '/test', - 'http://google.com', - ); - - expect( - requestPost.calledOnceWith( - 'http://localhost:8081/proxy', - { - url: '/test', - destination: 'http://google.com', - published: true, - }, - { headers } - ), - ).to.be.true; - }); - - it('should handle API errors', async function () { - const response = { - status: 403, - data: { - errorMsg: 'Forbidden', - error: true, - }, - headers: {}, - config: {}, - request: {}, - }; - requestPost = sinon.stub(axios, 'post').resolves(response); - - try { - await client(config).proxy('/test', 'http://google.com'); - } catch (err) { - assert.typeOf(err, 'Error'); - assert.equal(err.message, 'Forbidden'); - expect( - requestPost.calledOnceWith( - 'http://localhost:8081/proxy', - { - url: '/test', - destination: 'http://google.com', - published: true, - }, - { headers } - ) - ).to.be.true; - return; - } - }); - - it('should add basic auth', async function () { - const response = { - status: 200, - data: { - quant_revision: 1, - url: '/test', - errorMsg: '', - error: false, - }, - headers: {}, - config: {}, - request: {}, - }; - - requestPost = sinon.stub(axios, 'post').resolves(response); - - await client(config).proxy('/test', 'http://google.com', true, 'user', 'password'); - - expect( - requestPost.calledOnceWith( - 'http://localhost:8081/proxy', - { - url: '/test', - destination: 'http://google.com', - published: true, - basic_auth_user: 'user', - basic_auth_pass: 'password', - }, - { headers } - ), - ).to.be.true; - }); - }); }); diff --git a/test/crawl/detectors/images.test.js b/test/crawl/detectors/images.test.js deleted file mode 100644 index ac44956..0000000 --- a/test/crawl/detectors/images.test.js +++ /dev/null @@ -1,114 +0,0 @@ -/** - * Test the image detection. - */ - -const detector = require('../../../src/crawl/detectors/images'); -const getFiles = require("../../../src/helper/getFiles"); - -const fs = require('fs'); - -const cssString = fs.readFileSync('test/fixtures/test.css').toString(); -const htmlString = fs.readFileSync("test/fixtures/index.html").toString(); - -describe('crawl:detectors:images', function() { - let chai, cap, expect, assert; - - beforeEach(async () => { - chai = await import('chai'); - cap = (await import('chai-as-promised')).default; - chai.use(cap); - assert = chai.assert; - expect = chai.expect; - }) - - describe('applies', () => { - it('should apply to HTML', () => { - const res = {}; - res.headers = {}; - res.headers['content-type'] = 'text/html'; - expect(detector.applies(res)).to.be.true; - }); - - it('should apply to CSS', () => { - const res = {}; - res.headers = {}; - res.headers['content-type'] = 'text/css'; - expect(detector.applies(res)).to.be.true; - }); - - it('should not apply to other mime types', () => { - const res = {}; - res.headers = {}; - const mimes = [ - 'text/plain', - 'application/json', - 'text/javascript', - 'imagea/apng', - 'image/gif', - 'audio/wave', - 'multipart/form-data', - ]; - - mimes.map((i) => { - res.headers['content-type'] = i; - expect(detector.applies(res)).to.be.false; - }); - }); - }); - - describe('handler', () => { - it('should add host and proto', function() { - const items = detector.handler(cssString, 'test.com'); - const expected = 'https://test.com/nala.jpg'; - expect(items).to.include(expected); - }); - - it('should allow custom proto', function() { - const items = detector.handler(cssString, 'test.com', 'http'); - const expected = 'http://test.com/nala.jpg'; - expect(items).to.include(expected); - }); - it('should return empty array', function() { - const items = detector.handler(''); - const expected = []; - expect(items).to.eql(expected); - }); - - describe('CSS String', function() { - it('should find background images', function() { - const items = detector.handler(cssString); - const expected = '/nala.jpg'; - expect(items).to.include(expected); - }); - }); - - describe('HTML String', function() { - it('should find background images', function() { - const items = detector.handler(htmlString); - const expected = '/nala.jpg'; - expect(items).to.include(expected); - }); - it('should find data-src attributes', function() { - const items = detector.handler(htmlString); - const expected = '/files/assets/test.jpg'; - expect(items).to.include(expected); - }); - - it('should find data-src-retina attributes', function() { - const items = detector.handler(htmlString); - const expected = '/files/assets/test-retina.jpg'; - expect(items).to.include(expected); - }); - - it('should append host and proto', function() { - const items = detector.handler(htmlString, 'test.com', 'https'); - const expected = [ - 'https://test.com/nala.jpg', - 'https://test.com/files/assets/test-retina.jpg', - 'https://test.com/files/assets/test.jpg', - ]; - expect(items).to.eql(expected); - }); - }); - }); -}); diff --git a/test/crawl/detectors/responsiveImg.test.js b/test/crawl/detectors/responsiveImg.test.js deleted file mode 100644 index 1cd3442..0000000 --- a/test/crawl/detectors/responsiveImg.test.js +++ /dev/null @@ -1,80 +0,0 @@ -/** - * Test the image detection. - */ - -const detector = require("../../../src/crawl/detectors/responsiveImg"); -const fs = require('fs'); - -const htmlString = fs.readFileSync("test/fixtures/responsive-images.html").toString(); - -describe('crawl:detectors:responsiveImg', function() { - let chai, cap, expect; - - beforeEach(async () => { - chai = await import('chai'); - cap = (await import('chai-as-promised')).default; - chai.use(cap); - expect = chai.expect; - }) - - describe('applies', () => { - it('should apply to HTML', () => { - const res = {}; - res.headers = {}; - res.headers['content-type'] = 'text/html'; - expect(detector.applies(res)).to.be.true; - }); - - it('should not apply to other mime types', () => { - const res = {}; - res.headers = {}; - const mimes = [ - 'text/css', - 'text/plain', - 'application/json', - 'text/javascript', - 'imagea/apng', - 'image/gif', - 'audio/wave', - 'multipart/form-data', - ]; - - mimes.map((i) => { - res.headers['content-type'] = i; - expect(detector.applies(res)).to.be.false; - }); - }); - }); - - describe('handler', () => { - it('should find picture elements', function() { - const images = detector.handler(htmlString, ''); - expect(images).to.include('elva-480w-close-portrait.jpg'); - expect(images).to.include('elva-800w.jpg'); - }); - - it('should find srcset attributes', function() { - const images = detector.handler(htmlString, ''); - expect(images).to.include('elva-fairy-320w.jpg'); - expect(images).to.include('elva-fairy-480w.jpg'); - expect(images).to.include('elva-fairy-640w.jpg'); - }); - - it('should include the host', function() { - const host = 'test.com.au'; - const images = detector.handler(htmlString, host); - expect(images).to.include(`https://${host}/elva-fairy-320w.jpg`); - expect(images).to.include(`https://${host}/elva-fairy-480w.jpg`); - expect(images).to.include(`https://${host}/elva-fairy-640w.jpg`); - }); - - it('should not duplicate the host', function() { - const host = 'test.com.au'; - const images = detector.handler(htmlString, host); - expect(images).to.not.include(`https://${host}/https:/${host}/hotlinked-image.jpg`); - expect(images).to.include(`https://${host}/hotlinked-image.jpg`); - expect(images).to.include(`https://${host}/hotlinked-image-480w.jpg`); - expect(images).to.include(`https://${host}/hotlinked-image-640w.jpg`); - }); - }); -}); diff --git a/test/crawl/filters/relativeDomains.test.js b/test/crawl/filters/relativeDomains.test.js deleted file mode 100644 index 5911f2d..0000000 --- a/test/crawl/filters/relativeDomains.test.js +++ /dev/null @@ -1,100 +0,0 @@ -/** - * Test the redirect determination logic. - */ -const {relativeDomains} = require('../../../src/crawl/filters'); - -describe('crawl:filters:relativeDomains', function() { - let chai, sinon; - - const opts = {host: 'localhost', port: 3000}; - - // Disable console log for neater test output. - before(async () => { - chai = await import('chai'); - sinon = await import('sinon'); - sinon.stub(console, 'log'); - }); - after(() => sinon.restore()); - - it('should define an option', () => { - chai.expect(relativeDomains.option).to.eql('rewrite'); - }); - - it('should replace host name', () => { - let string = 'https://localhost/test/link'; - string = relativeDomains.handler(string, opts); - - chai.expect(string).to.eql('/test/link'); - }); - - it('should replace ports', () => { - let string = 'https://localhost:3000/test/link'; - string = relativeDomains.handler(string, opts); - - chai.expect(string).to.eql('/test/link'); - }); - - it('should not replace remote domains', () => { - let string = 'https://google.com/test/link'; - string = relativeDomains.handler(string, opts); - - chai.expect(string).to.eql('https://google.com/test/link'); - }); - - it('should replace all occurrences', () => { - let string = 'test link' + - '

Some other thing

' + - 'Google' + - '

Some other thing

' + - '

Some other thing

' + - '

Some other thing

' + - '

Some other thing

' + - 'https://localhost:3000/test-other-link'; - - string = relativeDomains.handler(string, opts); - - chai.expect(string).to.not.include('https://localhost:3000'); - chai.expect(string).to.include('https://google.com/deeplink'); - chai.expect(string).to.include('/test/link'); - chai.expect(string).to.include('/test-other-link'); - }); - - it('should replace extra domains', () => { - let string = 'test link' + - '

Some other thing

' + - 'Extra' + - '

Some other thing

' + - '

Some other thing

' + - '

Some other thing

' + - '

Some other thing

' + - 'https://localhost:3000/test-other-link'; - - string = relativeDomains.handler(string, opts, {'extra-domains': 'content.localhost'}); - - chai.expect(string).to.not.include('https://localhost:3000'); - chai.expect(string).to.not.include('https://content.localhost'); - chai.expect(string).to.include('/test/link'); - chai.expect(string).to.include('/path/to/somewhere'); - }); - it('should replace multiple extra domains', () => { - let string = 'test link' + - '

Some other thing

' + - 'Extra' + - 'Extra' + - '

Some other thing

' + - '

Some other thing

' + - '

Some other thing

' + - '

Some other thing

' + - 'https://localhost:3000/test-other-link'; - - string = relativeDomains.handler(string, opts, { - 'extra-domains': 'content.localhost, content.main.com.au', - }); - - chai.expect(string).to.not.include('https://localhost:3000'); - chai.expect(string).to.not.include('https://content.localhost'); - chai.expect(string).to.not.include('https://content.main.com.au'); - chai.expect(string).to.include('/test/link'); - chai.expect(string).to.include('/path/to/somewhere'); - }); -}); diff --git a/test/crawl/redirectcb.test.js b/test/crawl/redirectcb.test.js deleted file mode 100644 index 7031183..0000000 --- a/test/crawl/redirectcb.test.js +++ /dev/null @@ -1,96 +0,0 @@ -/** - * Test the redirect determination logic. - */ -const {redirectHandler} = require('../../src/crawl/callbacks'); - -// Stubs -const client = require('../../src/quant-client'); - -describe('crawl::redirectHandler', function() { - let quant; - let chai, sinon, sinonChai; - - // Disable console log for neater test output. - before(async () => { - chai = await import('chai') - sinon = await import('sinon') - sinonChai = (await import('sinon-chai')).default; - - chai.should() - chai.use(sinonChai) - - sinon.stub(console, 'log'); - }); - after(() => sinon.restore()); - - beforeEach(() => { - quant = {redirect: sinon.spy()}; - }); - - afterEach(() => { - quant = null; - }); - - it('should not redirect same paths', () => { - const path = {path: '/test', host: 'test.com', url: 'http://test.com/test', stateData: {code: 302}}; - const dest = {path: '/test', host: 'test.com', url: 'http://test.com/test', stateData: {code: 302}}; - - redirectHandler(quant, path, dest); - quant.redirect.should.not.have.been.called; - }); - - it('should inherit HTTP code from response', () => { - const path = {path: '/test', host: 'test.com', url: 'http://test.com/test', stateData: {code: 302}}; - const dest = {path: '/dest', host: 'test.com', url: 'http://test.com/dest', stateData: {code: 301}}; - - redirectHandler(quant, path, dest); - quant.redirect.should.have.been.calledOnceWith('/test', '/dest', 'quant-cli', 301); - }); - - it('should default to 301 codes', () => { - const path = {path: '/test', host: 'test.com', url: 'http://test.com/test', stateData: {code: 302}}; - const dest = {path: '/dest', host: 'test.com', url: 'http://test.com/dest', stateData: {}}; - - redirectHandler(quant, path, dest); - quant.redirect.should.have.been.calledOnceWith('/test', '/dest', 'quant-cli', 301); - }); - - it('should be able to redirect bare /', () => { - const path = {path: '/', host: 'test.com', url: 'http://test.com/', stateData: {code: 302}}; - const dest = {path: '/Home', host: 'test.com', url: 'http://test.com/Home', stateData: {code: 302}}; - redirectHandler(quant, path, dest); - quant.redirect.should.have.been.calledOnceWith('/', '/Home', 'quant-cli', 302); - }); - - describe('internal', () => { - - it('should redirect paths ending with slashes', () => { - const path = {path: '/test/', host: 'test.com', url: 'http://test.com/test/', stateData: {code: 302}}; - const dest = {path: '/test', host: 'test.com', url: 'http://test.com/test', stateData: {code: 302}}; - - redirectHandler(quant, path, dest); - quant.redirect.should.have.been.calledWith('/test/', '/test', 'quant-cli', 302); - quant.redirect.should.have.been.calledOnce; - }); - - it('should redirect differing paths', () => { - const path = {path: '/test', host: 'test.com', url: 'http://test.com/test', stateData: {code: 302}}; - const dest = {path: '/test-destination', host: 'test.com', url: 'http://test.com/test-destination', stateData: {code: 302}}; - - redirectHandler(quant, path, dest); - quant.redirect.should.have.been.calledWith('/test', '/test-destination', 'quant-cli', 302); - quant.redirect.should.have.been.calledOnce; - }); - }); - - describe('external', () => { - it('should redirect remote origins', () => { - const path = {path: '/test', host: 'test.com', url: 'http://test.com/test', stateData: {code: 302}}; - const dest = {path: '/test-destination', host: 'google.com', url: 'http://google.com/test-destination', stateData: {code: 302}}; - - redirectHandler(quant, path, dest); - quant.redirect.should.have.been.calledWith('/test', 'http://google.com/test-destination', 'quant-cli', 302); - quant.redirect.should.have.been.calledOnce; - }); - }); -}); From cc587a6876a3122b80969bda8fb106248b4a8564 Mon Sep 17 00:00:00 2001 From: Stuart Rowlands Date: Fri, 22 Nov 2024 10:11:30 +1000 Subject: [PATCH 02/41] Always show active config when running CLI. Allow for non-interactive mode if all required params are passed. .. lots of other goodness. --- cli.js | 90 ++++++++++++---- src/commands/delete.js | 59 +++++++---- src/commands/file.js | 34 +++--- src/commands/info.js | 26 +++-- src/commands/init.js | 4 +- src/commands/page.js | 34 +++--- src/commands/publish.js | 32 +++--- src/commands/purge.js | 19 ++-- src/commands/redirect.js | 77 +++++++------- src/commands/scan.js | 71 +++++++++---- src/commands/search.js | 82 +++++++-------- src/commands/unpublish.js | 38 ++++--- src/commands/waflogs.js | 179 ++++++++++++++++++++++--------- src/config.js | 43 ++------ src/quant-client.js | 215 ++++++++++++++++++++------------------ 15 files changed, 595 insertions(+), 408 deletions(-) diff --git a/cli.js b/cli.js index 2c46e1a..f1a4ce1 100755 --- a/cli.js +++ b/cli.js @@ -6,15 +6,54 @@ const { getCommandOptions, getCommand } = require('./src/commandLoader'); const config = require('./src/config'); const yargs = require('yargs'); +function showActiveConfig() { + const endpoint = config.get('endpoint'); + const clientId = config.get('clientid'); + const project = config.get('project'); + const defaultEndpoint = 'https://api.quantcdn.io/v1'; + + console.log(color.dim('─────────────────────────────────────')); + console.log(color.dim('Active configuration:')); + console.log(color.dim(`Organization: ${clientId}`)); + console.log(color.dim(`Project: ${project}`)); + if (endpoint !== defaultEndpoint) { + console.log(color.dim(`Endpoint: ${endpoint}`)); + } + console.log(color.dim('─────────────────────────────────────')); +} + async function interactiveMode() { intro(color.bgCyan(' QuantCDN CLI ')); try { // Check for config before showing menu if (!await config.fromArgs({ _: [''] })) { - process.exit(1); + const shouldInit = await confirm({ + message: 'No configuration found. Would you like to initialize a new project?', + initialValue: true + }); + + if (isCancel(shouldInit) || !shouldInit) { + outro(color.yellow('Configuration required to continue. You can:')); + outro(color.yellow('1. Run "quant init" to create a new configuration')); + outro(color.yellow('2. Create a quant.json file in this directory')); + outro(color.yellow('3. Set environment variables (QUANT_CLIENT_ID, QUANT_PROJECT, QUANT_TOKEN)')); + outro(color.yellow('4. Provide configuration via command line arguments')); + process.exit(0); + } + + // Get the init command and run it + const initCommand = getCommand('init'); + const initArgs = await initCommand.promptArgs(); + if (!initArgs) { + outro(color.yellow('Operation cancelled')); + process.exit(0); + } + await initCommand.handler(initArgs); } + showActiveConfig(); + const command = await select({ message: 'What would you like to do?', options: getCommandOptions() @@ -51,30 +90,46 @@ async function interactiveMode() { async function handleCommand(command, argv) { try { - // Check if command was called with no arguments + // Add _command property to args for config check + argv._ = argv._ || []; + argv._[0] = command.command.split(' ')[0]; + + // Extract command definition parts const commandParts = command.command.split(' '); - const requiredArgs = commandParts.filter(part => part.startsWith('<')).length; - const providedArgs = argv._.length - 1; // Subtract 1 for command name + const requiredArgs = commandParts + .filter(part => part.startsWith('<')) + .map(part => part.replace(/[<>]/g, '')); - // If no arguments provided at all, go straight to interactive mode - if (providedArgs === 0 && requiredArgs > 0) { + // For positional arguments, they're in argv._ after the command name + const providedPositionalArgs = argv._.slice(1); + + // Check if we have all required positional arguments + const hasAllRequiredArgs = requiredArgs.every((arg, index) => { + // For the first argument, check if it's provided either as positional or named + if (index === 0) { + return providedPositionalArgs[index] || argv[arg]; + } + // For subsequent arguments, they must be provided as positional args + return providedPositionalArgs[index]; + }); + + if (!await config.fromArgs(argv)) { + process.exit(1); + } + + showActiveConfig(); + + // Always pass existing args to promptArgs, even in interactive mode + if (!hasAllRequiredArgs) { intro(color.bgCyan(' QuantCDN CLI ')); - const args = await command.promptArgs(); - if (!args) { + const promptedArgs = await command.promptArgs(argv); + if (!promptedArgs) { outro(color.yellow('Operation cancelled')); process.exit(0); } - argv = { ...argv, ...args }; - } - // If some arguments are missing, let yargs handle the error - else if (providedArgs < requiredArgs) { - return command.builder(yargs).argv; + argv = { ...argv, ...promptedArgs }; } - // Add _command property to args for config check - argv._ = argv._ || []; - argv._[0] = commandParts[0]; - const result = await command.handler(argv); console.log(color.green(result || 'Operation completed successfully!')); } catch (error) { @@ -107,7 +162,6 @@ function cliMode() { alias: 'e', describe: 'API endpoint for QuantCDN', type: 'string', - default: 'https://api.quantcdn.io' }) .option('bearer', { describe: 'Scoped API bearer token', diff --git a/src/commands/delete.js b/src/commands/delete.js index 3d40c0d..3cd8a17 100644 --- a/src/commands/delete.js +++ b/src/commands/delete.js @@ -11,7 +11,7 @@ const config = require('../config'); const client = require('../quant-client'); const command = { - command: 'delete ', + command: 'delete [path]', describe: 'Delete a deployed path from Quant', builder: (yargs) => { @@ -27,22 +27,27 @@ const command = { }); }, - async promptArgs() { - const path = await text({ - message: 'Enter the deployed asset path to remove', - validate: value => !value ? 'Path is required' : undefined - }); - - if (isCancel(path)) return null; - - const shouldDelete = await confirm({ - message: 'This will delete all revisions of this asset from QuantCDN. Are you sure?', - initialValue: false - }); + async promptArgs(providedArgs = {}) { + // If path is provided, skip that prompt + let path = providedArgs.path; + if (!path) { + path = await text({ + message: 'Enter the deployed asset path to remove', + validate: value => !value ? 'Path is required' : undefined + }); + if (isCancel(path)) return null; + } - if (isCancel(shouldDelete) || !shouldDelete) return null; + // If force is not provided, ask for confirmation + if (!providedArgs.force) { + const shouldDelete = await confirm({ + message: 'This will delete all revisions of this asset from QuantCDN. Are you sure?', + initialValue: false + }); + if (isCancel(shouldDelete) || !shouldDelete) return null; + } - return { path }; + return { path, force: providedArgs.force }; }, async handler(args) { @@ -50,15 +55,25 @@ const command = { throw new Error('Operation cancelled'); } - if (!await config.fromArgs(args)) { - process.exit(1); + // Always prompt if path is missing + if (!args.path) { + const promptedArgs = await this.promptArgs(args); + if (!promptedArgs) { + throw new Error('Operation cancelled'); + } + args = { ...args, ...promptedArgs }; + } + // Only prompt for confirmation if not forced + else if (!args.force) { + const promptedArgs = await this.promptArgs(args); + if (!promptedArgs) { + throw new Error('Operation cancelled'); + } + args = { ...args, ...promptedArgs }; } - // If not in force mode and not coming from interactive prompt, confirm - if (!args.force && !args._interactiveMode) { - console.log(color.yellow('This will delete all revisions of this asset from QuantCDN')); - console.log(color.yellow('Use --force to skip this warning')); - process.exit(0); + if (!await config.fromArgs(args)) { + process.exit(1); } const quant = client(config); diff --git a/src/commands/file.js b/src/commands/file.js index da6b4fd..f04a721 100644 --- a/src/commands/file.js +++ b/src/commands/file.js @@ -13,7 +13,7 @@ const config = require('../config'); const client = require('../quant-client'); const command = { - command: 'file ', + command: 'file [file] [location]', describe: 'Deploy a single asset', builder: (yargs) => { @@ -28,20 +28,26 @@ const command = { }); }, - async promptArgs() { - const file = await text({ - message: 'Enter path to local file', - validate: value => !value ? 'File path is required' : undefined - }); - - if (isCancel(file)) return null; - - const location = await text({ - message: 'Enter the access URI (where the file will be available)', - validate: value => !value ? 'Location is required' : undefined - }); + async promptArgs(providedArgs = {}) { + // If file is provided, skip that prompt + let file = providedArgs.file; + if (!file) { + file = await text({ + message: 'Enter path to local file', + validate: value => !value ? 'File path is required' : undefined + }); + if (isCancel(file)) return null; + } - if (isCancel(location)) return null; + // If location is provided, skip that prompt + let location = providedArgs.location; + if (!location) { + location = await text({ + message: 'Enter the access URI (where the file will be available)', + validate: value => !value ? 'Location is required' : undefined + }); + if (isCancel(location)) return null; + } return { file, location }; }, diff --git a/src/commands/info.js b/src/commands/info.js index b176258..468e9ac 100644 --- a/src/commands/info.js +++ b/src/commands/info.js @@ -10,8 +10,13 @@ const config = require('../config'); const client = require('../quant-client'); const command = { + command: 'info', describe: 'Show information about current configuration', + builder: (yargs) => { + return yargs; + }, + async promptArgs() { // No arguments needed for info command return {}; @@ -30,12 +35,11 @@ const command = { throw new Error(`Unable to connect to quant: ${err.message}`); } - const info = { - endpoint: config.get('endpoint'), - customer: config.get('clientid'), - project: config.get('project'), - token: '****' - }; + let output = ''; + output += `Endpoint: ${config.get('endpoint')}\n`; + output += `Customer: ${config.get('clientid')}\n`; + output += `Project: ${config.get('project')}\n`; + output += `Token: ****\n`; try { const meta = await quant.meta(); @@ -52,15 +56,15 @@ const command = { }); } - info.totalRecords = meta.total_records; - info.contentItems = totals.content; - info.redirects = totals.redirects; + output += `\nTotal records: ${meta.total_records}\n`; + output += ` - content: ${totals.content}\n`; + output += ` - redirects: ${totals.redirects}\n`; } } catch (err) { - info.error = 'Could not fetch metadata'; + output += '\nCould not fetch metadata'; } - return info; + return output; } }; diff --git a/src/commands/init.js b/src/commands/init.js index 355920b..5ba696f 100644 --- a/src/commands/init.js +++ b/src/commands/init.js @@ -79,7 +79,7 @@ const command = { if (isCancel(dir)) return null; return { - endpoint: 'https://api.quantcdn.io', + endpoint: endpoint || 'https://api.quantcdn.io', clientid, project, token, @@ -103,7 +103,7 @@ const command = { } const config_args = { - endpoint: 'https://api.quantcdn.io', + endpoint: args.endpoint || 'https://api.quantcdn.io', clientid: args.clientid, project: args.project, token: args.token, diff --git a/src/commands/page.js b/src/commands/page.js index 0b59be4..a2b451b 100644 --- a/src/commands/page.js +++ b/src/commands/page.js @@ -13,7 +13,7 @@ const config = require('../config'); const client = require('../quant-client'); const command = { - command: 'page ', + command: 'page [file] [location]', describe: 'Make a local page asset available via Quant', builder: (yargs) => { @@ -28,20 +28,26 @@ const command = { }); }, - async promptArgs() { - const file = await text({ - message: 'Enter path to local HTML file', - validate: value => !value ? 'File path is required' : undefined - }); - - if (isCancel(file)) return null; - - const location = await text({ - message: 'Enter the access URI (where the page will be available)', - validate: value => !value ? 'Location is required' : undefined - }); + async promptArgs(providedArgs = {}) { + // If file is provided, skip that prompt + let file = providedArgs.file; + if (!file) { + file = await text({ + message: 'Enter path to local HTML file', + validate: value => !value ? 'File path is required' : undefined + }); + if (isCancel(file)) return null; + } - if (isCancel(location)) return null; + // If location is provided, skip that prompt + let location = providedArgs.location; + if (!location) { + location = await text({ + message: 'Enter the access URI (where the page will be available)', + validate: value => !value ? 'Location is required' : undefined + }); + if (isCancel(location)) return null; + } return { file, location }; }, diff --git a/src/commands/publish.js b/src/commands/publish.js index 5928b18..d13013c 100644 --- a/src/commands/publish.js +++ b/src/commands/publish.js @@ -10,7 +10,7 @@ const config = require('../config'); const client = require('../quant-client'); const command = { - command: 'publish ', + command: 'publish [path]', describe: 'Publish an asset', builder: (yargs) => { @@ -27,20 +27,24 @@ const command = { }); }, - async promptArgs() { - const path = await text({ - message: 'Enter the path to publish', - validate: value => !value ? 'Path is required' : undefined - }); - - if (isCancel(path)) return null; - - const revision = await text({ - message: 'Enter revision ID (or press Enter for latest)', - defaultValue: 'latest' - }); + async promptArgs(providedArgs = {}) { + let path = providedArgs.path; + if (!path) { + path = await text({ + message: 'Enter the path to publish', + validate: value => !value ? 'Path is required' : undefined + }); + if (isCancel(path)) return null; + } - if (isCancel(revision)) return null; + let revision = providedArgs.revision; + if (!revision) { + revision = await text({ + message: 'Enter revision ID (or press Enter for latest)', + defaultValue: 'latest' + }); + if (isCancel(revision)) return null; + } return { path, revision }; }, diff --git a/src/commands/purge.js b/src/commands/purge.js index ac8cf5d..86dcb5e 100644 --- a/src/commands/purge.js +++ b/src/commands/purge.js @@ -10,7 +10,7 @@ const config = require('../config'); const client = require('../quant-client'); const command = { - command: 'purge ', + command: 'purge [path]', describe: 'Purge the cache for a given URL', builder: (yargs) => { @@ -21,13 +21,16 @@ const command = { }); }, - async promptArgs() { - const path = await text({ - message: 'Enter the path to purge from cache', - validate: value => !value ? 'Path is required' : undefined - }); - - if (isCancel(path)) return null; + async promptArgs(providedArgs = {}) { + // If path is provided, skip that prompt + let path = providedArgs.path; + if (!path) { + path = await text({ + message: 'Enter the path to purge from cache', + validate: value => !value ? 'Path is required' : undefined + }); + if (isCancel(path)) return null; + } return { path }; }, diff --git a/src/commands/redirect.js b/src/commands/redirect.js index 6a84776..21b438a 100644 --- a/src/commands/redirect.js +++ b/src/commands/redirect.js @@ -10,7 +10,7 @@ const config = require('../config'); const client = require('../quant-client'); const command = { - command: 'redirect [status] [author]', + command: 'redirect [from] [to] [status] [author]', describe: 'Create a redirect', builder: (yargs) => { @@ -34,44 +34,51 @@ const command = { }); }, - async promptArgs() { - const from = await text({ - message: 'Enter the path to redirect from', - validate: value => !value ? 'Source path is required' : undefined - }); - - if (isCancel(from)) return null; - - const to = await text({ - message: 'Enter the path to redirect to', - validate: value => !value ? 'Destination path is required' : undefined - }); - - if (isCancel(to)) return null; - - const status = await select({ - message: 'Select redirect type', - options: [ - { value: 301, label: '301 - Permanent redirect' }, - { value: 302, label: '302 - Temporary redirect' } - ], - initialValue: 302 - }); + async promptArgs(providedArgs = {}) { + // If from is provided, skip that prompt + let from = providedArgs.from; + if (!from) { + from = await text({ + message: 'Enter the path to redirect from', + validate: value => !value ? 'Source path is required' : undefined + }); + if (isCancel(from)) return null; + } - if (isCancel(status)) return null; + // If to is provided, skip that prompt + let to = providedArgs.to; + if (!to) { + to = await text({ + message: 'Enter the path to redirect to', + validate: value => !value ? 'Destination path is required' : undefined + }); + if (isCancel(to)) return null; + } - const author = await text({ - message: 'Enter author name (optional)', - }); + // If status is provided, skip that prompt + let status = providedArgs.status; + if (!status) { + status = await select({ + message: 'Select redirect type', + options: [ + { value: 301, label: '301 - Permanent redirect' }, + { value: 302, label: '302 - Temporary redirect' } + ], + initialValue: 302 + }); + if (isCancel(status)) return null; + } - if (isCancel(author)) return null; + // If author is provided, skip that prompt + let author = providedArgs.author; + if (!author) { + author = await text({ + message: 'Enter author name (optional)', + }); + if (isCancel(author)) return null; + } - return { - from, - to, - status: parseInt(status), - author: author || null - }; + return { from, to, status: parseInt(status), author: author || null }; }, async handler(args) { diff --git a/src/commands/scan.js b/src/commands/scan.js index bc9c1a5..caa5af2 100644 --- a/src/commands/scan.js +++ b/src/commands/scan.js @@ -14,7 +14,7 @@ const path = require('path'); const md5File = require('md5-file'); const command = { - command: 'scan', + command: 'scan [options]', describe: 'Validate local file checksums', builder: (yargs) => { @@ -35,29 +35,35 @@ const command = { }); }, - async promptArgs() { - const showDiffOnly = await confirm({ - message: 'Show only source files different from Quant?', - initialValue: false - }); - - if (isCancel(showDiffOnly)) return null; - - const unpublishOnly = await confirm({ - message: 'Show only the unpublished results?', - initialValue: false - }); - - if (isCancel(unpublishOnly)) return null; + async promptArgs(providedArgs = {}) { + let diffOnly = providedArgs['diff-only']; + if (typeof diffOnly !== 'boolean') { + diffOnly = await confirm({ + message: 'Show only source files different from Quant?', + initialValue: false + }); + if (isCancel(diffOnly)) return null; + } - const skipUnpublishRegex = await text({ - message: 'Enter regex pattern to skip unpublish (optional)', - }); + let unpublishOnly = providedArgs['unpublish-only']; + if (typeof unpublishOnly !== 'boolean') { + unpublishOnly = await confirm({ + message: 'Show only the unpublished results?', + initialValue: false + }); + if (isCancel(unpublishOnly)) return null; + } - if (isCancel(skipUnpublishRegex)) return null; + let skipUnpublishRegex = providedArgs['skip-unpublish-regex']; + if (skipUnpublishRegex === undefined) { + skipUnpublishRegex = await text({ + message: 'Enter regex pattern to skip unpublish (optional)', + }); + if (isCancel(skipUnpublishRegex)) return null; + } return { - 'diff-only': showDiffOnly, + 'diff-only': diffOnly, 'unpublish-only': unpublishOnly, 'skip-unpublish-regex': skipUnpublishRegex || undefined }; @@ -151,7 +157,30 @@ const command = { results.toUnpublish.push(item.url); }); - return results; + // Format the results as a string + let output = ''; + + if (results.upToDate.length > 0 && !args['diff-only']) { + output += color.green('\nUp to date:') + `\n${results.upToDate.join('\n')}\n`; + } + + if (results.different.length > 0) { + output += color.yellow('\nDifferent:') + `\n${results.different.join('\n')}\n`; + } + + if (results.notFound.length > 0) { + output += color.red('\nNot found:') + `\n${results.notFound.join('\n')}\n`; + } + + if (results.toUnpublish.length > 0) { + output += color.magenta('\nTo be unpublished:') + `\n${results.toUnpublish.join('\n')}\n`; + } + + if (!output) { + output = 'No changes found'; + } + + return output; } }; diff --git a/src/commands/search.js b/src/commands/search.js index 0e2800d..3957d6e 100644 --- a/src/commands/search.js +++ b/src/commands/search.js @@ -12,69 +12,59 @@ const fs = require('fs'); const glob = require('glob'); const command = { - command: 'search ', + command: 'search [operation]', describe: 'Perform search index operations', builder: (yargs) => { return yargs .positional('operation', { - describe: 'Operation to perform (status|index|unindex|clear)', + describe: 'Operation to perform', type: 'string', choices: ['status', 'index', 'unindex', 'clear'] }) .option('path', { describe: 'Path to JSON file(s) for index/unindex operations', type: 'string' - }) - .check((argv) => { - if ((argv.operation === 'index' || argv.operation === 'unindex') && !argv.path) { - throw new Error('Path is required for index and unindex operations'); - } - return true; }); }, - async promptArgs() { - const operation = await select({ - message: 'Select search operation', - options: [ - { value: 'status', label: 'Show search index status' }, - { value: 'index', label: 'Add/update search records' }, - { value: 'unindex', label: 'Remove item from search index' }, - { value: 'clear', label: 'Clear entire search index' } - ] - }); - - if (isCancel(operation)) return null; + async promptArgs(providedArgs = {}) { + // If operation is provided, skip that prompt + let operation = providedArgs.operation; + if (!operation) { + operation = await select({ + message: 'Select search operation', + options: [ + { value: 'status', label: 'Show search index status' }, + { value: 'index', label: 'Add/update search records' }, + { value: 'unindex', label: 'Remove item from search index' }, + { value: 'clear', label: 'Clear entire search index' } + ] + }); + if (isCancel(operation)) return null; + } let additionalArgs = {}; - switch (operation) { - case 'index': - const path = await text({ - message: 'Enter path to JSON file(s)', - validate: value => !value ? 'Path is required' : undefined - }); - if (isCancel(path)) return null; - additionalArgs.path = path; - break; - - case 'unindex': - const urlPath = await text({ - message: 'Enter URL path to remove from index', - validate: value => !value ? 'Path is required' : undefined - }); - if (isCancel(urlPath)) return null; - additionalArgs.path = urlPath; - break; + // If path is required but not provided, prompt for it + if (['index', 'unindex'].includes(operation) && !providedArgs.path) { + const path = await text({ + message: operation === 'index' + ? 'Enter path to JSON file(s)' + : 'Enter URL path to remove from index', + validate: value => !value ? 'Path is required' : undefined + }); + if (isCancel(path)) return null; + additionalArgs.path = path; + } - case 'clear': - const confirmClear = await confirm({ - message: 'Are you sure you want to clear the entire search index?', - initialValue: false - }); - if (isCancel(confirmClear) || !confirmClear) return null; - break; + // If it's clear operation, confirm + if (operation === 'clear' && !providedArgs.confirmed) { + const confirmClear = await confirm({ + message: 'Are you sure you want to clear the entire search index?', + initialValue: false + }); + if (isCancel(confirmClear) || !confirmClear) return null; } return { @@ -90,7 +80,7 @@ const command = { // Check for required arguments and prompt if missing if (!args.operation || ((['index', 'unindex'].includes(args.operation)) && !args.path)) { - const promptedArgs = await this.promptArgs(); + const promptedArgs = await this.promptArgs(args); // Pass existing args if (!promptedArgs) { throw new Error('Operation cancelled'); } diff --git a/src/commands/unpublish.js b/src/commands/unpublish.js index 85f4243..ba7da60 100644 --- a/src/commands/unpublish.js +++ b/src/commands/unpublish.js @@ -10,7 +10,7 @@ const config = require('../config'); const client = require('../quant-client'); const command = { - command: 'unpublish ', + command: 'unpublish [path]', describe: 'Unpublish an asset', builder: (yargs) => { @@ -27,22 +27,27 @@ const command = { }); }, - async promptArgs() { - const path = await text({ - message: 'Enter the path to unpublish', - validate: value => !value ? 'Path is required' : undefined - }); - - if (isCancel(path)) return null; - - const confirmUnpublish = await confirm({ - message: 'Are you sure you want to unpublish this asset?', - initialValue: false - }); + async promptArgs(providedArgs = {}) { + // If path is provided, skip that prompt + let path = providedArgs.path; + if (!path) { + path = await text({ + message: 'Enter the path to unpublish', + validate: value => !value ? 'Path is required' : undefined + }); + if (isCancel(path)) return null; + } - if (isCancel(confirmUnpublish) || !confirmUnpublish) return null; + // If force is not provided, ask for confirmation + if (!providedArgs.force) { + const confirmUnpublish = await confirm({ + message: 'Are you sure you want to unpublish this asset?', + initialValue: false + }); + if (isCancel(confirmUnpublish) || !confirmUnpublish) return null; + } - return { path }; + return { path, force: providedArgs.force }; }, async handler(args) { @@ -50,9 +55,8 @@ const command = { throw new Error('Operation cancelled'); } - // Check for required arguments and prompt if missing if (!args.path) { - const promptedArgs = await this.promptArgs(); + const promptedArgs = await this.promptArgs(args); if (!promptedArgs) { throw new Error('Operation cancelled'); } diff --git a/src/commands/waflogs.js b/src/commands/waflogs.js index 126a0a9..30a9c2c 100644 --- a/src/commands/waflogs.js +++ b/src/commands/waflogs.js @@ -13,7 +13,7 @@ const papa = require('papaparse'); const fs = require('fs'); const command = { - command: 'waf-logs', + command: 'waf:logs', describe: 'Access project WAF logs', builder: (yargs) => { @@ -40,44 +40,57 @@ const command = { }); }, - async promptArgs() { - const fetchAll = await confirm({ - message: 'Fetch all logs from the server?', - initialValue: false - }); - - if (isCancel(fetchAll)) return null; - - const size = await text({ - message: 'Number of logs to return per request', - defaultValue: '10', - validate: value => { - const num = parseInt(value); - if (isNaN(num) || num < 1) { - return 'Please enter a valid number'; - } - } - }); - - if (isCancel(size)) return null; - - const fields = await text({ - message: 'Enter comma-separated field names to show (optional)', - }); + async promptArgs(providedArgs = {}) { + // If all is provided, skip that prompt + let fetchAll = providedArgs.all; + if (typeof fetchAll !== 'boolean') { + fetchAll = await confirm({ + message: 'Fetch all logs from the server?', + initialValue: false + }); + if (isCancel(fetchAll)) return null; + } - if (isCancel(fields)) return null; + // If size is provided, skip that prompt + let size = providedArgs.size; + if (!size) { + const sizeInput = await text({ + message: 'Number of logs to return per request', + defaultValue: '10', + validate: value => { + const num = parseInt(value); + if (isNaN(num) || num < 1) { + return 'Please enter a valid number'; + } + } + }); + if (isCancel(sizeInput)) return null; + size = parseInt(sizeInput); + } - const outputFile = await text({ - message: 'Location to write CSV output (optional)', - }); + // If fields is provided, skip that prompt + let fields = providedArgs.fields; + if (!fields) { + fields = await text({ + message: 'Enter comma-separated field names to show (optional)', + }); + if (isCancel(fields)) return null; + } - if (isCancel(outputFile)) return null; + // If output is provided, skip that prompt + let output = providedArgs.output; + if (!output) { + output = await text({ + message: 'Location to write CSV output (optional)', + }); + if (isCancel(output)) return null; + } return { all: fetchAll, - size: parseInt(size), - fields: fields ? fields.split(',') : undefined, - output: outputFile || undefined + size, + fields: fields ? (typeof fields === 'string' ? fields.split(',') : fields) : undefined, + output: output || undefined }; }, @@ -87,8 +100,8 @@ const command = { } // Check for optional arguments and prompt if not provided - if (!args.fields && !args.output && !args.all && !args.size) { - const promptedArgs = await this.promptArgs(); + if (!args.fields && !args.output && args.all === undefined && !args.size) { + const promptedArgs = await this.promptArgs(args); if (!promptedArgs) { throw new Error('Operation cancelled'); } @@ -100,21 +113,93 @@ const command = { } const quant = client(config); - const logs = await quant.wafLogs(args.all, { per_page: args.size }); + + try { + console.log('Fetching WAF logs with params:', { + all: args.all, + per_page: args.size, + endpoint: config.get('endpoint') + }); - if (logs === -1) { - throw new Error('Invalid credentials provided, please check your token has access'); - } + const response = await quant.wafLogs(args.all, { per_page: args.size }); - if (args.output) { - fs.writeFileSync(args.output, papa.unparse(logs)); - } + if (response === -1) { + throw new Error('Invalid credentials provided, please check your token has access'); + } - return { - logs, - fields: args.fields, - savedTo: args.output - }; + if (args.output) { + try { + fs.writeFileSync(args.output, papa.unparse(response.records)); + return `Logs saved to ${args.output}`; + } catch (err) { + throw new Error(`Failed to write output file: ${err.message}`); + } + } + + // Format the logs output + if (!response.records || response.records.length === 0) { + return 'No logs found'; + } + + let output = `Found ${response.total_records} logs (showing page ${response.page} of ${response.total_pages})\n`; + + if (args.fields) { + const fields = typeof args.fields === 'string' ? args.fields.split(',') : args.fields; + response.records.forEach(log => { + output += '\n---\n'; + fields.forEach(field => { + if (log[field] !== undefined) { + output += `${field}: ${log[field]}\n`; + } + }); + }); + } else { + response.records.forEach(log => { + output += '\n---\n'; + Object.entries(log).forEach(([key, value]) => { + if (key === 'meta') { + try { + const meta = JSON.parse(value); + Object.entries(meta).forEach(([metaKey, metaValue]) => { + output += `${metaKey}: ${metaValue}\n`; + }); + } catch (e) { + output += `${key}: ${value}\n`; + } + } else { + output += `${key}: ${value}\n`; + } + }); + }); + } + + return output; + + } catch (err) { + console.log('Error details:', { + message: err.message, + code: err.code, + status: err.response && err.response.status, + data: err.response && err.response.data, + config: { + url: err.config && err.config.url, + method: err.config && err.config.method, + headers: err.config && err.config.headers + } + }); + + // Format a user-friendly error message + let errorMessage = 'Failed to fetch WAF logs: '; + if (err.code === 'ECONNREFUSED') { + errorMessage += 'Could not connect to the API server'; + } else if (err.response && err.response.data) { + errorMessage += `${err.message}\nResponse: ${JSON.stringify(err.response.data, null, 2)}`; + } else { + errorMessage += err.message; + } + + throw new Error(errorMessage); + } } }; diff --git a/src/config.js b/src/config.js index 39118f5..c60b124 100644 --- a/src/config.js +++ b/src/config.js @@ -1,8 +1,6 @@ const fs = require('fs'); const os = require('os'); const path = require('path'); -const { confirm } = require('@clack/prompts'); -const color = require('picocolors'); let config = {}; @@ -11,6 +9,7 @@ let config = {}; * 1. Command line arguments * 2. Environment variables * 3. quant.json file + * 4. Default values */ async function fromArgs(args = {}) { // First check environment variables @@ -18,7 +17,7 @@ async function fromArgs(args = {}) { clientid: process.env.QUANT_CLIENT_ID, project: process.env.QUANT_PROJECT, token: process.env.QUANT_TOKEN, - endpoint: process.env.QUANT_ENDPOINT, + endpoint: process.env.QUANT_ENDPOINT || 'https://api.quantcdn.io/v1', bearer: process.env.QUANT_BEARER }; @@ -30,8 +29,9 @@ async function fromArgs(args = {}) { // File doesn't exist or is invalid JSON - that's ok } - // Merge configs with precedence: args > env > file + // Merge configs with precedence: args > env > file > defaults config = { + ...config, // Default values ...fileConfig, ...Object.fromEntries( Object.entries(envConfig).filter(([_, v]) => v !== undefined) @@ -41,43 +41,12 @@ async function fromArgs(args = {}) { ) }; - // Check if we have required configuration - const hasConfig = ( + // Ensure required fields are present + return ( config.clientid !== undefined && config.project !== undefined && (config.token !== undefined || config.bearer !== undefined) ); - - // If no config is found and this isn't the init command - if (!hasConfig && args._[0] !== 'init') { - console.log(color.yellow('No configuration found.')); - - const shouldInit = await confirm({ - message: 'Would you like to initialize a new project?', - initialValue: true - }); - - if (shouldInit) { - // Load and execute the init command - const initCommand = require('./commands/init'); - const initArgs = await initCommand.promptArgs(); - if (initArgs) { - await initCommand.handler(initArgs); - // Reload config after init - return fromArgs(args); - } - } - - console.log(color.yellow('\nConfiguration required to continue. You can:')); - console.log(color.yellow('1. Run "quant init" to create a new configuration')); - console.log(color.yellow('2. Create a quant.json file in this directory')); - console.log(color.yellow('3. Set environment variables (QUANT_CLIENT_ID, QUANT_PROJECT, QUANT_TOKEN)')); - console.log(color.yellow('4. Provide configuration via command line arguments\n')); - - return false; - } - - return hasConfig; } function get(key) { diff --git a/src/quant-client.js b/src/quant-client.js index 6eb99c6..7577b41 100644 --- a/src/quant-client.js +++ b/src/quant-client.js @@ -9,27 +9,44 @@ const path = require("path"); const mime = require("mime-types"); const querystring = require("querystring"); const quantURL = require("./helper/quant-url"); +const config = require('./config'); -const client = function (config) { - const req = axios; - const get = axios.get; - const post = axios.post; - const patch = axios.patch; - const del = axios.delete; - +module.exports = function (config) { + // Set up headers with correct Quant header names const headers = { - "User-Agent": "Quant (+http://api.quantcdn.io)", - "Quant-Token": config.get("token"), - "Quant-Customer": config.get("clientid"), - "Quant-Organisation": config.get("clientid"), - "Quant-Project": config.get("project"), - "Content-Type": "application/json", + 'Content-Type': 'application/json', + 'Quant-Customer': config.get('clientid'), + 'Quant-Project': config.get('project'), + 'Quant-Token': config.get('token'), + 'Quant-Organisation': config.get('clientid') }; - if (config.get("bearer")) { - headers.Authorization = `Bearer ${config.get("bearer")}`; + if (config.get('bearer')) { + headers['Authorization'] = `Bearer ${config.get('bearer')}`; } + // Create axios instance with dynamic baseURL + const client = axios.create({ + baseURL: config.get('endpoint') + }); + + // Helper functions for HTTP methods + const get = async (url, options = {}) => { + return await client.get(url, { ...options, headers: { ...headers, ...options.headers } }); + }; + + const post = async (url, data, options = {}) => { + return await client.post(url, data, { ...options, headers: { ...headers, ...options.headers } }); + }; + + const patch = async (url, data, options = {}) => { + return await client.patch(url, data, { ...options, headers: { ...headers, ...options.headers } }); + }; + + const del = async (url, options = {}) => { + return await client.delete(url, { ...options, headers: { ...headers, ...options.headers } }); + }; + /** * Handle the response. * @@ -40,6 +57,12 @@ const client = function (config) { * The API response. */ const handleResponse = function (response) { + // If this is an error response, format it + if (response.isAxiosError) { + const errorData = response.response && response.response.data ? response.response.data : {}; + throw new Error(formatError(response)); + } + const body = typeof response.data == "string" ? JSON.parse(response.data) @@ -50,28 +73,47 @@ const client = function (config) { for (i in body.errors) { msg += body.errors[i].errorMsg + "\n"; } - throw new Error(msg); + throw new Error(`${msg}\nResponse: ${JSON.stringify(body, null, 2)}`); } if (response.statusCode == 400) { - // @TODO: this is generally if the content is - // streamed to the endpoint 4xx and 5xx are thrown - // similarly, the API should respond with errors - // otherwise. if (typeof body.errorMsg != "undefined") { - throw new Error(body.errorMsg); + throw new Error(`${body.errorMsg}\nResponse: ${JSON.stringify(body, null, 2)}`); } - throw new Error("Critical error..."); + throw new Error(`Critical error...\nResponse: ${JSON.stringify(body, null, 2)}`); } if (body.error || (typeof body.errorMsg != "undefined" && body.errorMsg.length > 0)) { const msg = typeof body.errorMsg != "undefined" ? body.errorMsg : body.msg; - throw new Error(msg); + throw new Error(`${msg}\nResponse: ${JSON.stringify(body, null, 2)}`); } return body; }; + // Helper function to format error message + function formatErrorMessage(error) { + if (error.response) { + // The request was made and the server responded with a status code + // that falls out of the range of 2xx + return `${error.message}\nResponse: ${JSON.stringify(error.response.data, null, 2)}`; + } else if (error.request) { + // The request was made but no response was received + return `No response received: ${error.message}`; + } else { + // Something happened in setting up the request that triggered an Error + return error.message; + } + } + + // Add this helper function for consistent error handling + function formatError(error) { + if (error.response && error.response.data) { + return `${error.message}\nResponse: ${JSON.stringify(error.response.data, null, 2)}`; + } + return error.message; + } + return { /** * Ping the quant API. @@ -82,9 +124,12 @@ const client = function (config) { * @throws Error. */ ping: async function () { - const url = `${config.get("endpoint")}/ping`; - const res = await get(url, { headers }); - return handleResponse(res); + try { + const res = await get(`/ping`); + return handleResponse(res); + } catch (error) { + throw new Error(formatError(error)); + } }, /** @@ -117,9 +162,9 @@ const client = function (config) { }, extend, ); - const url = `${config.get("endpoint")}/global-meta?${querystring.stringify(query)}`; + const url = `/global-meta?${querystring.stringify(query)}`; const doUnfold = async function (i) { - const res = await get(`${url}&page=${i}`, { headers }); + const res = await get(`${url}&page=${i}`); if (res.data.global_meta && res.data.global_meta.records) { res.data.global_meta.records.map((item) => records.push({ @@ -133,7 +178,7 @@ const client = function (config) { let page = 1; // Seed the record set. - const res = await get(`${url}&page=${page}`, { headers }); + const res = await get(`${url}&page=${page}`); if (!res.data.global_meta) { // If no records have been published then global_meta is not @@ -599,11 +644,12 @@ const client = function (config) { }, body: data, }; - const res = await post(options.url, options.body, { - headers: options.headers, - }); - - return handleResponse(res); + try { + const res = await post(options.url, options.body, { headers: options.headers }); + return handleResponse(res); + } catch (error) { + throw new Error(formatError(error)); + } }, /** @@ -621,9 +667,12 @@ const client = function (config) { "Quant-Url": url, }, }; - const res = await del(options.url, { headers: options.headers }); - - return handleResponse(res); + try { + const res = await del(options.url, { headers: options.headers }); + return handleResponse(res); + } catch (error) { + throw new Error(formatError(error)); + } }, /** @@ -639,9 +688,12 @@ const client = function (config) { }, json: true, }; - const res = await del(options.url, { headers: options.headers }); - - return handleResponse(res); + try { + const res = await del(options.url, { headers: options.headers }); + return handleResponse(res); + } catch (error) { + throw new Error(formatError(error)); + } }, /** @@ -657,9 +709,12 @@ const client = function (config) { }, json: true, }; - const res = await get(options.url, { headers: options.headers }); - - return handleResponse(res); + try { + const res = await get(options.url, { headers: options.headers }); + return handleResponse(res); + } catch (error) { + throw new Error(formatError(error)); + } }, /** @@ -673,66 +728,22 @@ const client = function (config) { * @return {object} * A list of all WAF logs. */ - wafLogs: async function (unfold = false, extend = {}) { - const logs = []; - const url = `${config.get("endpoint")}/waf/logs`; - const query = Object.assign( - { - per_page: 10, - }, - extend, - ); - const doUnfold = async function (i) { - let res; - query.page = i; - try { - res = await get(`${url}?${querystring.stringify(query)}`, { - headers, - }); - } catch (err) { - console.log(err); - return false; - } - if (res.data.data) { - logs.push(...res.data.data); - } - return res.data.next != ""; - }; - - const options = { - url: `${url}?${querystring.stringify(query)}`, - headers, - }; - - const res = await get(options, url, { headers: options.headers }); - - if (res.statusCode == 403) { - return -1; - } - - if ( - typeof res.data == "undefined" || - typeof res.data.data == "undefined" - ) { - return logs; - } - - logs.push(...res.data.data); - let page = 1; - if (unfold && res.data.next != "") { - let more; - do { - page++; - more = await doUnfold(page); - } while (more && page <= 100); + wafLogs: async function (all = false, options = {}) { + try { + const response = await get('/waf/logs', { + params: { + per_page: options.per_page || 10 + } + }); + return handleResponse(response); + } catch (error) { + console.log('WAF logs error:', { + message: error.message, + code: error.code, + response: error.response && error.response.data + }); + throw error; } - return logs; }, }; }; - -module.exports = function () { - return module.exports.client.apply(this, arguments); -}; - -module.exports.client = client; From 617530ea02fa036f48b21f1d3872f8c71a03e6fb Mon Sep 17 00:00:00 2001 From: Stuart Rowlands Date: Fri, 22 Nov 2024 20:08:18 +1000 Subject: [PATCH 03/41] Much more efficient scan command (batched meta queries). Scan will update the local revision log. Fixed local revision log (write to cwd). --- package-lock.json | 893 +++++++++++++++------------------------- src/commands/delete.js | 64 ++- src/commands/deploy.js | 248 +++++++++-- src/commands/scan.js | 172 ++++++-- src/commands/waflogs.js | 49 ++- src/config.js | 44 +- src/helper/revisions.js | 134 ++---- src/quant-client.js | 122 ++---- 8 files changed, 872 insertions(+), 854 deletions(-) diff --git a/package-lock.json b/package-lock.json index aacc176..8bf2440 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,10 +19,8 @@ "md5-file": "^5.0.0", "mime-types": "^2.1.27", "papaparse": "^5.4.1", - "prompt": "^1.1.0", - "simplecrawler": "^1.1.9", + "picocolors": "^1.0.0", "string.prototype.matchall": "^4.0.2", - "tmp": "^0.2.1", "yargs": "^17.0.1" }, "bin": { @@ -80,19 +78,10 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/@colors/colors": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz", - "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==", - "license": "MIT", - "engines": { - "node": ">=0.1.90" - } - }, "node_modules/@es-joy/jsdoccomment": { - "version": "0.48.0", - "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.48.0.tgz", - "integrity": "sha512-G6QUWIcC+KvSwXNsJyDTHvqUdNoAVJPPgkc3+Uk4WBKqZvoXhlvazOgm9aL0HwihJLQf0l+tOE2UFzXBqCqgDw==", + "version": "0.49.0", + "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.49.0.tgz", + "integrity": "sha512-xjZTSFgECpb9Ohuk5yMX5RhUEbfeQcuOp8IF60e+wyzWEF0M5xeSgqsfLtvPEX8BIyOX9saZqzuGPmZ8oWc+5Q==", "dev": true, "license": "MIT", "dependencies": { @@ -105,17 +94,20 @@ } }, "node_modules/@eslint-community/eslint-utils": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", - "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz", + "integrity": "sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==", "dev": true, "license": "MIT", "dependencies": { - "eslint-visitor-keys": "^3.3.0" + "eslint-visitor-keys": "^3.4.3" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, + "funding": { + "url": "https://opencollective.com/eslint" + }, "peerDependencies": { "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" } @@ -134,9 +126,9 @@ } }, "node_modules/@eslint-community/regexpp": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz", - "integrity": "sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==", + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz", + "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==", "dev": true, "license": "MIT", "engines": { @@ -144,9 +136,9 @@ } }, "node_modules/@eslint/config-array": { - "version": "0.17.1", - "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.17.1.tgz", - "integrity": "sha512-BlYOpej8AQ8Ev9xVqroV7a02JK3SkBAaN9GfMMH9W6Ch8FlQlkjGw4Ir7+FgYwfirivAf4t+GtzuAxqfukmISA==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.0.tgz", + "integrity": "sha512-zdHg2FPIFNKPdcHWtiNT+jEFCHYVplAXRDlQDyqy0zGx/q2parwh7brGJSiTxRk/TSMkbM//zt/f5CHgyTyaSQ==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -158,10 +150,20 @@ "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, + "node_modules/@eslint/core": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.9.0.tgz", + "integrity": "sha512-7ATR9F0e4W85D/0w7cU0SNj7qkAexMG+bAHEZOjo9akvGuhHE2m7umzWzfnpa0XAg5Kxc1BWmtPMV67jJ+9VUg==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, "node_modules/@eslint/eslintrc": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.1.0.tgz", - "integrity": "sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.2.0.tgz", + "integrity": "sha512-grOjVNN8P3hjJn/eIETF1wwd12DdnwFDoyceUJLYYdkpbwq3nLi+4fqrTAONx7XDALqlL220wC/RHSC/QTI/0w==", "dev": true, "license": "MIT", "dependencies": { @@ -183,9 +185,9 @@ } }, "node_modules/@eslint/js": { - "version": "9.8.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.8.0.tgz", - "integrity": "sha512-MfluB7EUfxXtv3i/++oh89uzAr4PDI4nn201hsp+qaXqsjAWzinlZEHEfPgAX4doIlKvPG/i0A9dpKxOLII8yA==", + "version": "9.15.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.15.0.tgz", + "integrity": "sha512-tMTqrY+EzbXmKJR5ToI8lxu7jaN5EdmrBFJpQk5JmSlyLsx6o4t27r883K5xsLuCYCpfKBCGswMSWXsM+jB7lg==", "dev": true, "license": "MIT", "engines": { @@ -202,6 +204,57 @@ "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, + "node_modules/@eslint/plugin-kit": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.3.tgz", + "integrity": "sha512-2b/g5hRmpbb1o4GnTZax9N9m0FXzz9OV42ZzI4rDDMDuHUqigAiQCEWChBWCY4ztAGVRjoWT19v0yMmc5/L5kA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "levn": "^0.4.1" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@humanfs/core": { + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz", + "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=18.18.0" + } + }, + "node_modules/@humanfs/node": { + "version": "0.16.6", + "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz", + "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@humanfs/core": "^0.19.1", + "@humanwhocodes/retry": "^0.3.0" + }, + "engines": { + "node": ">=18.18.0" + } + }, + "node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz", + "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=18.18" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, "node_modules/@humanwhocodes/module-importer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", @@ -217,9 +270,9 @@ } }, "node_modules/@humanwhocodes/retry": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.0.tgz", - "integrity": "sha512-d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew==", + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.1.tgz", + "integrity": "sha512-c7hNEllBlenFTHBky65mhq8WD2kbN9Q6gk0bTk8lSBvc554jpXSkST1iePudpt7+A/AQvuHs9EMqjHDXMY1lrA==", "dev": true, "license": "Apache-2.0", "engines": { @@ -247,81 +300,6 @@ "node": ">=12" } }, - "node_modules/@isaacs/cliui/node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/@isaacs/cliui/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "license": "MIT", - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/@nodelib/fs.scandir": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", - "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", - "dev": true, - "license": "MIT", - "dependencies": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.stat": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.walk": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", - "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@pkgjs/parseargs": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", - "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", - "license": "MIT", - "optional": true, - "engines": { - "node": ">=14" - } - }, "node_modules/@pkgr/core": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.1.1.tgz", @@ -398,10 +376,24 @@ "dev": true, "license": "(Unlicense OR Apache-2.0)" }, + "node_modules/@types/estree": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", + "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/json-schema": { + "version": "7.0.15", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", + "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", + "dev": true, + "license": "MIT" + }, "node_modules/acorn": { - "version": "8.12.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz", - "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==", + "version": "8.14.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz", + "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==", "dev": true, "license": "MIT", "bin": { @@ -449,12 +441,15 @@ } }, "node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", + "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", "license": "MIT", "engines": { - "node": ">=8" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" } }, "node_modules/ansi-styles": { @@ -560,12 +555,6 @@ "node": ">=12" } }, - "node_modules/async": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz", - "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==", - "license": "MIT" - }, "node_modules/asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", @@ -588,9 +577,9 @@ } }, "node_modules/axios": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.3.tgz", - "integrity": "sha512-Ar7ND9pU99eJ9GpoGQKhKf58GpUOgnzuaB7ueNQ5BMi0p+LZ5oaEnfF999fAArcTIBwXTCHAmGcHOZJaWPq9Nw==", + "version": "1.7.7", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz", + "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==", "license": "MIT", "dependencies": { "follow-redirects": "^1.15.6", @@ -705,9 +694,9 @@ } }, "node_modules/chai": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/chai/-/chai-5.1.1.tgz", - "integrity": "sha512-pT1ZgP8rPNqUgieVaEY+ryQr6Q4HXNg8Ei9UnLUrjN4IA7dvQC5JB+/kxVcPNDHyBcc/26CXPkbNzq3qwrOEKA==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/chai/-/chai-5.1.2.tgz", + "integrity": "sha512-aGtmf24DW6MLHHG5gCx4zaI3uBq3KRtxeVs0DjFH6Z0rDNbsvTxFASFvdj79pxjxZ8/5u3PIiN3IwEIQkiiuPw==", "dev": true, "license": "MIT", "dependencies": { @@ -812,6 +801,15 @@ "node": ">=12" } }, + "node_modules/cliui/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/cliui/node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -832,6 +830,18 @@ "node": ">=8" } }, + "node_modules/cliui/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/cliui/node_modules/wrap-ansi": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", @@ -867,15 +877,6 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "license": "MIT" }, - "node_modules/colors": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz", - "integrity": "sha512-pFGrxThWcWQ2MsAz6RtgeWe4NK2kUE1WfsrvvlctdII745EW9I0yflqhe7++M5LEc7bV2c/9/5zc8sFcpL0Drw==", - "license": "MIT", - "engines": { - "node": ">=0.1.90" - } - }, "node_modules/combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", @@ -912,9 +913,9 @@ "license": "MIT" }, "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "license": "MIT", "dependencies": { "path-key": "^3.1.0", @@ -925,14 +926,6 @@ "node": ">= 8" } }, - "node_modules/cycle": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz", - "integrity": "sha512-TVF6svNzeQCOpjCqsy0/CSy8VgObG3wXusJ73xW2GbG5rGx7lC8zxDSURicsXI2UsGdi2L0QNRCi745/wUDvsA==", - "engines": { - "node": ">=0.4.0" - } - }, "node_modules/d": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/d/-/d-1.0.2.tgz", @@ -999,13 +992,13 @@ } }, "node_modules/debug": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", - "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", + "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", "dev": true, "license": "MIT", "dependencies": { - "ms": "2.1.2" + "ms": "^2.1.3" }, "engines": { "node": ">=6.0" @@ -1112,9 +1105,9 @@ "license": "MIT" }, "node_modules/es-abstract": { - "version": "1.23.3", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz", - "integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==", + "version": "1.23.5", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.5.tgz", + "integrity": "sha512-vlmniQ0WNPwXqA0BnmwV3Ng7HxiGlh6r5U6JcTMNx8OilcAGqVJBHJcPjqOMaczU9fRuRK5Px2BdVyPRnKMMVQ==", "license": "MIT", "dependencies": { "array-buffer-byte-length": "^1.0.1", @@ -1132,7 +1125,7 @@ "function.prototype.name": "^1.1.6", "get-intrinsic": "^1.2.4", "get-symbol-description": "^1.0.2", - "globalthis": "^1.0.3", + "globalthis": "^1.0.4", "gopd": "^1.0.1", "has-property-descriptors": "^1.0.2", "has-proto": "^1.0.3", @@ -1148,10 +1141,10 @@ "is-string": "^1.0.7", "is-typed-array": "^1.1.13", "is-weakref": "^1.0.2", - "object-inspect": "^1.13.1", + "object-inspect": "^1.13.3", "object-keys": "^1.1.1", "object.assign": "^4.1.5", - "regexp.prototype.flags": "^1.5.2", + "regexp.prototype.flags": "^1.5.3", "safe-array-concat": "^1.1.2", "safe-regex-test": "^1.0.3", "string.prototype.trim": "^1.2.9", @@ -1286,9 +1279,9 @@ } }, "node_modules/escalade": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", - "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", "license": "MIT", "engines": { "node": ">=6" @@ -1308,28 +1301,32 @@ } }, "node_modules/eslint": { - "version": "9.8.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.8.0.tgz", - "integrity": "sha512-K8qnZ/QJzT2dLKdZJVX6W4XOwBzutMYmt0lqUS+JdXgd+HTYFlonFgkJ8s44d/zMPPCnOOk0kMWCApCPhiOy9A==", + "version": "9.15.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.15.0.tgz", + "integrity": "sha512-7CrWySmIibCgT1Os28lUU6upBshZ+GxybLOrmRzi08kS8MBuO8QA7pXEgYgY5W8vK3e74xv0lpjo9DbaGU9Rkw==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", - "@eslint-community/regexpp": "^4.11.0", - "@eslint/config-array": "^0.17.1", - "@eslint/eslintrc": "^3.1.0", - "@eslint/js": "9.8.0", + "@eslint-community/regexpp": "^4.12.1", + "@eslint/config-array": "^0.19.0", + "@eslint/core": "^0.9.0", + "@eslint/eslintrc": "^3.2.0", + "@eslint/js": "9.15.0", + "@eslint/plugin-kit": "^0.2.3", + "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", - "@humanwhocodes/retry": "^0.3.0", - "@nodelib/fs.walk": "^1.2.8", + "@humanwhocodes/retry": "^0.4.1", + "@types/estree": "^1.0.6", + "@types/json-schema": "^7.0.15", "ajv": "^6.12.4", "chalk": "^4.0.0", - "cross-spawn": "^7.0.2", + "cross-spawn": "^7.0.5", "debug": "^4.3.2", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^8.0.2", - "eslint-visitor-keys": "^4.0.0", - "espree": "^10.1.0", + "eslint-scope": "^8.2.0", + "eslint-visitor-keys": "^4.2.0", + "espree": "^10.3.0", "esquery": "^1.5.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", @@ -1339,15 +1336,11 @@ "ignore": "^5.2.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", - "is-path-inside": "^3.0.3", "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.4.1", "lodash.merge": "^4.6.2", "minimatch": "^3.1.2", "natural-compare": "^1.4.0", - "optionator": "^0.9.3", - "strip-ansi": "^6.0.1", - "text-table": "^0.2.0" + "optionator": "^0.9.3" }, "bin": { "eslint": "bin/eslint.js" @@ -1357,6 +1350,14 @@ }, "funding": { "url": "https://eslint.org/donate" + }, + "peerDependencies": { + "jiti": "*" + }, + "peerDependenciesMeta": { + "jiti": { + "optional": true + } } }, "node_modules/eslint-config-google": { @@ -1373,13 +1374,13 @@ } }, "node_modules/eslint-plugin-jsdoc": { - "version": "50.2.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-50.2.1.tgz", - "integrity": "sha512-KbGhcct6JxzM0x1gjqH1hf4vvc+YNMag5JXyMuPFIPP9THWctRg3UgBUjNcI6a6Rw+1GdKeJ3vTmSICLVF0mtw==", + "version": "50.5.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-50.5.0.tgz", + "integrity": "sha512-xTkshfZrUbiSHXBwZ/9d5ulZ2OcHXxSvm/NPo494H/hadLRJwOq5PMV0EUpMqsb9V+kQo+9BAgi6Z7aJtdBp2A==", "dev": true, "license": "BSD-3-Clause", "dependencies": { - "@es-joy/jsdoccomment": "~0.48.0", + "@es-joy/jsdoccomment": "~0.49.0", "are-docs-informative": "^0.0.2", "comment-parser": "1.4.1", "debug": "^4.3.6", @@ -1399,9 +1400,9 @@ } }, "node_modules/eslint-scope": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.0.2.tgz", - "integrity": "sha512-6E4xmrTw5wtxnLA5wYL3WDfhZ/1bUBGOXV0zQvVRDOtrR8D0p6W7fs3JweNYhwRYeGvd/1CKX2se0/2s7Q/nJA==", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.2.0.tgz", + "integrity": "sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==", "dev": true, "license": "BSD-2-Clause", "dependencies": { @@ -1416,9 +1417,9 @@ } }, "node_modules/eslint-visitor-keys": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz", - "integrity": "sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", + "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", "dev": true, "license": "Apache-2.0", "engines": { @@ -1445,15 +1446,15 @@ } }, "node_modules/espree": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-10.1.0.tgz", - "integrity": "sha512-M1M6CpiE6ffoigIOWYO9UDP8TMUw9kqb21tf+08IgDYjCsOvCuDt4jQcZmoYxx+w7zlKw9/N0KXfto+I8/FrXA==", + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz", + "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==", "dev": true, "license": "BSD-2-Clause", "dependencies": { - "acorn": "^8.12.0", + "acorn": "^8.14.0", "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^4.0.0" + "eslint-visitor-keys": "^4.2.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -1529,14 +1530,6 @@ "type": "^2.7.2" } }, - "node_modules/eyes": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz", - "integrity": "sha512-GipyPsXO1anza0AOZdy69Im7hGFCNB7Y/NGjDlZGJ3GJJLtwNSb2vrzYrTYJRrRloVx7pl+bhUaTB8yiccPvFQ==", - "engines": { - "node": "> 0.1.90" - } - }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -1558,16 +1551,6 @@ "dev": true, "license": "MIT" }, - "node_modules/fastq": { - "version": "1.17.1", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", - "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", - "dev": true, - "license": "ISC", - "dependencies": { - "reusify": "^1.0.4" - } - }, "node_modules/file-entry-cache": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", @@ -1636,16 +1619,16 @@ } }, "node_modules/flatted": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", - "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.2.tgz", + "integrity": "sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA==", "dev": true, "license": "ISC" }, "node_modules/follow-redirects": { - "version": "1.15.6", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", - "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==", + "version": "1.15.9", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz", + "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==", "funding": [ { "type": "individual", @@ -1688,9 +1671,9 @@ } }, "node_modules/form-data": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", - "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz", + "integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==", "license": "MIT", "dependencies": { "asynckit": "^0.4.0", @@ -1776,16 +1759,6 @@ "dev": true, "license": "ISC" }, - "node_modules/get-func-name": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz", - "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": "*" - } - }, "node_modules/get-intrinsic": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", @@ -2030,22 +2003,10 @@ ], "license": "MIT" }, - "node_modules/iconv-lite": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.2.tgz", - "integrity": "sha512-kERHXvpSaB4aU3eANwidg79K8FlrN77m8G9V+0vOR3HYaRifrlwMEpT7ZBJqLSEIHnEgJTHcWK82wwLwwKwtag==", - "license": "MIT", - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/ignore": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz", - "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", "dev": true, "license": "MIT", "engines": { @@ -2325,16 +2286,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-path-inside": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", - "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, "node_modules/is-plain-obj": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", @@ -2425,7 +2376,6 @@ "version": "0.1.0", "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", - "dev": true, "license": "MIT", "engines": { "node": ">=10" @@ -2458,16 +2408,10 @@ "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", "license": "ISC" }, - "node_modules/isstream": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==", - "license": "MIT" - }, "node_modules/jackspeak": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.0.1.tgz", - "integrity": "sha512-cub8rahkh0Q/bw1+GxP7aeSe29hHHn2V4m29nnDlvCdlgU+3UGxkZp7Z53jLUdpX3jdTO0nJZUDl3xvbWc2Xog==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.0.2.tgz", + "integrity": "sha512-bZsjR/iRjl1Nk1UkjGpAzLNfQtzuijhn2g+pbZb98HQ1Gk8vM9hfbxeMBP+M2/UUdwj0RqGG3mlvk2MsAqwvEw==", "license": "BlueOak-1.0.0", "dependencies": { "@isaacs/cliui": "^8.0.2" @@ -2477,9 +2421,6 @@ }, "funding": { "url": "https://github.com/sponsors/isaacs" - }, - "optionalDependencies": { - "@pkgjs/parseargs": "^0.11.0" } }, "node_modules/js-yaml": { @@ -2604,12 +2545,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "license": "MIT" - }, "node_modules/lodash.get": { "version": "4.4.2", "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", @@ -2649,19 +2584,16 @@ } }, "node_modules/loupe": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.1.tgz", - "integrity": "sha512-edNu/8D5MKVfGVFRhFf8aAxiTM6Wumfz5XsaatSxlD3w4R1d/WEKUTydCdPGbl9K7QG/Ca3GnDV2sIKIpXRQcw==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.2.tgz", + "integrity": "sha512-23I4pFZHmAemUnz8WZXbYRSKYj801VDaNv9ETuMh7IrMc7VuVVSo+Z9iLE3ni30+U48iDWfi30d3twAXBYmnCg==", "dev": true, - "license": "MIT", - "dependencies": { - "get-func-name": "^2.0.1" - } + "license": "MIT" }, "node_modules/lru-cache": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.0.0.tgz", - "integrity": "sha512-Qv32eSV1RSCfhY3fpPE2GNZ8jgM9X7rdAfemLWqTUxwiyIC4jJ6Sy0fZ8H+oLWevO6i4/bizg7c8d8i6bxrzbA==", + "version": "11.0.2", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.0.2.tgz", + "integrity": "sha512-123qHRfJBmo2jXDbo/a5YOQrJoHF/GNQTLzQ5+IdK5pWpceK17yRc6ozlWd25FxvGKQbIUs91fDFkXmDHTKcyA==", "license": "ISC", "engines": { "node": "20 || >=22" @@ -2723,9 +2655,9 @@ } }, "node_modules/mocha": { - "version": "10.7.0", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.7.0.tgz", - "integrity": "sha512-v8/rBWr2VO5YkspYINnvu81inSz2y3ODJrhO175/Exzor1RcEZZkizgE2A+w/CAXXoESS8Kys5E62dOHGHzULA==", + "version": "10.8.2", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.8.2.tgz", + "integrity": "sha512-VZlYo/WE8t1tstuRmqgeyBgCbJc/lEdopaa+axcKzTBJ+UIdlAB9XnmvTCAH4pwR4ElNInaedhEBmZD8iCSVEg==", "dev": true, "license": "MIT", "dependencies": { @@ -2758,6 +2690,16 @@ "node": ">= 14.0.0" } }, + "node_modules/mocha/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/mocha/node_modules/brace-expansion": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", @@ -2831,13 +2773,6 @@ "node": ">=10" } }, - "node_modules/mocha/node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true, - "license": "MIT" - }, "node_modules/mocha/node_modules/string-width": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", @@ -2853,6 +2788,19 @@ "node": ">=8" } }, + "node_modules/mocha/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/mocha/node_modules/supports-color": { "version": "8.1.1", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", @@ -2934,18 +2882,12 @@ } }, "node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true, "license": "MIT" }, - "node_modules/mute-stream": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", - "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", - "license": "ISC" - }, "node_modules/natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", @@ -2985,9 +2927,9 @@ } }, "node_modules/object-inspect": { - "version": "1.13.2", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz", - "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==", + "version": "1.13.3", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.3.tgz", + "integrity": "sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==", "license": "MIT", "engines": { "node": ">= 0.4" @@ -3092,9 +3034,9 @@ } }, "node_modules/package-json-from-dist": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz", - "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz", + "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==", "license": "BlueOak-1.0.0" }, "node_modules/papaparse": { @@ -3117,11 +3059,11 @@ } }, "node_modules/parse-imports": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/parse-imports/-/parse-imports-2.1.1.tgz", - "integrity": "sha512-TDT4HqzUiTMO1wJRwg/t/hYk8Wdp3iF/ToMIlAoVQfL1Xs/sTxq1dKWSMjMbQmIarfWKymOyly40+zmPHXMqCA==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/parse-imports/-/parse-imports-2.2.1.tgz", + "integrity": "sha512-OL/zLggRp8mFhKL0rNORUTR4yBYujK/uU+xZL+/0Rgm2QE4nLO9v8PzEweSJEbMGKmDRjJE4R3IMJlL2di4JeQ==", "dev": true, - "license": "Apache-2.0", + "license": "Apache-2.0 AND MIT", "dependencies": { "es-module-lexer": "^1.5.3", "slashes": "^3.0.12" @@ -3229,22 +3171,6 @@ "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", "license": "MIT" }, - "node_modules/prompt": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/prompt/-/prompt-1.3.0.tgz", - "integrity": "sha512-ZkaRWtaLBZl7KKAKndKYUL8WqNT+cQHKRZnT4RYYms48jQkFw3rrBL+/N5K/KtdEveHkxs982MX2BkDKub2ZMg==", - "license": "MIT", - "dependencies": { - "@colors/colors": "1.5.0", - "async": "3.2.3", - "read": "1.0.x", - "revalidator": "0.1.x", - "winston": "2.x" - }, - "engines": { - "node": ">= 6.0.0" - } - }, "node_modules/proxy-from-env": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", @@ -3261,27 +3187,6 @@ "node": ">=6" } }, - "node_modules/queue-microtask": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT" - }, "node_modules/randombytes": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", @@ -3292,18 +3197,6 @@ "safe-buffer": "^5.1.0" } }, - "node_modules/read": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz", - "integrity": "sha512-rSOKNYUmaxy0om1BNjMN4ezNT6VKK+2xF4GBhc81mkH7L60i6dp8qPYrkndNLT3QPphoII3maL9PVC9XmhHwVQ==", - "license": "ISC", - "dependencies": { - "mute-stream": "~0.0.4" - }, - "engines": { - "node": ">=0.8" - } - }, "node_modules/readable-stream": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", @@ -3333,15 +3226,15 @@ } }, "node_modules/regexp.prototype.flags": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz", - "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==", + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.3.tgz", + "integrity": "sha512-vqlC04+RQoFalODCbCumG2xIOvapzVMHwsyIGM/SIE8fRhFFsXeH8/QQ+s0T0kDAhKc4k30s73/0ydkHQz6HlQ==", "license": "MIT", "dependencies": { - "call-bind": "^1.0.6", + "call-bind": "^1.0.7", "define-properties": "^1.2.1", "es-errors": "^1.3.0", - "set-function-name": "^2.0.1" + "set-function-name": "^2.0.2" }, "engines": { "node": ">= 0.4" @@ -3376,56 +3269,6 @@ "node": ">=4" } }, - "node_modules/reusify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", - "dev": true, - "license": "MIT", - "engines": { - "iojs": ">=1.0.0", - "node": ">=0.10.0" - } - }, - "node_modules/revalidator": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz", - "integrity": "sha512-xcBILK2pA9oh4SiinPEZfhP8HfrB/ha+a2fTMyl7Om2WjlDVrOQy99N2MXXlUHqGJz4qEu2duXxHJjDWuK/0xg==", - "license": "Apache 2.0", - "engines": { - "node": ">= 0.4.0" - } - }, - "node_modules/robots-parser": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/robots-parser/-/robots-parser-2.4.0.tgz", - "integrity": "sha512-oO8f2SI04dJk3pbj2KOMJ4G6QfPAgqcGmrYGmansIcpRewIPT2ljWEt5I+ip6EgiyaLo+RXkkUWw74M25HDkMA==", - "license": "MIT" - }, - "node_modules/run-parallel": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", - "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT", - "dependencies": { - "queue-microtask": "^1.2.2" - } - }, "node_modules/safe-array-concat": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz", @@ -3473,12 +3316,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "license": "MIT" - }, "node_modules/semver": { "version": "7.6.3", "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", @@ -3585,24 +3422,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/simplecrawler": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/simplecrawler/-/simplecrawler-1.1.9.tgz", - "integrity": "sha512-IY5YmeJWvfc1zpy9so1p/EknCqNum3Y9tmnzuLWZqKEwbntGXPGvN0SOtr+XqT4BHjfek2C12g3Tg1yK7Hoh8g==", - "license": "BSD-2-Clause", - "dependencies": { - "async": "^3.1.0", - "iconv-lite": "^0.5.0", - "robots-parser": "^2.1.1", - "urijs": "^1.19.1" - }, - "bin": { - "crawl": "lib/cli.js" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/sinon": { "version": "19.0.2", "resolved": "https://registry.npmjs.org/sinon/-/sinon-19.0.2.tgz", @@ -3675,21 +3494,12 @@ } }, "node_modules/spdx-license-ids": { - "version": "3.0.18", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.18.tgz", - "integrity": "sha512-xxRs31BqRYHwiMzudOrpSiHtZ8i/GeionCBDSilhYRj+9gIcI8wCZTlXZKu9vZIVqViP3dcp9qE5G6AlIaD+TQ==", + "version": "3.0.20", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.20.tgz", + "integrity": "sha512-jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw==", "dev": true, "license": "CC0-1.0" }, - "node_modules/stack-trace": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", - "integrity": "sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==", - "license": "MIT", - "engines": { - "node": "*" - } - }, "node_modules/string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", @@ -3731,37 +3541,31 @@ "node": ">=8" } }, + "node_modules/string-width-cjs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/string-width-cjs/node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", "license": "MIT" }, - "node_modules/string-width/node_modules/ansi-regex": { + "node_modules/string-width-cjs/node_modules/strip-ansi": { "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/string-width/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "license": "MIT", "dependencies": { - "ansi-regex": "^6.0.1" + "ansi-regex": "^5.0.1" }, "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" + "node": ">=8" } }, "node_modules/string.prototype.matchall": { @@ -3840,15 +3644,18 @@ } }, "node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", "license": "MIT", "dependencies": { - "ansi-regex": "^5.0.1" + "ansi-regex": "^6.0.1" }, "engines": { - "node": ">=8" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" } }, "node_modules/strip-ansi-cjs": { @@ -3864,6 +3671,15 @@ "node": ">=8" } }, + "node_modules/strip-ansi-cjs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/strip-json-comments": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", @@ -3890,9 +3706,9 @@ } }, "node_modules/synckit": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.9.1.tgz", - "integrity": "sha512-7gr8p9TQP6RAHusBOSLs46F4564ZrjV8xFmw5zCmgmhGUcw2hxsShhJ6CEiHQMgPDwAQ1fWHPM0ypc4RMAig4A==", + "version": "0.9.2", + "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.9.2.tgz", + "integrity": "sha512-vrozgXDQwYO72vHjUb/HnFbQx1exDjoKzqx23aXEg2a9VIg2TSFZ8FmeZpTjUCFMYw7mpX4BE2SFu8wI7asYsw==", "dev": true, "license": "MIT", "dependencies": { @@ -3906,13 +3722,6 @@ "url": "https://opencollective.com/unts" } }, - "node_modules/text-table": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", - "dev": true, - "license": "MIT" - }, "node_modules/through": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", @@ -3929,15 +3738,6 @@ "readable-stream": "2 || 3" } }, - "node_modules/tmp": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz", - "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==", - "license": "MIT", - "engines": { - "node": ">=14.14" - } - }, "node_modules/to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -3952,9 +3752,9 @@ } }, "node_modules/tslib": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", - "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==", + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", "dev": true, "license": "0BSD" }, @@ -4086,12 +3886,6 @@ "punycode": "^2.1.0" } }, - "node_modules/urijs": { - "version": "1.19.11", - "resolved": "https://registry.npmjs.org/urijs/-/urijs-1.19.11.tgz", - "integrity": "sha512-HXgFDgDommxn5/bIv0cnQZsPhHDA90NPHD6+c/v21U5+Sx5hoP8+dP9IZXBU1gIfvdRfhG8cel9QNPeionfcCQ==", - "license": "MIT" - }, "node_modules/util": { "version": "0.12.5", "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz", @@ -4162,32 +3956,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/winston": { - "version": "2.4.7", - "resolved": "https://registry.npmjs.org/winston/-/winston-2.4.7.tgz", - "integrity": "sha512-vLB4BqzCKDnnZH9PHGoS2ycawueX4HLqENXQitvFHczhgW2vFpSOn31LZtVr1KU8YTw7DS4tM+cqyovxo8taVg==", - "license": "MIT", - "dependencies": { - "async": "^2.6.4", - "colors": "1.0.x", - "cycle": "1.0.x", - "eyes": "0.1.x", - "isstream": "0.1.x", - "stack-trace": "0.0.x" - }, - "engines": { - "node": ">= 0.10.0" - } - }, - "node_modules/winston/node_modules/async": { - "version": "2.6.4", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz", - "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==", - "license": "MIT", - "dependencies": { - "lodash": "^4.17.14" - } - }, "node_modules/word-wrap": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", @@ -4240,6 +4008,15 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, + "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -4260,16 +4037,16 @@ "node": ">=8" } }, - "node_modules/wrap-ansi/node_modules/ansi-regex": { + "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": { "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "license": "MIT", - "engines": { - "node": ">=12" + "dependencies": { + "ansi-regex": "^5.0.1" }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" + "engines": { + "node": ">=8" } }, "node_modules/wrap-ansi/node_modules/ansi-styles": { @@ -4284,21 +4061,6 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/wrap-ansi/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "license": "MIT", - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", @@ -4358,6 +4120,15 @@ "node": ">=10" } }, + "node_modules/yargs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/yargs/node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -4387,6 +4158,18 @@ "node": ">=8" } }, + "node_modules/yargs/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/yargs/node_modules/yargs-parser": { "version": "21.1.1", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", diff --git a/src/commands/delete.js b/src/commands/delete.js index 3cd8a17..7eedf15 100644 --- a/src/commands/delete.js +++ b/src/commands/delete.js @@ -5,7 +5,7 @@ * quant delete */ -const { text, confirm, isCancel } = require('@clack/prompts'); +const { text, confirm, isCancel, select } = require('@clack/prompts'); const color = require('picocolors'); const config = require('../config'); const client = require('../quant-client'); @@ -23,7 +23,8 @@ const command = { .option('force', { alias: 'f', type: 'boolean', - description: 'Delete the asset without confirmation' + description: 'Delete the asset without confirmation', + default: false }); }, @@ -42,7 +43,9 @@ const command = { if (!providedArgs.force) { const shouldDelete = await confirm({ message: 'This will delete all revisions of this asset from QuantCDN. Are you sure?', - initialValue: false + initialValue: false, + active: 'Yes', + inactive: 'No' }); if (isCancel(shouldDelete) || !shouldDelete) return null; } @@ -55,32 +58,49 @@ const command = { throw new Error('Operation cancelled'); } - // Always prompt if path is missing - if (!args.path) { - const promptedArgs = await this.promptArgs(args); - if (!promptedArgs) { - throw new Error('Operation cancelled'); - } - args = { ...args, ...promptedArgs }; - } - // Only prompt for confirmation if not forced - else if (!args.force) { - const promptedArgs = await this.promptArgs(args); - if (!promptedArgs) { - throw new Error('Operation cancelled'); - } - args = { ...args, ...promptedArgs }; - } - if (!await config.fromArgs(args)) { process.exit(1); } const quant = client(config); + try { - await quant.delete(args.path); - return `Successfully removed [${args.path}]`; + const response = await quant.delete(args.path); + + // Check if the response indicates success + if (response && !response.error && response.meta && response.meta[0]) { + const meta = response.meta[0]; + if (meta.deleted) { + return color.green(`Successfully removed [${args.path}]`); + } + } + + // If we get here, something unexpected happened + throw new Error(`Unexpected response format: ${JSON.stringify(response, null, 2)}`); + } catch (err) { + // If we have a response in the error message, try to parse it + try { + const match = err.message.match(/Response: (.*)/s); + if (match) { + const responseData = JSON.parse(match[1]); + + // Check if this was actually a successful deletion + if (!responseData.error && responseData.meta && responseData.meta[0]) { + const meta = responseData.meta[0]; + if (meta.deleted) { + return color.green(`Successfully removed [${args.path}]`); + } + if (meta.deleted_timestamp) { + return color.dim(`Path [${args.path}] was already deleted`); + } + } + } + } catch (parseError) { + // If we can't parse the response, continue with original error + } + + // For actual errors throw new Error(`Cannot delete path (${args.path}): ${err.message}`); } } diff --git a/src/commands/deploy.js b/src/commands/deploy.js index 15488bb..5057c20 100644 --- a/src/commands/deploy.js +++ b/src/commands/deploy.js @@ -3,10 +3,13 @@ const color = require('picocolors'); const config = require('../config'); const client = require('../quant-client'); const getFiles = require('../helper/getFiles'); +const normalizePaths = require('../helper/normalizePaths'); const path = require('path'); const md5File = require('md5-file'); const { chunk } = require('../helper/array'); +const quantUrl = require('../helper/quant-url'); const revisions = require('../helper/revisions'); +const { sep } = require('path'); const command = { command: 'deploy [dir]', @@ -16,8 +19,7 @@ const command = { return yargs .positional('dir', { describe: 'Location of build artifacts', - type: 'string', - default: null + type: 'string' }) .option('attachments', { alias: 'a', @@ -31,6 +33,12 @@ const command = { description: 'Skip the automatic unpublish process', default: false }) + .option('enable-index-html', { + alias: 'h', + type: 'boolean', + description: 'Push index.html files with page assets', + default: false + }) .option('chunk-size', { alias: 'cs', type: 'number', @@ -40,52 +48,65 @@ const command = { .option('force', { alias: 'f', type: 'boolean', - description: 'Force the deployment (ignore md5 match)', + description: 'Force deployment and update revision log', default: false }); }, - async promptArgs() { - const dir = await text({ - message: 'Enter the build directory to deploy', - defaultValue: config.get('dir') || 'build' - }); + async promptArgs(providedArgs = {}) { + const configDir = config.get('dir') || 'build'; + + let dir = providedArgs.dir; + if (!dir) { + dir = await text({ + message: 'Enter the build directory to deploy', + defaultValue: configDir, + placeholder: configDir + }); + if (isCancel(dir)) return null; + } - if (isCancel(dir)) return null; + const attachments = providedArgs.attachments || false; - const attachments = await confirm({ - message: 'Find attachments?', - initialValue: false - }); + const enableIndexHtml = providedArgs['enable-index-html'] || false; - if (isCancel(attachments)) return null; + const chunkSize = providedArgs['chunk-size'] || 10; + + let force = providedArgs.force; + if (typeof force !== 'boolean') { + force = await confirm({ + message: 'Force deployment? (ignore MD5 checks and revision log)', + initialValue: false, + active: 'Yes', + inactive: 'No' + }); + if (isCancel(force)) return null; + } const skipUnpublish = await confirm({ message: 'Skip the automatic unpublish process?', - initialValue: false + initialValue: false, + active: 'Yes', + inactive: 'No' }); - if (isCancel(skipUnpublish)) return null; - const chunkSize = await text({ - message: 'Enter chunk size for concurrency (1-20)', - defaultValue: '10', - validate: value => { - const num = parseInt(value); - if (isNaN(num) || num < 1 || num > 20) { - return 'Please enter a number between 1 and 20'; - } - } + const skipPurge = await confirm({ + message: 'Skip the automatic cache purge process?', + initialValue: false, + active: 'Yes', + inactive: 'No' }); - - if (isCancel(chunkSize)) return null; + if (isCancel(skipPurge)) return null; return { dir, attachments, 'skip-unpublish': skipUnpublish, - 'chunk-size': parseInt(chunkSize), - force: false // Could add this as a prompt if needed + 'skip-purge': skipPurge, + 'enable-index-html': enableIndexHtml, + 'chunk-size': chunkSize, + force }; }, @@ -98,28 +119,72 @@ const command = { process.exit(1); } - const p = path.resolve(process.cwd(), args.dir); + const buildDir = args.dir || config.get('dir') || 'build'; + const p = path.resolve(process.cwd(), buildDir); + console.log('Resolved build directory:', p); + console.log('Directory exists:', require('fs').existsSync(p)); + const quant = client(config); + // Always enable revision log + const projectName = config.get('project'); + const revisionLogPath = path.resolve(process.cwd(), `quant-revision-log_${projectName}`); + revisions.enabled(true); + revisions.load(revisionLogPath); + console.log(color.dim(`Using revision log: ${revisionLogPath}`)); + try { await quant.ping(); } catch (err) { + console.log('Error details:', { + message: err.message, + response: err.response && err.response.data, + status: err.response && err.response.status + }); throw new Error(`Unable to connect to Quant: ${err.message}`); } let files; try { files = await getFiles(p); + console.log('Found files:', files.length); } catch (err) { + console.log('Error getting files:', err); throw new Error(err.message); } + // Helper function to check if error is an MD5 match + const isMD5Match = (error) => { + // Check for any kind of MD5 match message + if (error.response && error.response.data && error.response.data.errorMsg) { + if (error.response.data.errorMsg === 'MD5 already matches existing file.' || + error.response.data.errorMsg.includes('Published version already has md5')) { + return true; + } + } + + if (error.message) { + if (error.message.includes('Published version already has md5') || + error.message.includes('MD5 already matches')) { + return true; + } + } + + return false; + }; + // Process files in chunks - files = chunk(files, args['chunk-size']); + files = chunk(files, args['chunk-size'] || 10); for (let i = 0; i < files.length; i++) { await Promise.all(files[i].map(async (file) => { - const md5 = md5File.sync(file); const filepath = path.relative(p, file); + const md5 = md5File.sync(file); + + // Check revision log if not forcing + if (!args.force && revisions.has(filepath, md5)) { + console.log(color.dim(`Skipping ${filepath} (matches revision log)`)); + return; + } try { const meta = await quant.send( @@ -130,13 +195,128 @@ const command = { args['skip-purge'], args['enable-index-html'] ); - return `Deployed ${filepath}`; + + // Always store successful uploads in revision log + revisions.store({ + url: filepath, + md5: md5, + ...meta + }); + + console.log(color.green('✓') + ` ${filepath}`); + return meta; } catch (err) { - throw new Error(`Failed to deploy ${filepath}: ${err.message}`); + // If not forcing and it's an MD5 match, skip the file + if (!args.force && isMD5Match(err)) { + console.log(color.dim(`Skipping ${filepath} (already up to date)`)); + // Store MD5 matches in revision log + if (revisions.enabled()) { + revisions.store({ + url: filepath, + md5: md5 + }); + } + return; + } + + // If forcing, or it's not an MD5 match, show warning and continue + if (args.force && isMD5Match(err)) { + console.log(color.yellow(`Force uploading ${filepath} (ignoring MD5 match)`)); + return; + } + + // For actual errors + console.log(color.yellow(`Warning: Failed to deploy ${filepath}: ${err.message}`)); + return; // Continue with next file } })); } + // Save revision log + revisions.save(); + console.log(color.dim('Revision log updated')); + + if (args['skip-unpublish']) { + console.log(color.yellow('Skipping the automatic unpublish process')); + return 'Deployment completed successfully'; + } + + let data; + try { + data = await quant.meta(true); + } catch (err) { + console.log(color.yellow(`Failed to fetch metadata: ${err.message}`)); + return 'Deployment completed with warnings'; + } + + const normalizePath = (filePath) => { + filePath = filePath.startsWith('/') ? filePath.slice(1) : filePath; + filePath = filePath.toLowerCase(); + if (filePath.endsWith('/index.html')) { + return filePath.slice(0, -11); + } + if (filePath === 'index.html') { + return ''; + } + if (filePath.endsWith('index.html')) { + return filePath.slice(0, -10); + } + return filePath; + }; + + const relativeFiles = new Set(); + for (let i = 0; i < files.length; i++) { + files[i].forEach((file) => { + const relativePath = path.relative(p, file); + const normalizedPath = normalizePath(relativePath); + relativeFiles.add(normalizedPath); + + if (normalizedPath.endsWith('/')) { + relativeFiles.add(normalizedPath.slice(0, -1)); + } else { + relativeFiles.add(normalizedPath + '/'); + } + }); + } + + if (!data || !('records' in data)) { + return 'Deployment completed successfully'; + } + + for (const item of data.records) { + const remoteUrl = normalizePath(item.url); + + console.log('Checking remote file:', remoteUrl); + console.log('Exists locally:', relativeFiles.has(remoteUrl)); + + if (relativeFiles.has(remoteUrl) || + relativeFiles.has(remoteUrl + '/') || + relativeFiles.has(remoteUrl.replace(/\/$/, ''))) { + console.log(color.dim(`Keeping ${item.url} (exists locally)`)); + continue; + } + + if (item.type && item.type === 'redirect') { + console.log(color.dim(`Keeping ${item.url} (redirect)`)); + continue; + } + + if (args['skip-unpublish-regex']) { + const match = item.url.match(args['skip-unpublish-regex']); + if (match) { + console.log(color.dim(`Skipping unpublish via regex match: ${item.url}`)); + continue; + } + } + + try { + await quant.unpublish(item.url); + console.log(color.yellow(`✓ ${item.url} unpublished`)); + } catch (err) { + console.log(color.red(`Failed to unpublish ${item.url}: ${err.message}`)); + } + } + return 'Deployment completed successfully'; } }; diff --git a/src/commands/scan.js b/src/commands/scan.js index caa5af2..144dc7a 100644 --- a/src/commands/scan.js +++ b/src/commands/scan.js @@ -5,13 +5,15 @@ * quant scan */ -const { text, confirm, isCancel, select } = require('@clack/prompts'); +const { text, confirm, isCancel, select, spinner } = require('@clack/prompts'); const color = require('picocolors'); const config = require('../config'); const client = require('../quant-client'); const getFiles = require('../helper/getFiles'); const path = require('path'); const md5File = require('md5-file'); +const { chunk } = require('../helper/array'); +const revisions = require('../helper/revisions'); const command = { command: 'scan [options]', @@ -32,6 +34,12 @@ const command = { .option('skip-unpublish-regex', { describe: 'Skip the unpublish process for specific regex', type: 'string' + }) + .option('enable-index-html', { + alias: 'h', + type: 'boolean', + description: 'Keep index.html in paths when scanning', + default: false }); }, @@ -62,10 +70,20 @@ const command = { if (isCancel(skipUnpublishRegex)) return null; } + let enableIndexHtml = providedArgs['enable-index-html']; + if (typeof enableIndexHtml !== 'boolean') { + enableIndexHtml = await confirm({ + message: 'Keep index.html in paths when scanning?', + initialValue: false + }); + if (isCancel(enableIndexHtml)) return null; + } + return { 'diff-only': diffOnly, 'unpublish-only': unpublishOnly, - 'skip-unpublish-regex': skipUnpublishRegex || undefined + 'skip-unpublish-regex': skipUnpublishRegex || undefined, + 'enable-index-html': enableIndexHtml }; }, @@ -74,14 +92,6 @@ const command = { throw new Error('Operation cancelled'); } - if (!args['diff-only'] && !args['unpublish-only'] && !args['skip-unpublish-regex']) { - const promptedArgs = await this.promptArgs(); - if (!promptedArgs) { - throw new Error('Operation cancelled'); - } - args = { ...args, ...promptedArgs }; - } - if (!await config.fromArgs(args)) { process.exit(1); } @@ -90,16 +100,20 @@ const command = { const dir = config.get('dir') || 'build'; const p = path.resolve(process.cwd(), dir); + console.log('Fetching metadata from Quant...'); let data; try { data = await quant.meta(true); + console.log('Metadata fetched successfully'); } catch (err) { throw new Error('Failed to fetch metadata from Quant'); } + console.log('Scanning local files...'); let files; try { files = await getFiles(p); + console.log(`Found ${files.length} local files`); } catch (err) { throw new Error(err.message); } @@ -111,54 +125,116 @@ const command = { toUnpublish: [] }; - // Check local files - for (const file of files) { - const filepath = path.relative(p, file); - const relativeFile = `/${filepath.toLowerCase()}`; + // Helper function to normalize paths for comparison + const normalizePath = (filepath) => { + // Convert to lowercase and ensure leading slash + let normalizedPath = '/' + filepath.toLowerCase(); + + // Special cases for HTML files + if (normalizedPath.endsWith('.html')) { + // Case 1: Root index.html -> / + if (normalizedPath === '/index.html') { + return '/'; + } + + // Case 2: Directory index.html -> directory path + if (normalizedPath.endsWith('/index.html')) { + return normalizedPath.slice(0, -10); // Remove index.html + } + } - if (!args['unpublish-only']) { - try { - const revision = await quant.revision(filepath); + return normalizedPath; + }; + + // Initialize revision log + const projectName = config.get('project'); + const revisionLogPath = path.resolve(process.cwd(), `quant-revision-log_${projectName}`); + revisions.enabled(true); + revisions.load(revisionLogPath); + console.log(color.dim(`Using revision log: ${revisionLogPath}`)); + + // Check local files + const totalFiles = files.length; + const spinChars = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏']; + let spinIndex = 0; + + // Clear line helper + const clearLine = () => { + process.stdout.write('\x1b[2K\r'); + }; + + // Process files in batches for efficient API calls + const batchSize = 20; + const batches = chunk(files, batchSize); + + for (let i = 0; i < batches.length; i++) { + const batch = batches[i]; + const batchPaths = batch.map(file => { + const filepath = path.relative(p, file); + // Keep index.html in API paths + return '/' + filepath.toLowerCase(); + }); + + // Update progress + const progress = `[${i * batchSize + 1}-${Math.min((i + 1) * batchSize, files.length)}/${files.length}]`; + clearLine(); + const spinChar = spinChars[spinIndex]; + spinIndex = (spinIndex + 1) % spinChars.length; + process.stdout.write(`${spinChar} ${progress} Checking batch of files...`); + + try { + // Get metadata for all files in batch + const response = await quant.batchMeta(batchPaths); + + // Process each file in the batch + for (let j = 0; j < batch.length; j++) { + const file = batch[j]; + const filepath = path.relative(p, file); + const localPath = '/' + filepath.toLowerCase(); const localmd5 = md5File.sync(file); - if (revision.md5 === localmd5) { + // Find matching record in response + const record = response.global_meta.records.find(r => { + if (!r || !r.meta) return false; + const recordUrl = r.meta.url || ''; + return recordUrl.toLowerCase() === localPath; + }); + + if (record && record.meta.md5 === localmd5) { if (!args['diff-only']) { results.upToDate.push(filepath); } - } else { + // Store matching MD5s in revision log + revisions.store({ + url: filepath, + md5: localmd5 + }); + } else if (record) { results.different.push(filepath); + } else { + results.notFound.push(filepath); } - } catch (err) { + } + } catch (err) { + // Fall back to checking files individually + for (const file of batch) { + const filepath = path.relative(p, file); results.notFound.push(filepath); } } } - // Check remote files - data.records.forEach(item => { - const f = item.url.replace('/index.html', '.html'); - const relativeFiles = files.map(file => `/${path.relative(p, file).toLowerCase()}`); + // Clear the last progress line + clearLine(); + process.stdout.write('\n'); + console.log('Scan completed'); - if (relativeFiles.includes(item.url) || relativeFiles.includes(f)) { - return; - } - - if (item.type && item.type === 'redirect') { - return; - } - - if (args['skip-unpublish-regex']) { - const match = item.url.match(args['skip-unpublish-regex']); - if (match) { - return; - } - } - - results.toUnpublish.push(item.url); - }); + // Save revision log + revisions.save(); + console.log(color.dim('Revision log updated')); // Format the results as a string - let output = ''; + let output = '\nScan Results:\n'; if (results.upToDate.length > 0 && !args['diff-only']) { output += color.green('\nUp to date:') + `\n${results.upToDate.join('\n')}\n`; @@ -176,10 +252,18 @@ const command = { output += color.magenta('\nTo be unpublished:') + `\n${results.toUnpublish.join('\n')}\n`; } - if (!output) { - output = 'No changes found'; + if (output === '\nScan Results:\n') { + output += 'No changes found'; } + // Add summary + output += '\nSummary:\n'; + output += `Total files scanned: ${totalFiles}\n`; + output += `Up to date: ${results.upToDate.length}\n`; + output += `Different: ${results.different.length}\n`; + output += `Not found: ${results.notFound.length}\n`; + output += `To be unpublished: ${results.toUnpublish.length}\n`; + return output; } }; diff --git a/src/commands/waflogs.js b/src/commands/waflogs.js index 30a9c2c..538811c 100644 --- a/src/commands/waflogs.js +++ b/src/commands/waflogs.js @@ -70,27 +70,31 @@ const command = { // If fields is provided, skip that prompt let fields = providedArgs.fields; - if (!fields) { + if (fields === undefined) { fields = await text({ message: 'Enter comma-separated field names to show (optional)', }); if (isCancel(fields)) return null; + // Don't return empty string + fields = fields || null; } // If output is provided, skip that prompt let output = providedArgs.output; - if (!output) { + if (output === undefined) { output = await text({ message: 'Location to write CSV output (optional)', }); if (isCancel(output)) return null; + // Don't return empty string + output = output || null; } return { all: fetchAll, size, - fields: fields ? (typeof fields === 'string' ? fields.split(',') : fields) : undefined, - output: output || undefined + fields: fields ? (typeof fields === 'string' ? fields.split(',') : fields) : null, + output: output || null }; }, @@ -117,19 +121,36 @@ const command = { try { console.log('Fetching WAF logs with params:', { all: args.all, - per_page: args.size, + page_size: args.size, endpoint: config.get('endpoint') }); - const response = await quant.wafLogs(args.all, { per_page: args.size }); + let allLogs = []; + let currentPage = 1; + let totalPages = 1; - if (response === -1) { - throw new Error('Invalid credentials provided, please check your token has access'); - } + do { + const response = await quant.wafLogs(args.all, { + page_size: args.size, + page: currentPage + }); + + if (response === -1) { + throw new Error('Invalid credentials provided, please check your token has access'); + } + + allLogs = allLogs.concat(response.records); + totalPages = response.total_pages; + currentPage++; + + if (args.all && currentPage <= totalPages) { + console.log(`Fetching page ${currentPage} of ${totalPages}...`); + } + } while (args.all && currentPage <= totalPages); if (args.output) { try { - fs.writeFileSync(args.output, papa.unparse(response.records)); + fs.writeFileSync(args.output, papa.unparse(allLogs)); return `Logs saved to ${args.output}`; } catch (err) { throw new Error(`Failed to write output file: ${err.message}`); @@ -137,15 +158,15 @@ const command = { } // Format the logs output - if (!response.records || response.records.length === 0) { + if (!allLogs || allLogs.length === 0) { return 'No logs found'; } - let output = `Found ${response.total_records} logs (showing page ${response.page} of ${response.total_pages})\n`; + let output = `Found ${allLogs.length} logs\n`; if (args.fields) { const fields = typeof args.fields === 'string' ? args.fields.split(',') : args.fields; - response.records.forEach(log => { + allLogs.forEach(log => { output += '\n---\n'; fields.forEach(field => { if (log[field] !== undefined) { @@ -154,7 +175,7 @@ const command = { }); }); } else { - response.records.forEach(log => { + allLogs.forEach(log => { output += '\n---\n'; Object.entries(log).forEach(([key, value]) => { if (key === 'meta') { diff --git a/src/config.js b/src/config.js index c60b124..5f13729 100644 --- a/src/config.js +++ b/src/config.js @@ -17,8 +17,9 @@ async function fromArgs(args = {}) { clientid: process.env.QUANT_CLIENT_ID, project: process.env.QUANT_PROJECT, token: process.env.QUANT_TOKEN, - endpoint: process.env.QUANT_ENDPOINT || 'https://api.quantcdn.io/v1', - bearer: process.env.QUANT_BEARER + endpoint: process.env.QUANT_ENDPOINT, + bearer: process.env.QUANT_BEARER, + dir: process.env.QUANT_DIR }; // Then try to load from quant.json @@ -26,22 +27,37 @@ async function fromArgs(args = {}) { try { fileConfig = JSON.parse(fs.readFileSync('quant.json')); } catch (err) { - // File doesn't exist or is invalid JSON - that's ok + console.log('Debug - No quant.json found or error:', err.message); } - // Merge configs with precedence: args > env > file > defaults + // Set defaults + const defaults = { + endpoint: 'https://api.quantcdn.io/v1', + dir: 'build' + }; + + // Merge configs with precedence: CLI args > env > file > defaults config = { - ...config, // Default values + ...defaults, ...fileConfig, ...Object.fromEntries( Object.entries(envConfig).filter(([_, v]) => v !== undefined) - ), - ...Object.fromEntries( - Object.entries(args).filter(([_, v]) => v !== undefined) ) }; - // Ensure required fields are present + // Only merge specific CLI args we care about + if (args.dir) config.dir = args.dir; + if (args.endpoint) config.endpoint = args.endpoint; + if (args.clientid) config.clientid = args.clientid; + if (args.project) config.project = args.project; + if (args.token) config.token = args.token; + if (args.bearer) config.bearer = args.bearer; + + // Ensure endpoint ends with /v1 + if (config.endpoint && !config.endpoint.endsWith('/v1')) { + config.endpoint = `${config.endpoint}/v1`; + } + return ( config.clientid !== undefined && config.project !== undefined && @@ -63,13 +79,19 @@ function save() { fs.mkdirSync(configDir, {recursive: true}); } + // Remove /v1 from endpoint when saving to config file + const saveConfig = {...config}; + if (saveConfig.endpoint && saveConfig.endpoint.endsWith('/v1')) { + saveConfig.endpoint = saveConfig.endpoint.slice(0, -3); + } + // Save to both global and local config fs.writeFileSync( path.join(configDir, 'config.json'), - JSON.stringify(config, null, 2) + JSON.stringify(saveConfig, null, 2) ); - fs.writeFileSync('quant.json', JSON.stringify(config, null, 2)); + fs.writeFileSync('quant.json', JSON.stringify(saveConfig, null, 2)); } module.exports = { diff --git a/src/helper/revisions.js b/src/helper/revisions.js index 3f5471c..c4a3b31 100644 --- a/src/helper/revisions.js +++ b/src/helper/revisions.js @@ -1,123 +1,65 @@ const fs = require('fs'); -const os = require('os'); -const {tmpdir} = require('os'); -const {sep} = require('path'); +const path = require('path'); -let data = {}; -let isEnabled = true; -let loc = tmpdir() + sep + 'quant-revision-log'; +let isEnabled = false; +let revisions = {}; +let revisionFile; -/** - * Check if the sha exists in the revision log. - * - * @param {string} path - * Revision path to evaluate. - * @param {string} sha - * Revision sha to evaluate. - * - * @return {boolean} - * If the revision exists. - */ -const has = function(path, sha) { - if (!isEnabled) { - // Defaults to false if the local file is not enabled. - return false; +function load(file) { + // If no file path provided, use current working directory + if (!file) { + const projectName = require('../config').get('project'); + file = path.resolve(process.cwd(), `quant-revision-log_${projectName}`); } - if (!data.hasOwnProperty(path)) { - path = path.startsWith('/') ? path : `/${path}`; - if (!data.hasOwnProperty(path)) { - return false; - } - } + revisionFile = file; - return data[path] == sha; -}; - -/** - * Load the revision log into memory for this process. - * - * @param {string} file - * File location that stores the revision log. - * - * @return {boolean} - * If the log file was found and loaded. - */ -const load = function(file) { - if (!isEnabled) { - return; + try { + const data = fs.readFileSync(revisionFile); + revisions = JSON.parse(data); + } catch (err) { + // File doesn't exist or is invalid JSON - start with empty revisions + revisions = {}; } +} - let _d; - - if (file) { - loc = file; +function save() { + if (!revisionFile) { + const projectName = require('../config').get('project'); + revisionFile = path.resolve(process.cwd(), `quant-revision-log_${projectName}`); } - if (fs.existsSync(loc)) { - _d = fs.readFileSync(loc); - try { - _d = JSON.parse(_d.toString()); - } catch (err) { - return false; - } - } - data = Object.assign(data, _d); - return true; -}; + fs.writeFileSync(revisionFile, JSON.stringify(revisions, null, 2)); +} -/** - * Store an item in the log. - * - * @param {object} item - * An item to add to the revision log. - */ -const store = function(item) { +function store(meta) { if (!isEnabled) { return; } - const i = {}; - i[item.url] = item.md5; - data = Object.assign(data, i); -}; -/** - * Save the revision log. - * - * @return {boolean} - * If the file was saved. - */ -const save = function() { + revisions[meta.url] = meta; +} + +function has(url, md5) { if (!isEnabled) { - return; - } - try { - fs.writeFileSync(loc, JSON.stringify(data) + os.EOL); - } catch (err) { return false; } - return true; -}; -/** - * Get/set the state. - * - * @param {boolean} s - * The state. - * @return {boolean} - * The state. - */ -const enabled = function(s) { - if (s) { - isEnabled = s; + return revisions[url] && revisions[url].md5 === md5; +} + +function enabled(value = null) { + if (value !== null) { + isEnabled = value; } + return isEnabled; -}; +} module.exports = { - has, - store, load, save, + store, + has, enabled, }; diff --git a/src/quant-client.js b/src/quant-client.js index 7577b41..9d1d60b 100644 --- a/src/quant-client.js +++ b/src/quant-client.js @@ -151,64 +151,12 @@ module.exports = function (config) { * - Async iterator for memory 21k items ~ 40mb. */ meta: async function (unfold = false, exclude = true, extend = {}) { - const records = []; - const query = Object.assign( - { - page_size: 500, - published: true, - deleted: false, - sort_field: "last_modified", - sort_direction: "desc", - }, - extend, - ); - const url = `/global-meta?${querystring.stringify(query)}`; - const doUnfold = async function (i) { - const res = await get(`${url}&page=${i}`); - if (res.data.global_meta && res.data.global_meta.records) { - res.data.global_meta.records.map((item) => - records.push({ - url: item.meta.url, - md5: item.meta.md5, - type: item.meta.type, - }), - ); - } - }; - - let page = 1; - // Seed the record set. - const res = await get(`${url}&page=${page}`); - - if (!res.data.global_meta) { - // If no records have been published then global_meta is not - // present in the response. - return; - } - - if (res.data.global_meta.records) { - res.data.global_meta.records.map((item) => - records.push({ - url: item.meta.url, - md5: item.meta.md5, - type: item.meta.type, - }), - ); - } - - if (unfold) { - page++; - while (res.data.global_meta.total_pages >= page) { - await doUnfold(page); - page++; - } + try { + const response = await get(`${config.get('endpoint')}/meta`, { headers }); + return handleResponse(response); + } catch (error) { + throw error; } - - return { - total_pages: res.data.global_meta.total_pages, - total_records: res.data.global_meta.total_records, - records, - }; }, /** @@ -584,20 +532,13 @@ module.exports = function (config) { * * @throws Error. */ - revisions: async function (url) { - url = url.indexOf("/") == 0 ? url : `/${url}`; - url = url.toLowerCase(); - url = url.replace(/\/?index\.html/, ""); - - const options = { - url: `${config.get("endpoint")}/revisions`, - headers: { - ...headers, - "Quant-Url": url, - }, - }; - const res = await get(options.url, { headers: options.headers }); - return handleResponse(res); + revisions: async function (path) { + try { + const response = await get(`${config.get('endpoint')}/meta/${path}`, { headers }); + return handleResponse(response); + } catch (error) { + throw error; + } }, /** @@ -730,18 +671,43 @@ module.exports = function (config) { */ wafLogs: async function (all = false, options = {}) { try { - const response = await get('/waf/logs', { + const response = await get(`${config.get('endpoint')}/waf/logs`, { + headers, params: { - per_page: options.per_page || 10 + page_size: options.page_size || 10, + page: options.page || 1 } }); return handleResponse(response); } catch (error) { - console.log('WAF logs error:', { - message: error.message, - code: error.code, - response: error.response && error.response.data - }); + throw error; + } + }, + + /** + * Get metadata for multiple URLs in a single request. + * + * @param {Array} urls + * List of URLs to check. + * + * @return {object} + * The response containing metadata for all URLs. + */ + batchMeta: async function(urls) { + try { + const options = { + url: `${config.get('endpoint')}/url-meta`, + headers: { + ...headers + }, + body: { + "Quant-Url": urls + } + }; + + const response = await post(options.url, options.body, { headers: options.headers }); + return handleResponse(response); + } catch (error) { throw error; } }, From bb538f04c9015b4f303496742cfac41c8c915ec8 Mon Sep 17 00:00:00 2001 From: Stuart Rowlands Date: Fri, 22 Nov 2024 20:20:06 +1000 Subject: [PATCH 04/41] Restore old meta function. --- src/commands/info.js | 16 +----------- src/quant-client.js | 62 ++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 58 insertions(+), 20 deletions(-) diff --git a/src/commands/info.js b/src/commands/info.js index 468e9ac..64447b2 100644 --- a/src/commands/info.js +++ b/src/commands/info.js @@ -44,21 +44,7 @@ const command = { try { const meta = await quant.meta(); if (meta && meta.total_records) { - const totals = { content: 0, redirects: 0 }; - - if (meta.records) { - meta.records.forEach(item => { - if (item.type && item.type === 'redirect') { - totals.redirects++; - } else { - totals.content++; - } - }); - } - - output += `\nTotal records: ${meta.total_records}\n`; - output += ` - content: ${totals.content}\n`; - output += ` - redirects: ${totals.redirects}\n`; + output += `\nTotal records: ${meta.total_records}`; } } catch (err) { output += '\nCould not fetch metadata'; diff --git a/src/quant-client.js b/src/quant-client.js index 9d1d60b..f6facd0 100644 --- a/src/quant-client.js +++ b/src/quant-client.js @@ -151,12 +151,64 @@ module.exports = function (config) { * - Async iterator for memory 21k items ~ 40mb. */ meta: async function (unfold = false, exclude = true, extend = {}) { - try { - const response = await get(`${config.get('endpoint')}/meta`, { headers }); - return handleResponse(response); - } catch (error) { - throw error; + const records = []; + const query = Object.assign( + { + page_size: 500, + published: true, + deleted: false, + sort_field: "last_modified", + sort_direction: "desc", + }, + extend, + ); + const url = `${config.get("endpoint")}/global-meta?${querystring.stringify(query)}`; + const doUnfold = async function (i) { + const res = await get(`${url}&page=${i}`, { headers }); + if (res.data.global_meta && res.data.global_meta.records) { + res.data.global_meta.records.map((item) => + records.push({ + url: item.meta.url, + md5: item.meta.md5, + type: item.meta.type, + }), + ); + } + }; + + let page = 1; + // Seed the record set. + const res = await get(`${url}&page=${page}`, { headers }); + + if (!res.data.global_meta) { + // If no records have been published then global_meta is not + // present in the response. + return; } + + if (res.data.global_meta.records) { + res.data.global_meta.records.map((item) => + records.push({ + url: item.meta.url, + md5: item.meta.md5, + type: item.meta.type, + }), + ); + } + + if (unfold) { + page++; + while (res.data.global_meta.total_pages >= page) { + await doUnfold(page); + page++; + } + } + + return { + total_pages: res.data.global_meta.total_pages, + total_records: res.data.global_meta.total_records, + records, + }; }, /** From 1f81aa0f76ca864339d00d108168e6abde31876a Mon Sep 17 00:00:00 2001 From: Stuart Rowlands Date: Sat, 23 Nov 2024 06:08:53 +1000 Subject: [PATCH 05/41] Added unpublish-regex to deploy. Fixed unpublish. --- src/commands/deploy.js | 14 ++++---------- src/commands/unpublish.js | 35 +++++++++++++++-------------------- 2 files changed, 19 insertions(+), 30 deletions(-) diff --git a/src/commands/deploy.js b/src/commands/deploy.js index 5057c20..dbe3075 100644 --- a/src/commands/deploy.js +++ b/src/commands/deploy.js @@ -33,6 +33,10 @@ const command = { description: 'Skip the automatic unpublish process', default: false }) + .option('skip-unpublish-regex', { + type: 'string', + description: 'Skip unpublishing paths that match this regex pattern' + }) .option('enable-index-html', { alias: 'h', type: 'boolean', @@ -136,11 +140,6 @@ const command = { try { await quant.ping(); } catch (err) { - console.log('Error details:', { - message: err.message, - response: err.response && err.response.data, - status: err.response && err.response.status - }); throw new Error(`Unable to connect to Quant: ${err.message}`); } @@ -286,18 +285,13 @@ const command = { for (const item of data.records) { const remoteUrl = normalizePath(item.url); - console.log('Checking remote file:', remoteUrl); - console.log('Exists locally:', relativeFiles.has(remoteUrl)); - if (relativeFiles.has(remoteUrl) || relativeFiles.has(remoteUrl + '/') || relativeFiles.has(remoteUrl.replace(/\/$/, ''))) { - console.log(color.dim(`Keeping ${item.url} (exists locally)`)); continue; } if (item.type && item.type === 'redirect') { - console.log(color.dim(`Keeping ${item.url} (redirect)`)); continue; } diff --git a/src/commands/unpublish.js b/src/commands/unpublish.js index ba7da60..6a46177 100644 --- a/src/commands/unpublish.js +++ b/src/commands/unpublish.js @@ -21,8 +21,8 @@ const command = { }) .option('force', { alias: 'f', - describe: 'Skip confirmation prompt', type: 'boolean', + description: 'Skip confirmation prompt', default: false }); }, @@ -40,11 +40,13 @@ const command = { // If force is not provided, ask for confirmation if (!providedArgs.force) { - const confirmUnpublish = await confirm({ + const shouldUnpublish = await confirm({ message: 'Are you sure you want to unpublish this asset?', - initialValue: false + initialValue: false, + active: 'Yes', + inactive: 'No' }); - if (isCancel(confirmUnpublish) || !confirmUnpublish) return null; + if (isCancel(shouldUnpublish) || !shouldUnpublish) return null; } return { path, force: providedArgs.force }; @@ -55,31 +57,24 @@ const command = { throw new Error('Operation cancelled'); } - if (!args.path) { - const promptedArgs = await this.promptArgs(args); - if (!promptedArgs) { - throw new Error('Operation cancelled'); - } - args = { ...args, ...promptedArgs }; - } - if (!await config.fromArgs(args)) { process.exit(1); } - // If not in force mode and not coming from interactive prompt, confirm - if (!args.force && !args._interactiveMode) { - console.log(color.yellow('This will unpublish the asset from QuantCDN')); - console.log(color.yellow('Use --force to skip this warning')); - process.exit(0); - } - const quant = client(config); + try { await quant.unpublish(args.path); return 'Unpublished successfully'; } catch (err) { - throw new Error(`Failed to unpublish: ${err.message}`); + // Check for already unpublished message + if (err.response?.data?.errorMsg?.includes('already unpublished') || + err.response?.data?.errorMsg?.includes('not published')) { + return color.dim(`Path [${args.path}] is already unpublished`); + } + + // For other errors, show the full response + throw new Error(`Failed to unpublish: ${err.message}\nResponse: ${JSON.stringify(err.response?.data, null, 2)}`); } } }; From 25511fccf0a346ea76df0cfa635d08ec30c39aae Mon Sep 17 00:00:00 2001 From: Stuart Rowlands Date: Sat, 23 Nov 2024 06:35:43 +1000 Subject: [PATCH 06/41] Removed bearer token for now. Fixes to search and redirect commands. --- README.md | 2 -- cli.js | 31 ++++++++----------- src/commands/init.js | 8 ----- src/commands/redirect.js | 62 +++++++++++++++----------------------- src/commands/search.js | 64 ++++++++++++++-------------------------- src/config.js | 4 +-- src/quant-client.js | 4 --- test/config.test.js | 3 -- 8 files changed, 59 insertions(+), 119 deletions(-) diff --git a/README.md b/README.md index 01f1cbc..52484dd 100644 --- a/README.md +++ b/README.md @@ -107,7 +107,6 @@ These options can be used with any command: --project, -p Project name for QuantCDN --token, -t Project token for QuantCDN --endpoint, -e API endpoint for QuantCDN (default: "https://api.quantcdn.io") ---bearer Scoped API bearer token ``` ## Configuration @@ -120,7 +119,6 @@ The CLI can be configured using either: - `QUANT_PROJECT` - `QUANT_TOKEN` - `QUANT_ENDPOINT` - - `QUANT_BEARER` ## Examples diff --git a/cli.js b/cli.js index f1a4ce1..3b21ca3 100755 --- a/cli.js +++ b/cli.js @@ -162,10 +162,6 @@ function cliMode() { alias: 'e', describe: 'API endpoint for QuantCDN', type: 'string', - }) - .option('bearer', { - describe: 'Scoped API bearer token', - type: 'string', }); // Add all commands to yargs @@ -175,25 +171,24 @@ function cliMode() { command.command || name, command.describe, command.builder || {}, - (argv) => handleCommand(command, argv) + async (argv) => handleCommand(command, argv) ); }); yargsInstance.demandCommand().parse(); } -// Determine if we should run in interactive or CLI mode -if (process.argv.length <= 2) { - interactiveMode().catch((error) => { - outro(color.red(`Error: ${error.message}`)); - process.exit(1); - }); -} else { - cliMode(); +// Check if being run directly +if (require.main === module) { + // No arguments = interactive mode + if (process.argv.length === 2) { + interactiveMode(); + } else { + cliMode(); + } } -// Handle interrupts gracefully -process.on('SIGINT', () => { - outro(color.yellow('\nOperation cancelled')); - process.exit(0); -}); +module.exports = { + interactiveMode, + cliMode +}; diff --git a/src/commands/init.js b/src/commands/init.js index 5ba696f..606577e 100644 --- a/src/commands/init.js +++ b/src/commands/init.js @@ -65,12 +65,6 @@ const command = { if (isCancel(token)) return null; - const bearer = await password({ - message: 'Enter an optional QuantCDN API token (press Enter to skip)', - }); - - if (isCancel(bearer)) return null; - const dir = await text({ message: 'Directory containing static assets', defaultValue: 'build' @@ -83,7 +77,6 @@ const command = { clientid, project, token, - bearer: bearer || undefined, dir }; }, @@ -107,7 +100,6 @@ const command = { clientid: args.clientid, project: args.project, token: args.token, - bearer: args.bearer, dir: args.dir || 'build' }; diff --git a/src/commands/redirect.js b/src/commands/redirect.js index 21b438a..f71337e 100644 --- a/src/commands/redirect.js +++ b/src/commands/redirect.js @@ -1,36 +1,33 @@ /** - * Redirect a QuantCDN path to another. + * Create a redirect. * * @usage - * quant redirect --status + * quant redirect [status] */ -const { text, select, isCancel } = require('@clack/prompts'); +const { text, confirm, isCancel, select } = require('@clack/prompts'); const color = require('picocolors'); const config = require('../config'); const client = require('../quant-client'); const command = { - command: 'redirect [from] [to] [status] [author]', + command: 'redirect [status]', describe: 'Create a redirect', builder: (yargs) => { return yargs .positional('from', { - describe: 'Path to redirect from', + describe: 'URL to redirect from', type: 'string' }) .positional('to', { - describe: 'Path to redirect to', + describe: 'URL to redirect to', type: 'string' }) .positional('status', { - describe: 'HTTP status code (301 or 302)', + describe: 'HTTP status code', type: 'number', - default: 302 - }) - .positional('author', { - describe: 'Author of the redirect', - type: 'string' + default: 302, + choices: [301, 302, 303, 307, 308] }); }, @@ -39,8 +36,8 @@ const command = { let from = providedArgs.from; if (!from) { from = await text({ - message: 'Enter the path to redirect from', - validate: value => !value ? 'Source path is required' : undefined + message: 'Enter URL to redirect from', + validate: value => !value ? 'From URL is required' : undefined }); if (isCancel(from)) return null; } @@ -49,8 +46,8 @@ const command = { let to = providedArgs.to; if (!to) { to = await text({ - message: 'Enter the path to redirect to', - validate: value => !value ? 'Destination path is required' : undefined + message: 'Enter URL to redirect to', + validate: value => !value ? 'To URL is required' : undefined }); if (isCancel(to)) return null; } @@ -59,26 +56,20 @@ const command = { let status = providedArgs.status; if (!status) { status = await select({ - message: 'Select redirect type', + message: 'Select HTTP status code', options: [ - { value: 301, label: '301 - Permanent redirect' }, - { value: 302, label: '302 - Temporary redirect' } + { value: 301, label: '301 - Permanent' }, + { value: 302, label: '302 - Found (Temporary)' }, + { value: 303, label: '303 - See Other' }, + { value: 307, label: '307 - Temporary Redirect' }, + { value: 308, label: '308 - Permanent Redirect' } ], initialValue: 302 }); if (isCancel(status)) return null; } - // If author is provided, skip that prompt - let author = providedArgs.author; - if (!author) { - author = await text({ - message: 'Enter author name (optional)', - }); - if (isCancel(author)) return null; - } - - return { from, to, status: parseInt(status), author: author || null }; + return { from, to, status }; }, async handler(args) { @@ -86,22 +77,15 @@ const command = { throw new Error('Operation cancelled'); } - if (!args.from || !args.to) { - const promptedArgs = await this.promptArgs(); - if (!promptedArgs) { - throw new Error('Operation cancelled'); - } - args = { ...args, ...promptedArgs }; - } - if (!await config.fromArgs(args)) { process.exit(1); } const quant = client(config); + try { - await quant.redirect(args.from, args.to, args.author, args.status); - return `Added redirect from ${args.from} to ${args.to}`; + await quant.redirect(args.from, args.to, null, args.status); + return `Created redirect from ${args.from} to ${args.to} (${args.status})`; } catch (err) { throw new Error(`Failed to create redirect: ${err.message}`); } diff --git a/src/commands/search.js b/src/commands/search.js index 3957d6e..e642de6 100644 --- a/src/commands/search.js +++ b/src/commands/search.js @@ -9,10 +9,9 @@ const color = require('picocolors'); const config = require('../config'); const client = require('../quant-client'); const fs = require('fs'); -const glob = require('glob'); const command = { - command: 'search [operation]', + command: 'search ', describe: 'Perform search index operations', builder: (yargs) => { @@ -23,7 +22,7 @@ const command = { choices: ['status', 'index', 'unindex', 'clear'] }) .option('path', { - describe: 'Path to JSON file(s) for index/unindex operations', + describe: 'Path to file or URL', type: 'string' }); }, @@ -36,7 +35,7 @@ const command = { message: 'Select search operation', options: [ { value: 'status', label: 'Show search index status' }, - { value: 'index', label: 'Add/update search records' }, + { value: 'index', label: 'Add/update items in search index' }, { value: 'unindex', label: 'Remove item from search index' }, { value: 'clear', label: 'Clear entire search index' } ] @@ -44,33 +43,28 @@ const command = { if (isCancel(operation)) return null; } - let additionalArgs = {}; - - // If path is required but not provided, prompt for it - if (['index', 'unindex'].includes(operation) && !providedArgs.path) { - const path = await text({ + // If path is needed and not provided, prompt for it + let path = providedArgs.path; + if ((operation === 'index' || operation === 'unindex') && !path) { + path = await text({ message: operation === 'index' - ? 'Enter path to JSON file(s)' - : 'Enter URL path to remove from index', + ? 'Enter path to JSON file containing search data' + : 'Enter URL to remove from search index', validate: value => !value ? 'Path is required' : undefined }); if (isCancel(path)) return null; - additionalArgs.path = path; } - // If it's clear operation, confirm - if (operation === 'clear' && !providedArgs.confirmed) { - const confirmClear = await confirm({ + // For clear operation, ask for confirmation + if (operation === 'clear') { + const shouldClear = await confirm({ message: 'Are you sure you want to clear the entire search index?', initialValue: false }); - if (isCancel(confirmClear) || !confirmClear) return null; + if (isCancel(shouldClear) || !shouldClear) return null; } - return { - operation, - ...additionalArgs - }; + return { operation, path }; }, async handler(args) { @@ -78,15 +72,6 @@ const command = { throw new Error('Operation cancelled'); } - // Check for required arguments and prompt if missing - if (!args.operation || ((['index', 'unindex'].includes(args.operation)) && !args.path)) { - const promptedArgs = await this.promptArgs(args); // Pass existing args - if (!promptedArgs) { - throw new Error('Operation cancelled'); - } - args = { ...args, ...promptedArgs }; - } - if (!await config.fromArgs(args)) { process.exit(1); } @@ -96,24 +81,19 @@ const command = { switch (args.operation) { case 'status': const status = await quant.searchStatus(); - return status; + return `Search index status:\nTotal documents: ${status.index?.entries || 0}`; case 'index': - let jsonFiles = []; - const stats = fs.statSync(args.path); - - if (stats.isDirectory()) { - jsonFiles = glob.sync(args.path + '/*.json'); - } else { - jsonFiles = [args.path]; + if (!args.path) { + throw new Error('Path to JSON file is required'); } - - for (const file of jsonFiles) { - await quant.searchIndex(file); - } - return `Successfully indexed ${jsonFiles.length} file(s)`; + await quant.searchIndex(args.path); + return 'Successfully added items to search index'; case 'unindex': + if (!args.path) { + throw new Error('URL to remove is required'); + } await quant.searchRemove(args.path); return `Successfully removed ${args.path} from search index`; diff --git a/src/config.js b/src/config.js index 5f13729..8f2ef62 100644 --- a/src/config.js +++ b/src/config.js @@ -18,7 +18,6 @@ async function fromArgs(args = {}) { project: process.env.QUANT_PROJECT, token: process.env.QUANT_TOKEN, endpoint: process.env.QUANT_ENDPOINT, - bearer: process.env.QUANT_BEARER, dir: process.env.QUANT_DIR }; @@ -51,7 +50,6 @@ async function fromArgs(args = {}) { if (args.clientid) config.clientid = args.clientid; if (args.project) config.project = args.project; if (args.token) config.token = args.token; - if (args.bearer) config.bearer = args.bearer; // Ensure endpoint ends with /v1 if (config.endpoint && !config.endpoint.endsWith('/v1')) { @@ -61,7 +59,7 @@ async function fromArgs(args = {}) { return ( config.clientid !== undefined && config.project !== undefined && - (config.token !== undefined || config.bearer !== undefined) + config.token !== undefined ); } diff --git a/src/quant-client.js b/src/quant-client.js index f6facd0..bbec624 100644 --- a/src/quant-client.js +++ b/src/quant-client.js @@ -21,10 +21,6 @@ module.exports = function (config) { 'Quant-Organisation': config.get('clientid') }; - if (config.get('bearer')) { - headers['Authorization'] = `Bearer ${config.get('bearer')}`; - } - // Create axios instance with dynamic baseURL const client = axios.create({ baseURL: config.get('endpoint') diff --git a/test/config.test.js b/test/config.test.js index da20557..006cb76 100644 --- a/test/config.test.js +++ b/test/config.test.js @@ -63,7 +63,6 @@ describe('Config', function() { clientid: null, project: null, token: null, - bearer: null, }, null, 2); expect(writeFileSync.calledOnceWith('./quant.json', data)).to.be.true; }); @@ -77,7 +76,6 @@ describe('Config', function() { clientid: 'test', project: null, token: null, - bearer: null, }, null, 2); expect(writeFileSync.calledOnceWith('./quant.json', data)).to.be.true; }); @@ -89,7 +87,6 @@ describe('Config', function() { clientid: null, project: null, token: null, - bearer: null, }, null, 2); expect(writeFileSync.calledOnceWith('/tmp/quant.json', data)).to.be.true; }); From 5d3a9823589a66456f808e81f75cebe05c281d83 Mon Sep 17 00:00:00 2001 From: Stuart Rowlands Date: Sat, 23 Nov 2024 14:37:32 +1000 Subject: [PATCH 07/41] Fixing issues with /index.html --- src/commands/scan.js | 60 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 52 insertions(+), 8 deletions(-) diff --git a/src/commands/scan.js b/src/commands/scan.js index 144dc7a..b7c919d 100644 --- a/src/commands/scan.js +++ b/src/commands/scan.js @@ -131,7 +131,7 @@ const command = { let normalizedPath = '/' + filepath.toLowerCase(); // Special cases for HTML files - if (normalizedPath.endsWith('.html')) { + if (!args['enable-index-html'] && normalizedPath.endsWith('/index.html')) { // Case 1: Root index.html -> / if (normalizedPath === '/index.html') { return '/'; @@ -139,7 +139,7 @@ const command = { // Case 2: Directory index.html -> directory path if (normalizedPath.endsWith('/index.html')) { - return normalizedPath.slice(0, -10); // Remove index.html + return normalizedPath.slice(0, -11); // Remove index.html including the slash } } @@ -163,7 +163,7 @@ const command = { process.stdout.write('\x1b[2K\r'); }; - // Process files in batches for efficient API calls + // Process files in batches const batchSize = 20; const batches = chunk(files, batchSize); @@ -171,8 +171,23 @@ const command = { const batch = batches[i]; const batchPaths = batch.map(file => { const filepath = path.relative(p, file); - // Keep index.html in API paths - return '/' + filepath.toLowerCase(); + let normalizedPath = '/' + filepath.toLowerCase(); + + // Remove both /index.html and trailing slashes + if (!args['enable-index-html'] && normalizedPath.endsWith('/index.html')) { + + // Case 1: Root index.html -> / + if (normalizedPath === '/index.html') { + return '/'; + } + + // Case 2: Directory index.html -> directory path + if (normalizedPath.endsWith('/index.html')) { + return normalizedPath.slice(0, -11); // Remove index.html including the slash + } + } + + return normalizedPath; }); // Update progress @@ -183,21 +198,50 @@ const command = { process.stdout.write(`${spinChar} ${progress} Checking batch of files...`); try { - // Get metadata for all files in batch const response = await quant.batchMeta(batchPaths); + console.log('\nDebug - Batch request:', { + batchPaths: batchPaths + }); + + console.log('\nDebug - API Response records:', { + records: response.global_meta.records.map(r => ({ + url: r.meta.url, + type: r.meta.type, + md5: r.meta.md5 + })) + }); + // Process each file in the batch for (let j = 0; j < batch.length; j++) { const file = batch[j]; const filepath = path.relative(p, file); - const localPath = '/' + filepath.toLowerCase(); + let localPath = '/' + filepath.toLowerCase(); + + // Remove both /index.html and trailing slashes + if (!args['enable-index-html']) { + localPath = localPath + .replace(/\/index\.html$/, '') // Remove /index.html + .replace(/\/$/, ''); // Remove trailing slash + } + const localmd5 = md5File.sync(file); // Find matching record in response const record = response.global_meta.records.find(r => { if (!r || !r.meta) return false; const recordUrl = r.meta.url || ''; - return recordUrl.toLowerCase() === localPath; + const matches = recordUrl.toLowerCase() === localPath; + + if (filepath.includes('index.html')) { + console.log('\nDebug - Content path comparison:', { + localPath, + recordUrl: recordUrl.toLowerCase(), + matches + }); + } + + return matches; }); if (record && record.meta.md5 === localmd5) { From f6d5a20a23336590e3b2addef7b581942bbc189e Mon Sep 17 00:00:00 2001 From: Stuart Rowlands Date: Sat, 23 Nov 2024 14:44:02 +1000 Subject: [PATCH 08/41] Better normalise --- src/commands/scan.js | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/src/commands/scan.js b/src/commands/scan.js index b7c919d..6da2c82 100644 --- a/src/commands/scan.js +++ b/src/commands/scan.js @@ -169,25 +169,11 @@ const command = { for (let i = 0; i < batches.length; i++) { const batch = batches[i]; + + // Normalize paths for batch const batchPaths = batch.map(file => { const filepath = path.relative(p, file); - let normalizedPath = '/' + filepath.toLowerCase(); - - // Remove both /index.html and trailing slashes - if (!args['enable-index-html'] && normalizedPath.endsWith('/index.html')) { - - // Case 1: Root index.html -> / - if (normalizedPath === '/index.html') { - return '/'; - } - - // Case 2: Directory index.html -> directory path - if (normalizedPath.endsWith('/index.html')) { - return normalizedPath.slice(0, -11); // Remove index.html including the slash - } - } - - return normalizedPath; + return normalizePath(filepath); }); // Update progress @@ -218,13 +204,9 @@ const command = { const filepath = path.relative(p, file); let localPath = '/' + filepath.toLowerCase(); - // Remove both /index.html and trailing slashes - if (!args['enable-index-html']) { - localPath = localPath - .replace(/\/index\.html$/, '') // Remove /index.html - .replace(/\/$/, ''); // Remove trailing slash - } - + // Normalize path + localPath = normalizePath(filepath); + const localmd5 = md5File.sync(file); // Find matching record in response From ac1c52392c2251ad28279959da256c8403b422f5 Mon Sep 17 00:00:00 2001 From: Stuart Rowlands Date: Sat, 23 Nov 2024 14:56:43 +1000 Subject: [PATCH 09/41] Track enable-index-html in config --- src/commands/deploy.js | 11 +++++++++++ src/commands/scan.js | 26 +++----------------------- src/config.js | 13 +++++++++++++ 3 files changed, 27 insertions(+), 23 deletions(-) diff --git a/src/commands/deploy.js b/src/commands/deploy.js index dbe3075..ae746c7 100644 --- a/src/commands/deploy.js +++ b/src/commands/deploy.js @@ -130,6 +130,17 @@ const command = { const quant = client(config); + // If enableIndexHtml is not set in config, this is first deploy + if (config.get('enableIndexHtml') === undefined) { + config.set({ + enableIndexHtml: args['enable-index-html'] || false + }); + config.save(); + console.log(color.dim( + `Project configured with ${args['enable-index-html'] ? '--enable-index-html' : 'no --enable-index-html'}` + )); + } + // Always enable revision log const projectName = config.get('project'); const revisionLogPath = path.resolve(process.cwd(), `quant-revision-log_${projectName}`); diff --git a/src/commands/scan.js b/src/commands/scan.js index 6da2c82..346edfb 100644 --- a/src/commands/scan.js +++ b/src/commands/scan.js @@ -146,6 +146,9 @@ const command = { return normalizedPath; }; + // Use enableIndexHtml setting from config if it exists + const enableIndexHtml = config.get('enableIndexHtml') ?? args['enable-index-html'] ?? false; + // Initialize revision log const projectName = config.get('project'); const revisionLogPath = path.resolve(process.cwd(), `quant-revision-log_${projectName}`); @@ -169,8 +172,6 @@ const command = { for (let i = 0; i < batches.length; i++) { const batch = batches[i]; - - // Normalize paths for batch const batchPaths = batch.map(file => { const filepath = path.relative(p, file); return normalizePath(filepath); @@ -186,18 +187,6 @@ const command = { try { const response = await quant.batchMeta(batchPaths); - console.log('\nDebug - Batch request:', { - batchPaths: batchPaths - }); - - console.log('\nDebug - API Response records:', { - records: response.global_meta.records.map(r => ({ - url: r.meta.url, - type: r.meta.type, - md5: r.meta.md5 - })) - }); - // Process each file in the batch for (let j = 0; j < batch.length; j++) { const file = batch[j]; @@ -214,15 +203,6 @@ const command = { if (!r || !r.meta) return false; const recordUrl = r.meta.url || ''; const matches = recordUrl.toLowerCase() === localPath; - - if (filepath.includes('index.html')) { - console.log('\nDebug - Content path comparison:', { - localPath, - recordUrl: recordUrl.toLowerCase(), - matches - }); - } - return matches; }); diff --git a/src/config.js b/src/config.js index 8f2ef62..eb7e5e5 100644 --- a/src/config.js +++ b/src/config.js @@ -50,6 +50,19 @@ async function fromArgs(args = {}) { if (args.clientid) config.clientid = args.clientid; if (args.project) config.project = args.project; if (args.token) config.token = args.token; + + // Handle enable-index-html setting + if (args['enable-index-html'] !== undefined) { + // If setting exists in config, ensure it matches + if (config.enableIndexHtml !== undefined && + config.enableIndexHtml !== args['enable-index-html']) { + throw new Error( + 'Project was previously deployed with ' + + (config.enableIndexHtml ? '--enable-index-html' : 'no --enable-index-html') + + '. Cannot change this setting after initial deployment.' + ); + } + } // Ensure endpoint ends with /v1 if (config.endpoint && !config.endpoint.endsWith('/v1')) { From c3815ff4baca4279b0196ccbf6aaa9687e15e4f5 Mon Sep 17 00:00:00 2001 From: Stuart Rowlands Date: Sat, 23 Nov 2024 15:07:00 +1000 Subject: [PATCH 10/41] Added concurrency to unpublish stage in deploy. Fixed output for some deploy tasks --- cli.js | 13 +++++++++++-- src/commands/deploy.js | 39 ++++++++++++++++++++++++++------------- 2 files changed, 37 insertions(+), 15 deletions(-) diff --git a/cli.js b/cli.js index 3b21ca3..bb7ab09 100755 --- a/cli.js +++ b/cli.js @@ -130,8 +130,17 @@ async function handleCommand(command, argv) { argv = { ...argv, ...promptedArgs }; } - const result = await command.handler(argv); - console.log(color.green(result || 'Operation completed successfully!')); + const spin = spinner(); + spin.start(`Executing ${command.command.split(' ')[0]}`); + + try { + const result = await command.handler(argv); + spin.stop(''); + console.log(color.green(result || 'Operation completed successfully!')); + } catch (error) { + spin.stop(''); + throw error; + } } catch (error) { console.error(color.red(`Error: ${error.message}`)); process.exit(1); diff --git a/src/commands/deploy.js b/src/commands/deploy.js index ae746c7..578cbea 100644 --- a/src/commands/deploy.js +++ b/src/commands/deploy.js @@ -206,18 +206,14 @@ const command = { args['enable-index-html'] ); - // Always store successful uploads in revision log - revisions.store({ - url: filepath, - md5: md5, - ...meta - }); - + // Clear line before output + process.stdout.write('\x1b[2K\r'); console.log(color.green('✓') + ` ${filepath}`); return meta; } catch (err) { // If not forcing and it's an MD5 match, skip the file if (!args.force && isMD5Match(err)) { + process.stdout.write('\x1b[2K\r'); console.log(color.dim(`Skipping ${filepath} (already up to date)`)); // Store MD5 matches in revision log if (revisions.enabled()) { @@ -231,11 +227,13 @@ const command = { // If forcing, or it's not an MD5 match, show warning and continue if (args.force && isMD5Match(err)) { + process.stdout.write('\x1b[2K\r'); console.log(color.yellow(`Force uploading ${filepath} (ignoring MD5 match)`)); return; } // For actual errors + process.stdout.write('\x1b[2K\r'); console.log(color.yellow(`Warning: Failed to deploy ${filepath}: ${err.message}`)); return; // Continue with next file } @@ -293,6 +291,8 @@ const command = { return 'Deployment completed successfully'; } + // Get list of files to unpublish + const filesToUnpublish = []; for (const item of data.records) { const remoteUrl = normalizePath(item.url); @@ -309,19 +309,32 @@ const command = { if (args['skip-unpublish-regex']) { const match = item.url.match(args['skip-unpublish-regex']); if (match) { + process.stdout.write('\x1b[2K\r'); // Clear line console.log(color.dim(`Skipping unpublish via regex match: ${item.url}`)); continue; } } - try { - await quant.unpublish(item.url); - console.log(color.yellow(`✓ ${item.url} unpublished`)); - } catch (err) { - console.log(color.red(`Failed to unpublish ${item.url}: ${err.message}`)); - } + filesToUnpublish.push(item.url); + } + + // Process unpublish in chunks + const unpublishBatches = chunk(filesToUnpublish, args['chunk-size'] || 10); + for (const batch of unpublishBatches) { + await Promise.all(batch.map(async (url) => { + try { + await quant.unpublish(url); + process.stdout.write('\x1b[2K\r'); // Clear line + console.log(color.yellow(`✓ ${url} unpublished`)); + } catch (err) { + process.stdout.write('\x1b[2K\r'); // Clear line + console.log(color.red(`Failed to unpublish ${url}: ${err.message}`)); + } + })); } + // Clear any remaining spinner before final message + process.stdout.write('\x1b[2K\r'); return 'Deployment completed successfully'; } }; From 401a9d7739c5a47f4aa1c0d476bbfd4b7ab0c979 Mon Sep 17 00:00:00 2001 From: Stuart Rowlands Date: Sat, 23 Nov 2024 15:26:51 +1000 Subject: [PATCH 11/41] Separate commands by logical grouping. Removed debug logging. --- src/commandLoader.js | 69 ++++++++++++++++++++++++++--------------- src/commands/deploy.js | 21 +++++++++++++ src/commands/waflogs.js | 17 ---------- 3 files changed, 65 insertions(+), 42 deletions(-) diff --git a/src/commandLoader.js b/src/commandLoader.js index 6af2f5b..4dfce14 100644 --- a/src/commandLoader.js +++ b/src/commandLoader.js @@ -1,41 +1,60 @@ const fs = require('fs'); const path = require('path'); -const { select, text, password, confirm, isCancel } = require('@clack/prompts'); -const color = require('picocolors'); -// Load all command modules function loadCommands() { - const commands = {}; - const commandsDir = path.join(__dirname, 'commands'); - - fs.readdirSync(commandsDir) - .filter(file => file.endsWith('.js')) - .forEach(file => { - const command = require(path.join(commandsDir, file)); - const name = path.basename(file, '.js'); - commands[name] = command; - }); + const commands = { + // Primary deployment commands + 'deploy': require('./commands/deploy'), + 'page': require('./commands/page'), + 'file': require('./commands/file'), + 'redirect': require('./commands/redirect'), + 'purge': require('./commands/purge'), + 'waflogs': require('./commands/waflogs'), + 'search': require('./commands/search'), + 'scan': require('./commands/scan'), + + // Destructive operations + 'unpublish': require('./commands/unpublish'), + 'delete': require('./commands/delete'), + + // Project management + 'info': require('./commands/info'), + 'init': require('./commands/init'), + }; return commands; } -// Convert commands to Clack options function getCommandOptions() { - const commands = loadCommands(); - return Object.entries(commands).map(([name, command]) => ({ - value: name, - label: command.describe || name, - })); -} + return [ + // Primary deployment commands + { value: 'deploy', label: 'Deploy an entire directory' }, + { value: 'page', label: 'Deploy a single page' }, + { value: 'file', label: 'Deploy a single file' }, + { value: 'redirect', label: 'Create a redirect' }, + { value: 'purge', label: 'Purge the cache for a path' }, + { value: 'waflogs', label: 'Access WAF logs' }, + { value: 'search', label: 'Perform search index operations' }, + { value: 'scan', label: 'Validate local file checksums' }, + + // Visual separator + { value: 'separator1', label: '───────────────────────', disabled: true }, + + // Destructive operations + { value: 'unpublish', label: 'Unpublish an asset' }, + { value: 'delete', label: 'Delete an asset' }, + + // Visual separator + { value: 'separator2', label: '───────────────────────', disabled: true }, -// Get command handler -function getCommand(name) { - const commands = loadCommands(); - return commands[name]; + // Project management + { value: 'info', label: 'Show project info' }, + { value: 'init', label: 'Reinitialize project settings' }, + ]; } module.exports = { loadCommands, getCommandOptions, - getCommand + getCommand: (name) => loadCommands()[name] }; \ No newline at end of file diff --git a/src/commands/deploy.js b/src/commands/deploy.js index 578cbea..f374ccc 100644 --- a/src/commands/deploy.js +++ b/src/commands/deploy.js @@ -335,6 +335,27 @@ const command = { // Clear any remaining spinner before final message process.stdout.write('\x1b[2K\r'); + + // Cute robot animation frames + const frames = [ + '\\(o o)/', // arms up + '|(o o)|', // arms middle + '/(o o)\\', // arms down + '|(o o)|', // arms middle + '\\(o o)/', // arms up + '\\(- -)/', // blink! + ]; + + // Play the animation + for (let i = 0; i < frames.length; i++) { + process.stdout.write('\x1b[2K\r'); // Clear line + console.log(color.cyan(frames[i])); + await new Promise(resolve => setTimeout(resolve, 150)); // 150ms between frames + process.stdout.write('\x1b[1A'); // Move cursor up one line + } + + // Clear the animation + process.stdout.write('\x1b[2K\r'); return 'Deployment completed successfully'; } }; diff --git a/src/commands/waflogs.js b/src/commands/waflogs.js index 538811c..8cf979a 100644 --- a/src/commands/waflogs.js +++ b/src/commands/waflogs.js @@ -119,11 +119,6 @@ const command = { const quant = client(config); try { - console.log('Fetching WAF logs with params:', { - all: args.all, - page_size: args.size, - endpoint: config.get('endpoint') - }); let allLogs = []; let currentPage = 1; @@ -197,18 +192,6 @@ const command = { return output; } catch (err) { - console.log('Error details:', { - message: err.message, - code: err.code, - status: err.response && err.response.status, - data: err.response && err.response.data, - config: { - url: err.config && err.config.url, - method: err.config && err.config.method, - headers: err.config && err.config.headers - } - }); - // Format a user-friendly error message let errorMessage = 'Failed to fetch WAF logs: '; if (err.code === 'ECONNREFUSED') { From 75731e3fc192ece8d3577259fff26c3b7e2757e2 Mon Sep 17 00:00:00 2001 From: Stuart Rowlands Date: Sat, 23 Nov 2024 20:27:39 +1000 Subject: [PATCH 12/41] Added support to purge cache keys and soft purge --- src/commands/purge.js | 107 +++++++++++++++++++++++++++++++++--------- src/quant-client.js | 39 ++++++++++----- 2 files changed, 110 insertions(+), 36 deletions(-) diff --git a/src/commands/purge.js b/src/commands/purge.js index 86dcb5e..1a6842a 100644 --- a/src/commands/purge.js +++ b/src/commands/purge.js @@ -1,38 +1,97 @@ /** - * Purge the cache for a given url. + * Purge the cache for a given URL. * * @usage - * quant unpublish + * quant purge */ -const { text, isCancel } = require('@clack/prompts'); +const { text, confirm, isCancel, select } = require('@clack/prompts'); const color = require('picocolors'); const config = require('../config'); const client = require('../quant-client'); const command = { - command: 'purge [path]', + command: 'purge ', describe: 'Purge the cache for a given URL', builder: (yargs) => { return yargs .positional('path', { describe: 'Path to purge from cache', - type: 'string' - }); + type: 'string', + coerce: (arg) => { + return arg.replace(/^["']|["']$/g, ''); + } + }) + .option('cache-keys', { + describe: 'Cache keys to purge (space separated)', + type: 'string', + conflicts: 'path' + }) + .option('soft-purge', { + describe: 'Mark content as stale rather than delete from edge caches', + type: 'boolean', + default: false + }) + .example('quant purge "/about"', 'Purge a single path') + .example('quant purge "/*"', 'Purge all content (use quotes)') + .example('quant purge --cache-keys="key1 key2"', 'Purge specific cache keys') + .example('quant purge "/about" --soft-purge', 'Soft purge a path'); }, async promptArgs(providedArgs = {}) { - // If path is provided, skip that prompt let path = providedArgs.path; - if (!path) { - path = await text({ - message: 'Enter the path to purge from cache', - validate: value => !value ? 'Path is required' : undefined + let cacheKeys = providedArgs['cache-keys']; + let softPurge = providedArgs['soft-purge']; + + // If neither path nor cache-keys provided, prompt for one + if (!path && !cacheKeys) { + const purgeType = await select({ + message: 'What would you like to purge?', + options: [ + { value: 'path', label: 'Purge by path' }, + { value: 'keys', label: 'Purge by cache keys' } + ] + }); + if (isCancel(purgeType)) return null; + + if (purgeType === 'path') { + path = await text({ + message: 'Enter path to purge from cache', + validate: value => !value ? 'Path is required' : undefined + }); + if (isCancel(path)) return null; + } else { + cacheKeys = await text({ + message: 'Enter cache keys (space separated)', + validate: value => !value ? 'Cache keys are required' : undefined + }); + if (isCancel(cacheKeys)) return null; + } + } + + // If not provided and in interactive mode, ask about soft purge + if (softPurge === undefined) { + softPurge = await confirm({ + message: 'Use soft purge (mark as stale rather than delete)?', + initialValue: false + }); + if (isCancel(softPurge)) return null; + } + + // For wildcard paths, ask for confirmation + if (path && path.includes('*')) { + const shouldPurge = await confirm({ + message: `Are you sure you want to purge ${path}? This could affect multiple paths.`, + initialValue: false }); - if (isCancel(path)) return null; + if (isCancel(shouldPurge) || !shouldPurge) return null; } - return { path }; + return { + path, + 'cache-keys': cacheKeys, + 'soft-purge': softPurge + }; }, async handler(args) { @@ -40,22 +99,24 @@ const command = { throw new Error('Operation cancelled'); } - if (!args.path) { - const promptedArgs = await this.promptArgs(); - if (!promptedArgs) { - throw new Error('Operation cancelled'); - } - args = { ...args, ...promptedArgs }; - } - if (!await config.fromArgs(args)) { process.exit(1); } const quant = client(config); + try { - await quant.purge(args.path); - return `Purged ${args.path}`; + const options = { + softPurge: args['soft-purge'] + }; + + if (args['cache-keys']) { + await quant.purge(null, args['cache-keys'], options); + return `Successfully purged cache keys: ${args['cache-keys']}`; + } else { + await quant.purge(args.path, null, options); + return `Successfully purged ${args.path}`; + } } catch (err) { throw new Error(`Failed to purge: ${err.message}`); } diff --git a/src/quant-client.js b/src/quant-client.js index bbec624..129febc 100644 --- a/src/quant-client.js +++ b/src/quant-client.js @@ -590,22 +590,35 @@ module.exports = function (config) { }, /** - * Purge URL patterns from Quants Varnish. + * Purge content from the cache. * - * @param {string} urlPattern + * @param {string} url + * The URL to purge. + * @param {string} cacheKeys + * Space separated cache keys to purge. + * @param {object} options + * Additional options for the purge. * - * @throws Error + * @return {object} + * The response. + * + * @throws Error. */ - purge: async function (urlPattern) { - const options = { - url: `${config.get("endpoint")}/purge`, - headers: { - ...headers, - "Quant-Url": urlPattern, - }, - }; - const res = await post(options.url, {}, { headers: options.headers }); - return handleResponse(res); + purge: async function(url, cacheKeys, options = {}) { + const purgeHeaders = { ...headers }; + + if (cacheKeys) { + purgeHeaders['Cache-Keys'] = cacheKeys; + } else { + purgeHeaders['Quant-Url'] = url; + } + + if (options.softPurge) { + purgeHeaders['Soft-Purge'] = 'true'; + } + + const response = await post(`${config.get('endpoint')}/purge`, {}, { headers: purgeHeaders }); + return handleResponse(response); }, /** From 9a8d89393ff0953803751d3b775a0eb2fcdf29be Mon Sep 17 00:00:00 2001 From: Stuart Rowlands Date: Sat, 23 Nov 2024 20:47:57 +1000 Subject: [PATCH 13/41] Improved message when running commands without config. --- cli.js | 2 +- src/config.js | 47 ++++++++++++++++++++++++----------------------- 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/cli.js b/cli.js index bb7ab09..582d74a 100755 --- a/cli.js +++ b/cli.js @@ -27,7 +27,7 @@ async function interactiveMode() { try { // Check for config before showing menu - if (!await config.fromArgs({ _: [''] })) { + if (!await config.fromArgs({ _: [''] }, true)) { const shouldInit = await confirm({ message: 'No configuration found. Would you like to initialize a new project?', initialValue: true diff --git a/src/config.js b/src/config.js index eb7e5e5..7bd2a1a 100644 --- a/src/config.js +++ b/src/config.js @@ -11,7 +11,7 @@ let config = {}; * 3. quant.json file * 4. Default values */ -async function fromArgs(args = {}) { +async function fromArgs(args = {}, silent = false) { // First check environment variables const envConfig = { clientid: process.env.QUANT_CLIENT_ID, @@ -26,7 +26,7 @@ async function fromArgs(args = {}) { try { fileConfig = JSON.parse(fs.readFileSync('quant.json')); } catch (err) { - console.log('Debug - No quant.json found or error:', err.message); + // Silent fail - we'll handle missing config later } // Set defaults @@ -50,30 +50,31 @@ async function fromArgs(args = {}) { if (args.clientid) config.clientid = args.clientid; if (args.project) config.project = args.project; if (args.token) config.token = args.token; - - // Handle enable-index-html setting - if (args['enable-index-html'] !== undefined) { - // If setting exists in config, ensure it matches - if (config.enableIndexHtml !== undefined && - config.enableIndexHtml !== args['enable-index-html']) { - throw new Error( - 'Project was previously deployed with ' + - (config.enableIndexHtml ? '--enable-index-html' : 'no --enable-index-html') + - '. Cannot change this setting after initial deployment.' - ); - } - } - // Ensure endpoint ends with /v1 - if (config.endpoint && !config.endpoint.endsWith('/v1')) { - config.endpoint = `${config.endpoint}/v1`; + // Check required config + const missingConfig = []; + if (!config.clientid) missingConfig.push('clientid'); + if (!config.project) missingConfig.push('project'); + if (!config.token) missingConfig.push('token'); + + if (missingConfig.length > 0 && !silent) { + const color = require('picocolors'); + console.log(color.red('Missing required configuration:')); + console.log(color.yellow(`Missing: ${missingConfig.join(', ')}`)); + console.log('\nYou can provide configuration in several ways:'); + console.log('1. Run "quant init" to create a new configuration'); + console.log('2. Create a quant.json file in this directory'); + console.log('3. Set environment variables:'); + console.log(' - QUANT_CLIENT_ID'); + console.log(' - QUANT_PROJECT'); + console.log(' - QUANT_TOKEN'); + console.log('4. Provide via command line arguments:'); + console.log(' --clientid, -c'); + console.log(' --project, -p'); + console.log(' --token, -t'); } - return ( - config.clientid !== undefined && - config.project !== undefined && - config.token !== undefined - ); + return missingConfig.length === 0; } function get(key) { From c3d58dded3b75010d41c38c814c37987f10be31c Mon Sep 17 00:00:00 2001 From: Stuart Rowlands Date: Sat, 23 Nov 2024 21:06:23 +1000 Subject: [PATCH 14/41] Improved search docs. Fixed search validation of records. --- README.md | 68 +++++++++++++++++++++++--- src/commands/search.js | 108 +++++++++++++++++++++++++++++------------ 2 files changed, 136 insertions(+), 40 deletions(-) diff --git a/README.md b/README.md index 52484dd..19ce406 100644 --- a/README.md +++ b/README.md @@ -67,26 +67,68 @@ quant [options] ``` ### Cache Management -- `quant purge ` - Purge the cache for a given URL +- `quant purge ` - Purge the cache for a given URL or cache keys ```bash - quant purge /about-us + quant purge /about-us # Purge by path + quant purge "/*" # Purge all content + quant purge --cache-keys="key1 key2" # Purge by cache keys + quant purge /about-us --soft-purge # Mark as stale instead of deleting ``` ### Redirects -- `quant redirect [status] [author]` - Create a redirect +- `quant redirect [status]` - Create a redirect ```bash - quant redirect /old-page /new-page [--status=301] [--author="John Doe"] + quant redirect /old-page /new-page [--status=301] ``` ### Search - `quant search ` - Perform search index operations ```bash - quant search status - quant search index --path=/path/to/files - quant search unindex --path=/url/to/remove - quant search clear + quant search status # Show search index status + quant search index --path=records.json # Add/update search records + quant search unindex --path=/url/to/remove # Remove item from search index + quant search clear # Clear entire search index ``` +You may index new content or update existing content in the search index directly. Simply provide one or multiple records in JSON files. For example, consider a `search-records.json` file containing the following: + +```json +[ + { + "title": "This is a record", + "url": "/blog/page", + "summary": "The record is small and neat.", + "content": "Lots of good content here. But not too much!" + }, + { + "title": "Fully featured search record", + "url": "/about-us", + "summary": "The record contains all the trimmings.", + "content": "Lorem ipsum dolor sit amet, consectetur adipiscing elit.", + "image": "https://www.example.com/images/about.jpg", + "categories": [ "Blog", "Commerce", "Jamstack" ], + "tags": [ "Tailwind" , "QuantCDN" ], + "author": "John Doe", + "publishDate": "2024-02-22", + "readTime": "5 mins", + "customField": "Any value you need" + } +] +``` + +Required fields for each record: +- `title`: The title of the page +- `url`: The URL path of the page +- `content`: The searchable content + +Common optional fields: +- `summary`: A brief description +- `image`: URL to an associated image +- `categories`: Array of category names +- `tags`: Array of tag names + +You can include any additional key/value pairs in your records. These custom fields will be indexed and available for filtering, faceting, or display in your search integration. + ### Validation - `quant scan` - Validate local file checksums ```bash @@ -119,6 +161,11 @@ The CLI can be configured using either: - `QUANT_PROJECT` - `QUANT_TOKEN` - `QUANT_ENDPOINT` +4. Configuration file: `quant.json` in the current directory + +Missing configuration will be handled differently depending on the context: +- Running `quant` with no arguments will prompt to initialize a new project +- Running specific commands without configuration will show detailed setup instructions ## Examples @@ -135,6 +182,11 @@ quant file ./logo.png /images/logo.png # Create a redirect quant redirect /old-page /new-page --status=301 +# Purge cache with various options +quant purge "/*" # Purge all content +quant purge --cache-keys="key1 key2" # Purge specific cache keys +quant purge /about --soft-purge # Soft purge a path + # Check deployment status quant scan --diff-only ``` diff --git a/src/commands/search.js b/src/commands/search.js index e642de6..63e8d05 100644 --- a/src/commands/search.js +++ b/src/commands/search.js @@ -1,8 +1,5 @@ /** - * Perform Search API oprtations. - * - * @usage - * quant search + * Perform Search API operations. */ const { text, select, confirm, isCancel } = require('@clack/prompts'); const color = require('picocolors'); @@ -28,7 +25,6 @@ const command = { }, async promptArgs(providedArgs = {}) { - // If operation is provided, skip that prompt let operation = providedArgs.operation; if (!operation) { operation = await select({ @@ -43,7 +39,15 @@ const command = { if (isCancel(operation)) return null; } - // If path is needed and not provided, prompt for it + // For clear operation, ask for confirmation + if (operation === 'clear') { + const shouldClear = await confirm({ + message: 'Are you sure you want to clear the entire search index? This cannot be undone.', + initialValue: false + }); + if (isCancel(shouldClear) || !shouldClear) return null; + } + let path = providedArgs.path; if ((operation === 'index' || operation === 'unindex') && !path) { path = await text({ @@ -55,13 +59,55 @@ const command = { if (isCancel(path)) return null; } - // For clear operation, ask for confirmation - if (operation === 'clear') { - const shouldClear = await confirm({ - message: 'Are you sure you want to clear the entire search index?', - initialValue: false - }); - if (isCancel(shouldClear) || !shouldClear) return null; + // For index operation, validate JSON file + if (operation === 'index' && path) { + try { + const fileContent = fs.readFileSync(path, 'utf8'); + const data = JSON.parse(fileContent); + + // Validate array structure + if (!Array.isArray(data)) { + throw new Error('JSON must be an array of records'); + } + + // Validate required fields + data.forEach((record, index) => { + if (!record.url || !record.title || !record.content) { + throw new Error(`Record at index ${index} missing required fields (url, title, content)`); + } + }); + + } catch (err) { + if (err.code === 'ENOENT') { + console.log(color.red(`Error: File not found: ${path}`)); + } else { + console.log(color.red('Error: Invalid JSON file')); + console.log(color.yellow('Make sure your JSON:')); + console.log('1. Uses double quotes for property names'); + console.log('2. Has valid syntax (no trailing commas)'); + console.log('3. Follows the required format:'); + console.log(color.dim(` +[ + { + "title": "This is a record", + "url": "/blog/page", + "summary": "The record is small and neat.", + "content": "Lots of good content here. But not too much!" + }, + { + "title": "Fully featured search record", + "url": "/about-us", + "summary": "The record contains all the trimmings.", + "content": "Lorem ipsum dolor sit amet...", + "image": "https://www.example.com/images/about.jpg", + "categories": [ "Blog", "Commerce" ], + "tags": [ "Tailwind", "QuantCDN" ] + } +]`)); + console.log('\nError details:', err.message); + } + return null; + } } return { operation, path }; @@ -78,28 +124,26 @@ const command = { const quant = client(config); - switch (args.operation) { - case 'status': - const status = await quant.searchStatus(); - return `Search index status:\nTotal documents: ${status.index?.entries || 0}`; + try { + switch (args.operation) { + case 'status': + const status = await quant.searchStatus(); + return `Search index status:\nTotal documents: ${status.index && status.index.entries || 0}`; - case 'index': - if (!args.path) { - throw new Error('Path to JSON file is required'); - } - await quant.searchIndex(args.path); - return 'Successfully added items to search index'; + case 'index': + await quant.searchIndex(args.path); + return 'Successfully added items to search index'; - case 'unindex': - if (!args.path) { - throw new Error('URL to remove is required'); - } - await quant.searchRemove(args.path); - return `Successfully removed ${args.path} from search index`; + case 'unindex': + await quant.searchRemove(args.path); + return `Successfully removed ${args.path} from search index`; - case 'clear': - await quant.searchClearIndex(); - return 'Successfully cleared search index'; + case 'clear': + await quant.searchClearIndex(); + return 'Successfully cleared search index'; + } + } catch (err) { + throw new Error(`Failed to ${args.operation}: ${err.message}`); } } }; From cad39b17894f44767e1733ecdf3fda09c1d5a0d5 Mon Sep 17 00:00:00 2001 From: Stuart Rowlands Date: Sat, 23 Nov 2024 21:33:50 +1000 Subject: [PATCH 15/41] Fixed lock index-html enable mode --- src/config.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/config.js b/src/config.js index 7bd2a1a..4c171a8 100644 --- a/src/config.js +++ b/src/config.js @@ -51,6 +51,24 @@ async function fromArgs(args = {}, silent = false) { if (args.project) config.project = args.project; if (args.token) config.token = args.token; + // Handle enable-index-html setting + if (args['enable-index-html'] !== undefined) { + // If setting exists in config, ensure it matches + if (config.enableIndexHtml !== undefined && + config.enableIndexHtml !== args['enable-index-html']) { + throw new Error( + 'Project was previously deployed with ' + + (config.enableIndexHtml ? '--enable-index-html' : 'no --enable-index-html') + + '. Cannot change this setting after initial deployment.' + ); + } + // Store the setting if it's the first time + if (config.enableIndexHtml === undefined) { + config.enableIndexHtml = args['enable-index-html']; + save(); + } + } + // Check required config const missingConfig = []; if (!config.clientid) missingConfig.push('clientid'); From 01b508978edd3d1bdd4b804a8aa24e891e06603e Mon Sep 17 00:00:00 2001 From: Stuart Rowlands Date: Sun, 24 Nov 2024 13:57:44 +1000 Subject: [PATCH 16/41] Moving to new tests harness. --- .mocharc.json | 8 + package-lock.json | 1253 +++++++-------------------- package.json | 19 +- tests/setup.mjs | 11 + tests/unit/commands/deploy.test.js | 61 ++ tests/unit/commands/deploy.test.mjs | 108 +++ tests/unit/config.test.mjs | 172 ++++ 7 files changed, 686 insertions(+), 946 deletions(-) create mode 100644 .mocharc.json create mode 100644 tests/setup.mjs create mode 100644 tests/unit/commands/deploy.test.js create mode 100644 tests/unit/commands/deploy.test.mjs create mode 100644 tests/unit/config.test.mjs diff --git a/.mocharc.json b/.mocharc.json new file mode 100644 index 0000000..49de95e --- /dev/null +++ b/.mocharc.json @@ -0,0 +1,8 @@ +{ + "loader": "esm", + "experimental-modules": true, + "node-option": [ + "experimental-vm-modules", + "no-warnings" + ] +} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 8bf2440..7442fb6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28,20 +28,24 @@ }, "devDependencies": { "@sinonjs/referee": "^11.0.1", - "chai": "^5.1.1", - "chai-as-promised": "^8.0.0", - "eslint": "^9.8.0", - "eslint-config-google": "^0.14.0", - "eslint-plugin-jsdoc": "^50.0.1", - "mocha": "^10.0.0", - "mock-require": "^3.0.3", - "sinon": "^19.0.2", + "c8": "^8.0.1", + "chai": "^5.1.0", + "mocha": "^10.3.0", + "nock": "^13.5.4", + "sinon": "^17.0.1", "sinon-chai": "^4.0.0" }, "engines": { "node": ">=16" } }, + "node_modules/@bcoe/v8-coverage": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz", + "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", + "dev": true, + "license": "MIT" + }, "node_modules/@clack/core": { "version": "0.3.4", "resolved": "https://registry.npmjs.org/@clack/core/-/core-0.3.4.tgz", @@ -78,211 +82,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/@es-joy/jsdoccomment": { - "version": "0.49.0", - "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.49.0.tgz", - "integrity": "sha512-xjZTSFgECpb9Ohuk5yMX5RhUEbfeQcuOp8IF60e+wyzWEF0M5xeSgqsfLtvPEX8BIyOX9saZqzuGPmZ8oWc+5Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "comment-parser": "1.4.1", - "esquery": "^1.6.0", - "jsdoc-type-pratt-parser": "~4.1.0" - }, - "engines": { - "node": ">=16" - } - }, - "node_modules/@eslint-community/eslint-utils": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz", - "integrity": "sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==", - "dev": true, - "license": "MIT", - "dependencies": { - "eslint-visitor-keys": "^3.4.3" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - }, - "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" - } - }, - "node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", - "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/@eslint-community/regexpp": { - "version": "4.12.1", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz", - "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^12.0.0 || ^14.0.0 || >=16.0.0" - } - }, - "node_modules/@eslint/config-array": { - "version": "0.19.0", - "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.0.tgz", - "integrity": "sha512-zdHg2FPIFNKPdcHWtiNT+jEFCHYVplAXRDlQDyqy0zGx/q2parwh7brGJSiTxRk/TSMkbM//zt/f5CHgyTyaSQ==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@eslint/object-schema": "^2.1.4", - "debug": "^4.3.1", - "minimatch": "^3.1.2" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - } - }, - "node_modules/@eslint/core": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.9.0.tgz", - "integrity": "sha512-7ATR9F0e4W85D/0w7cU0SNj7qkAexMG+bAHEZOjo9akvGuhHE2m7umzWzfnpa0XAg5Kxc1BWmtPMV67jJ+9VUg==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - } - }, - "node_modules/@eslint/eslintrc": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.2.0.tgz", - "integrity": "sha512-grOjVNN8P3hjJn/eIETF1wwd12DdnwFDoyceUJLYYdkpbwq3nLi+4fqrTAONx7XDALqlL220wC/RHSC/QTI/0w==", - "dev": true, - "license": "MIT", - "dependencies": { - "ajv": "^6.12.4", - "debug": "^4.3.2", - "espree": "^10.0.1", - "globals": "^14.0.0", - "ignore": "^5.2.0", - "import-fresh": "^3.2.1", - "js-yaml": "^4.1.0", - "minimatch": "^3.1.2", - "strip-json-comments": "^3.1.1" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/@eslint/js": { - "version": "9.15.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.15.0.tgz", - "integrity": "sha512-tMTqrY+EzbXmKJR5ToI8lxu7jaN5EdmrBFJpQk5JmSlyLsx6o4t27r883K5xsLuCYCpfKBCGswMSWXsM+jB7lg==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - } - }, - "node_modules/@eslint/object-schema": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.4.tgz", - "integrity": "sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - } - }, - "node_modules/@eslint/plugin-kit": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.3.tgz", - "integrity": "sha512-2b/g5hRmpbb1o4GnTZax9N9m0FXzz9OV42ZzI4rDDMDuHUqigAiQCEWChBWCY4ztAGVRjoWT19v0yMmc5/L5kA==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "levn": "^0.4.1" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - } - }, - "node_modules/@humanfs/core": { - "version": "0.19.1", - "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz", - "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": ">=18.18.0" - } - }, - "node_modules/@humanfs/node": { - "version": "0.16.6", - "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz", - "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@humanfs/core": "^0.19.1", - "@humanwhocodes/retry": "^0.3.0" - }, - "engines": { - "node": ">=18.18.0" - } - }, - "node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz", - "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": ">=18.18" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/nzakas" - } - }, - "node_modules/@humanwhocodes/module-importer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", - "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": ">=12.22" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/nzakas" - } - }, - "node_modules/@humanwhocodes/retry": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.1.tgz", - "integrity": "sha512-c7hNEllBlenFTHBky65mhq8WD2kbN9Q6gk0bTk8lSBvc554jpXSkST1iePudpt7+A/AQvuHs9EMqjHDXMY1lrA==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": ">=18.18" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/nzakas" - } - }, "node_modules/@isaacs/cliui": { "version": "8.0.2", "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", @@ -300,17 +99,42 @@ "node": ">=12" } }, - "node_modules/@pkgr/core": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.1.1.tgz", - "integrity": "sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==", + "node_modules/@istanbuljs/schema": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", + "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", "dev": true, "license": "MIT", "engines": { - "node": "^12.20.0 || ^14.18.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/unts" + "node": ">=8" + } + }, + "node_modules/@jridgewell/resolve-uri": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", + "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", + "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/@jridgewell/trace-mapping": { + "version": "0.3.25", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", + "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" } }, "node_modules/@sinonjs/commons": { @@ -324,9 +148,9 @@ } }, "node_modules/@sinonjs/fake-timers": { - "version": "13.0.5", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-13.0.5.tgz", - "integrity": "sha512-36/hTbH2uaWuGVERyC6da9YwGWnzUZXuPro/F2LfsdOsLnCojz/iSH8MxUt/FD2S5XBSVPhmArFUXcpCQ2Hkiw==", + "version": "11.3.1", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-11.3.1.tgz", + "integrity": "sha512-EVJO7nW5M/F5Tur0Rf2z/QoMo+1Ia963RiMtapiQrEWvY0iBUvADo8Beegwjpnle5BHkyHuoxSTW3jF43H1XRA==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -376,60 +200,13 @@ "dev": true, "license": "(Unlicense OR Apache-2.0)" }, - "node_modules/@types/estree": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", - "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", - "dev": true, - "license": "MIT" - }, - "node_modules/@types/json-schema": { - "version": "7.0.15", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", - "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", + "node_modules/@types/istanbul-lib-coverage": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz", + "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==", "dev": true, "license": "MIT" }, - "node_modules/acorn": { - "version": "8.14.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz", - "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==", - "dev": true, - "license": "MIT", - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/acorn-jsx": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", - "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "dev": true, - "license": "MIT", - "peerDependencies": { - "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" - } - }, - "node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "license": "MIT", - "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, "node_modules/ansi-colors": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", @@ -481,16 +258,6 @@ "node": ">= 8" } }, - "node_modules/are-docs-informative": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/are-docs-informative/-/are-docs-informative-0.0.2.tgz", - "integrity": "sha512-ixiS0nLNNG5jNQzgZJNoUpBKdo9yTYZMGJ+QgT2jmjR7G7+QHRCc4v6LQ3NgE7EBJq+o0ams3waJwkrlBom8Ig==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=14" - } - }, "node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", @@ -651,6 +418,64 @@ "dev": true, "license": "ISC" }, + "node_modules/c8": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/c8/-/c8-8.0.1.tgz", + "integrity": "sha512-EINpopxZNH1mETuI0DzRA4MZpAUH+IFiRhnmFD3vFr3vdrgxqi3VfE3KL0AIL+zDq8rC9bZqwM/VDmmoe04y7w==", + "dev": true, + "license": "ISC", + "dependencies": { + "@bcoe/v8-coverage": "^0.2.3", + "@istanbuljs/schema": "^0.1.3", + "find-up": "^5.0.0", + "foreground-child": "^2.0.0", + "istanbul-lib-coverage": "^3.2.0", + "istanbul-lib-report": "^3.0.1", + "istanbul-reports": "^3.1.6", + "rimraf": "^3.0.2", + "test-exclude": "^6.0.0", + "v8-to-istanbul": "^9.0.0", + "yargs": "^17.7.2", + "yargs-parser": "^21.1.1" + }, + "bin": { + "c8": "bin/c8.js" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/c8/node_modules/foreground-child": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz", + "integrity": "sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==", + "dev": true, + "license": "ISC", + "dependencies": { + "cross-spawn": "^7.0.0", + "signal-exit": "^3.0.2" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/c8/node_modules/signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/c8/node_modules/yargs-parser": { + "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=12" + } + }, "node_modules/call-bind": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", @@ -670,16 +495,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, "node_modules/camelcase": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", @@ -710,19 +525,6 @@ "node": ">=12" } }, - "node_modules/chai-as-promised": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-8.0.0.tgz", - "integrity": "sha512-sMsGXTrS3FunP/wbqh/KxM8Kj/aLPXQGkNtvE5wPfSToq8wkkvBpTZo1LIiEVmC4BwkKpag+l5h/20lBMk6nUg==", - "dev": true, - "license": "WTFPL", - "dependencies": { - "check-error": "^2.0.0" - }, - "peerDependencies": { - "chai": ">= 2.1.2 < 6" - } - }, "node_modules/chalk": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", @@ -889,16 +691,6 @@ "node": ">= 0.8" } }, - "node_modules/comment-parser": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.4.1.tgz", - "integrity": "sha512-buhp5kePrmda3vhc5B9t7pUQXAb2Tnd0qgpkIhPhkHXxJpiPJ11H0ZEU0oBpJ2QztSbzG/ZxMj/CHsYJqRHmyg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 12.0.0" - } - }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -906,6 +698,13 @@ "dev": true, "license": "MIT" }, + "node_modules/convert-source-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true, + "license": "MIT" + }, "node_modules/core-util-is": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", @@ -1032,13 +831,6 @@ "node": ">=6" } }, - "node_modules/deep-is": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", - "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", - "dev": true, - "license": "MIT" - }, "node_modules/define-data-property": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", @@ -1185,13 +977,6 @@ "node": ">= 0.4" } }, - "node_modules/es-module-lexer": { - "version": "1.5.4", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.4.tgz", - "integrity": "sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==", - "dev": true, - "license": "MIT" - }, "node_modules/es-object-atoms": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz", @@ -1300,135 +1085,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/eslint": { - "version": "9.15.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.15.0.tgz", - "integrity": "sha512-7CrWySmIibCgT1Os28lUU6upBshZ+GxybLOrmRzi08kS8MBuO8QA7pXEgYgY5W8vK3e74xv0lpjo9DbaGU9Rkw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@eslint-community/eslint-utils": "^4.2.0", - "@eslint-community/regexpp": "^4.12.1", - "@eslint/config-array": "^0.19.0", - "@eslint/core": "^0.9.0", - "@eslint/eslintrc": "^3.2.0", - "@eslint/js": "9.15.0", - "@eslint/plugin-kit": "^0.2.3", - "@humanfs/node": "^0.16.6", - "@humanwhocodes/module-importer": "^1.0.1", - "@humanwhocodes/retry": "^0.4.1", - "@types/estree": "^1.0.6", - "@types/json-schema": "^7.0.15", - "ajv": "^6.12.4", - "chalk": "^4.0.0", - "cross-spawn": "^7.0.5", - "debug": "^4.3.2", - "escape-string-regexp": "^4.0.0", - "eslint-scope": "^8.2.0", - "eslint-visitor-keys": "^4.2.0", - "espree": "^10.3.0", - "esquery": "^1.5.0", - "esutils": "^2.0.2", - "fast-deep-equal": "^3.1.3", - "file-entry-cache": "^8.0.0", - "find-up": "^5.0.0", - "glob-parent": "^6.0.2", - "ignore": "^5.2.0", - "imurmurhash": "^0.1.4", - "is-glob": "^4.0.0", - "json-stable-stringify-without-jsonify": "^1.0.1", - "lodash.merge": "^4.6.2", - "minimatch": "^3.1.2", - "natural-compare": "^1.4.0", - "optionator": "^0.9.3" - }, - "bin": { - "eslint": "bin/eslint.js" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "url": "https://eslint.org/donate" - }, - "peerDependencies": { - "jiti": "*" - }, - "peerDependenciesMeta": { - "jiti": { - "optional": true - } - } - }, - "node_modules/eslint-config-google": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/eslint-config-google/-/eslint-config-google-0.14.0.tgz", - "integrity": "sha512-WsbX4WbjuMvTdeVL6+J3rK1RGhCTqjsFjX7UMSMgZiyxxaNLkoJENbrGExzERFeoTpGw3F3FypTiWAP9ZXzkEw==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": ">=0.10.0" - }, - "peerDependencies": { - "eslint": ">=5.16.0" - } - }, - "node_modules/eslint-plugin-jsdoc": { - "version": "50.5.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-50.5.0.tgz", - "integrity": "sha512-xTkshfZrUbiSHXBwZ/9d5ulZ2OcHXxSvm/NPo494H/hadLRJwOq5PMV0EUpMqsb9V+kQo+9BAgi6Z7aJtdBp2A==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "@es-joy/jsdoccomment": "~0.49.0", - "are-docs-informative": "^0.0.2", - "comment-parser": "1.4.1", - "debug": "^4.3.6", - "escape-string-regexp": "^4.0.0", - "espree": "^10.1.0", - "esquery": "^1.6.0", - "parse-imports": "^2.1.1", - "semver": "^7.6.3", - "spdx-expression-parse": "^4.0.0", - "synckit": "^0.9.1" - }, - "engines": { - "node": ">=18" - }, - "peerDependencies": { - "eslint": "^7.0.0 || ^8.0.0 || ^9.0.0" - } - }, - "node_modules/eslint-scope": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.2.0.tgz", - "integrity": "sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "esrecurse": "^4.3.0", - "estraverse": "^5.2.0" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/eslint-visitor-keys": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", - "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, "node_modules/esniff": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/esniff/-/esniff-2.0.1.tgz", @@ -1445,70 +1101,6 @@ "node": ">=0.10" } }, - "node_modules/espree": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz", - "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "acorn": "^8.14.0", - "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^4.2.0" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/esquery": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", - "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "estraverse": "^5.1.0" - }, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/esrecurse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", - "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "estraverse": "^5.2.0" - }, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true, - "license": "BSD-2-Clause", - "engines": { - "node": ">=4.0" - } - }, - "node_modules/esutils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", - "dev": true, - "license": "BSD-2-Clause", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/event-emitter": { "version": "0.3.5", "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", @@ -1530,40 +1122,6 @@ "type": "^2.7.2" } }, - "node_modules/fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true, - "license": "MIT" - }, - "node_modules/fast-json-stable-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true, - "license": "MIT" - }, - "node_modules/fast-levenshtein": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", - "dev": true, - "license": "MIT" - }, - "node_modules/file-entry-cache": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", - "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "flat-cache": "^4.0.0" - }, - "engines": { - "node": ">=16.0.0" - } - }, "node_modules/fill-range": { "version": "7.1.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", @@ -1604,27 +1162,6 @@ "flat": "cli.js" } }, - "node_modules/flat-cache": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz", - "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==", - "dev": true, - "license": "MIT", - "dependencies": { - "flatted": "^3.2.9", - "keyv": "^4.5.4" - }, - "engines": { - "node": ">=16" - } - }, - "node_modules/flatted": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.2.tgz", - "integrity": "sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA==", - "dev": true, - "license": "ISC" - }, "node_modules/follow-redirects": { "version": "1.15.9", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz", @@ -1752,13 +1289,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/get-caller-file": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", - "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==", - "dev": true, - "license": "ISC" - }, "node_modules/get-intrinsic": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", @@ -1818,19 +1348,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/glob-parent": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", - "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", - "dev": true, - "license": "ISC", - "dependencies": { - "is-glob": "^4.0.3" - }, - "engines": { - "node": ">=10.13.0" - } - }, "node_modules/glob/node_modules/brace-expansion": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", @@ -1855,19 +1372,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/globals": { - "version": "14.0.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz", - "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/globalthis": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz", @@ -2003,42 +1507,12 @@ ], "license": "MIT" }, - "node_modules/ignore": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", - "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 4" - } - }, - "node_modules/import-fresh": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", - "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", - "dev": true, - "license": "MIT", - "dependencies": { - "parent-module": "^1.0.0", - "resolve-from": "^4.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "node_modules/html-escaper": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", + "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.8.19" - } + "license": "MIT" }, "node_modules/inflight": { "version": "1.0.6", @@ -2376,6 +1850,7 @@ "version": "0.1.0", "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", + "dev": true, "license": "MIT", "engines": { "node": ">=10" @@ -2408,6 +1883,45 @@ "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", "license": "ISC" }, + "node_modules/istanbul-lib-coverage": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz", + "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-report": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz", + "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "istanbul-lib-coverage": "^3.0.0", + "make-dir": "^4.0.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/istanbul-reports": { + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz", + "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "html-escaper": "^2.0.0", + "istanbul-lib-report": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/jackspeak": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.0.2.tgz", @@ -2436,43 +1950,19 @@ "js-yaml": "bin/js-yaml.js" } }, - "node_modules/jsdoc-type-pratt-parser": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.1.0.tgz", - "integrity": "sha512-Hicd6JK5Njt2QB6XYFS7ok9e37O8AYk3jTcppG4YVQnYjOemymvTcmc7OWsmq/Qqj5TdRFO5/x/tIPmBeRtGHg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12.0.0" - } - }, - "node_modules/json-buffer": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", - "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true, - "license": "MIT" - }, - "node_modules/json-stable-stringify-without-jsonify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", - "dev": true, - "license": "MIT" - }, "node_modules/json-stream-stringify": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/json-stream-stringify/-/json-stream-stringify-2.0.4.tgz", "integrity": "sha512-gIPoa6K5w6j/RnQ3fOtmvICKNJGViI83A7dnTIL+0QJ/1GKuNvCPFvbFWxt0agruF4iGgDFJvge4Gua4ZoiggQ==", "license": "MIT" }, + "node_modules/json-stringify-safe": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==", + "dev": true, + "license": "ISC" + }, "node_modules/jsonparse": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", @@ -2505,30 +1995,6 @@ "dev": true, "license": "MIT" }, - "node_modules/keyv": { - "version": "4.5.4", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", - "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", - "dev": true, - "license": "MIT", - "dependencies": { - "json-buffer": "3.0.1" - } - }, - "node_modules/levn": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", - "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "prelude-ls": "^1.2.1", - "type-check": "~0.4.0" - }, - "engines": { - "node": ">= 0.8.0" - } - }, "node_modules/locate-path": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", @@ -2559,13 +2025,6 @@ "dev": true, "license": "MIT" }, - "node_modules/lodash.merge": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "dev": true, - "license": "MIT" - }, "node_modules/log-symbols": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", @@ -2599,6 +2058,22 @@ "node": "20 || >=22" } }, + "node_modules/make-dir": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz", + "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==", + "dev": true, + "license": "MIT", + "dependencies": { + "semver": "^7.5.3" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/md5-file": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/md5-file/-/md5-file-5.0.0.tgz", @@ -2854,33 +2329,6 @@ "node": ">=10" } }, - "node_modules/mock-require": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/mock-require/-/mock-require-3.0.3.tgz", - "integrity": "sha512-lLzfLHcyc10MKQnNUCv7dMcoY/2Qxd6wJfbqCcVk3LDb8An4hF6ohk5AztrvgKhJCqj36uyzi/p5se+tvyD+Wg==", - "dev": true, - "license": "MIT", - "dependencies": { - "get-caller-file": "^1.0.2", - "normalize-path": "^2.1.1" - }, - "engines": { - "node": ">=4.3.0" - } - }, - "node_modules/mock-require/node_modules/normalize-path": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", - "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==", - "dev": true, - "license": "MIT", - "dependencies": { - "remove-trailing-separator": "^1.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", @@ -2888,13 +2336,6 @@ "dev": true, "license": "MIT" }, - "node_modules/natural-compare": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", - "dev": true, - "license": "MIT" - }, "node_modules/next-tick": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz", @@ -2903,17 +2344,32 @@ "license": "ISC" }, "node_modules/nise": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/nise/-/nise-6.1.1.tgz", - "integrity": "sha512-aMSAzLVY7LyeM60gvBS423nBmIPP+Wy7St7hsb+8/fc1HmeoHJfLO8CKse4u3BtOZvQLJghYPI2i/1WZrEj5/g==", + "version": "5.1.9", + "resolved": "https://registry.npmjs.org/nise/-/nise-5.1.9.tgz", + "integrity": "sha512-qOnoujW4SV6e40dYxJOb3uvuoPHtmLzIk4TFo+j0jPJoC+5Z9xja5qH5JZobEPsa8+YYphMrOSwnrshEhG2qww==", "dev": true, "license": "BSD-3-Clause", "dependencies": { - "@sinonjs/commons": "^3.0.1", - "@sinonjs/fake-timers": "^13.0.1", - "@sinonjs/text-encoding": "^0.7.3", + "@sinonjs/commons": "^3.0.0", + "@sinonjs/fake-timers": "^11.2.2", + "@sinonjs/text-encoding": "^0.7.2", "just-extend": "^6.2.0", - "path-to-regexp": "^8.1.0" + "path-to-regexp": "^6.2.1" + } + }, + "node_modules/nock": { + "version": "13.5.6", + "resolved": "https://registry.npmjs.org/nock/-/nock-13.5.6.tgz", + "integrity": "sha512-o2zOYiCpzRqSzPj0Zt/dQ/DqZeYoaQ7TUonc/xUPjCGl9WeHpNbxgVvOquXYAaJzI0M9BXV3HTzG0p8IUAbBTQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "^4.1.0", + "json-stringify-safe": "^5.0.1", + "propagate": "^2.0.0" + }, + "engines": { + "node": ">= 10.13" } }, "node_modules/normalize-path": { @@ -2974,24 +2430,6 @@ "wrappy": "1" } }, - "node_modules/optionator": { - "version": "0.9.4", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", - "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", - "dev": true, - "license": "MIT", - "dependencies": { - "deep-is": "^0.1.3", - "fast-levenshtein": "^2.0.6", - "levn": "^0.4.1", - "prelude-ls": "^1.2.1", - "type-check": "^0.4.0", - "word-wrap": "^1.2.5" - }, - "engines": { - "node": ">= 0.8.0" - } - }, "node_modules/p-is-promise": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-3.0.0.tgz", @@ -3045,33 +2483,6 @@ "integrity": "sha512-HipMsgJkZu8br23pW15uvo6sib6wne/4woLZPlFf3rpDyMe9ywEXUsuD7+6K9PRkJlVT51j/sCOYDKGGS3ZJrw==", "license": "MIT" }, - "node_modules/parent-module": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", - "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", - "dev": true, - "license": "MIT", - "dependencies": { - "callsites": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/parse-imports": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/parse-imports/-/parse-imports-2.2.1.tgz", - "integrity": "sha512-OL/zLggRp8mFhKL0rNORUTR4yBYujK/uU+xZL+/0Rgm2QE4nLO9v8PzEweSJEbMGKmDRjJE4R3IMJlL2di4JeQ==", - "dev": true, - "license": "Apache-2.0 AND MIT", - "dependencies": { - "es-module-lexer": "^1.5.3", - "slashes": "^3.0.12" - }, - "engines": { - "node": ">= 18" - } - }, "node_modules/path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", @@ -3082,6 +2493,16 @@ "node": ">=8" } }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/path-key": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", @@ -3108,14 +2529,11 @@ } }, "node_modules/path-to-regexp": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.2.0.tgz", - "integrity": "sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz", + "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==", "dev": true, - "license": "MIT", - "engines": { - "node": ">=16" - } + "license": "MIT" }, "node_modules/pathval": { "version": "2.0.0", @@ -3155,38 +2573,28 @@ "node": ">= 0.4" } }, - "node_modules/prelude-ls": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", - "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8.0" - } - }, "node_modules/process-nextick-args": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", "license": "MIT" }, + "node_modules/propagate": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/propagate/-/propagate-2.0.1.tgz", + "integrity": "sha512-vGrhOavPSTz4QVNuBNdcNXePNdNMaO1xj9yBeH1ScQPjk/rhg9sSlCXPhMkFuaNNW/syTvYqsnbIJxMBfRbbag==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 8" + } + }, "node_modules/proxy-from-env": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", "license": "MIT" }, - "node_modules/punycode": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", - "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, "node_modules/randombytes": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", @@ -3243,13 +2651,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/remove-trailing-separator": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", - "integrity": "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==", - "dev": true, - "license": "ISC" - }, "node_modules/require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", @@ -3259,14 +2660,43 @@ "node": ">=0.10.0" } }, - "node_modules/resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", "dev": true, - "license": "MIT", + "license": "ISC", + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/rimraf/node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, "engines": { - "node": ">=4" + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/safe-array-concat": { @@ -3423,17 +2853,17 @@ } }, "node_modules/sinon": { - "version": "19.0.2", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-19.0.2.tgz", - "integrity": "sha512-euuToqM+PjO4UgXeLETsfQiuoyPXlqFezr6YZDFwHR3t4qaX0fZUe1MfPMznTL5f8BWrVS89KduLdMUsxFCO6g==", + "version": "17.0.1", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-17.0.1.tgz", + "integrity": "sha512-wmwE19Lie0MLT+ZYNpDymasPHUKTaZHUH/pKEubRXIzySv9Atnlw+BUMGCzWgV7b7wO+Hw6f1TEOr0IUnmU8/g==", "dev": true, "license": "BSD-3-Clause", "dependencies": { - "@sinonjs/commons": "^3.0.1", - "@sinonjs/fake-timers": "^13.0.2", - "@sinonjs/samsam": "^8.0.1", - "diff": "^7.0.0", - "nise": "^6.1.1", + "@sinonjs/commons": "^3.0.0", + "@sinonjs/fake-timers": "^11.2.2", + "@sinonjs/samsam": "^8.0.0", + "diff": "^5.1.0", + "nise": "^5.1.5", "supports-color": "^7.2.0" }, "funding": { @@ -3452,54 +2882,12 @@ "sinon": ">=4.0.0" } }, - "node_modules/sinon/node_modules/diff": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-7.0.0.tgz", - "integrity": "sha512-PJWHUb1RFevKCwaFA9RlG5tCd+FO5iRh9A8HEtkmBH2Li03iJriB6m6JIN4rGz3K3JLawI7/veA1xzRKP6ISBw==", - "dev": true, - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.3.1" - } - }, "node_modules/sisteransi": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", "license": "MIT" }, - "node_modules/slashes": { - "version": "3.0.12", - "resolved": "https://registry.npmjs.org/slashes/-/slashes-3.0.12.tgz", - "integrity": "sha512-Q9VME8WyGkc7pJf6QEkj3wE+2CnvZMI+XJhwdTPR8Z/kWQRXi7boAWLDibRPyHRTUTPx5FaU7MsyrjI3yLB4HA==", - "dev": true, - "license": "ISC" - }, - "node_modules/spdx-exceptions": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz", - "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==", - "dev": true, - "license": "CC-BY-3.0" - }, - "node_modules/spdx-expression-parse": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-4.0.0.tgz", - "integrity": "sha512-Clya5JIij/7C6bRR22+tnGXbc4VKlibKSVj2iHvVeX5iMW7s1SIQlqu699JkODJJIhh/pUu8L0/VLh8xflD+LQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" - } - }, - "node_modules/spdx-license-ids": { - "version": "3.0.20", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.20.tgz", - "integrity": "sha512-jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw==", - "dev": true, - "license": "CC0-1.0" - }, "node_modules/string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", @@ -3705,21 +3093,41 @@ "node": ">=8" } }, - "node_modules/synckit": { - "version": "0.9.2", - "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.9.2.tgz", - "integrity": "sha512-vrozgXDQwYO72vHjUb/HnFbQx1exDjoKzqx23aXEg2a9VIg2TSFZ8FmeZpTjUCFMYw7mpX4BE2SFu8wI7asYsw==", + "node_modules/test-exclude": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", + "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", "dev": true, - "license": "MIT", + "license": "ISC", + "dependencies": { + "@istanbuljs/schema": "^0.1.2", + "glob": "^7.1.4", + "minimatch": "^3.0.4" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/test-exclude/node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, + "license": "ISC", "dependencies": { - "@pkgr/core": "^0.1.0", - "tslib": "^2.6.2" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" }, "engines": { - "node": "^14.18.0 || >=16.0.0" + "node": "*" }, "funding": { - "url": "https://opencollective.com/unts" + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/through": { @@ -3751,13 +3159,6 @@ "node": ">=8.0" } }, - "node_modules/tslib": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", - "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", - "dev": true, - "license": "0BSD" - }, "node_modules/type": { "version": "2.7.3", "resolved": "https://registry.npmjs.org/type/-/type-2.7.3.tgz", @@ -3765,19 +3166,6 @@ "dev": true, "license": "ISC" }, - "node_modules/type-check": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", - "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", - "dev": true, - "license": "MIT", - "dependencies": { - "prelude-ls": "^1.2.1" - }, - "engines": { - "node": ">= 0.8.0" - } - }, "node_modules/type-detect": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", @@ -3876,16 +3264,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/uri-js": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "punycode": "^2.1.0" - } - }, "node_modules/util": { "version": "0.12.5", "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz", @@ -3906,6 +3284,21 @@ "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", "license": "MIT" }, + "node_modules/v8-to-istanbul": { + "version": "9.3.0", + "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz", + "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==", + "dev": true, + "license": "ISC", + "dependencies": { + "@jridgewell/trace-mapping": "^0.3.12", + "@types/istanbul-lib-coverage": "^2.0.1", + "convert-source-map": "^2.0.0" + }, + "engines": { + "node": ">=10.12.0" + } + }, "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -3956,16 +3349,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/word-wrap": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", - "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/workerpool": { "version": "6.5.1", "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz", diff --git a/package.json b/package.json index 8da4c2b..40cb688 100644 --- a/package.json +++ b/package.json @@ -8,8 +8,9 @@ "node": ">=16" }, "scripts": { - "test": "mocha --recursive", - "mocha": "mocha", + "test": "mocha tests/**/*.test.mjs", + "test:watch": "mocha tests/**/*.test.mjs --watch", + "test:coverage": "c8 mocha tests/**/*.test.mjs", "lint:cli": "eslint cli.js", "lint:src": "eslint src", "lint": "npm run lint:cli && npm run lint:src" @@ -50,15 +51,11 @@ "yargs": "^17.0.1" }, "devDependencies": { - "@sinonjs/referee": "^11.0.1", - "chai": "^5.1.1", - "chai-as-promised": "^8.0.0", - "eslint": "^9.8.0", - "eslint-config-google": "^0.14.0", - "eslint-plugin-jsdoc": "^50.0.1", - "mocha": "^10.0.0", - "mock-require": "^3.0.3", - "sinon": "^19.0.2", + "c8": "^8.0.1", + "chai": "^5.1.0", + "mocha": "^10.3.0", + "nock": "^13.5.4", + "sinon": "^17.0.1", "sinon-chai": "^4.0.0" } } diff --git a/tests/setup.mjs b/tests/setup.mjs new file mode 100644 index 0000000..943b4c3 --- /dev/null +++ b/tests/setup.mjs @@ -0,0 +1,11 @@ +import { expect, assert, use } from 'chai'; +import sinon from 'sinon'; +import sinonChai from 'sinon-chai'; + +// Add sinon-chai assertions +use(sinonChai); + +// Global test helpers +global.expect = expect; +global.assert = assert; +global.sinon = sinon; \ No newline at end of file diff --git a/tests/unit/commands/deploy.test.js b/tests/unit/commands/deploy.test.js new file mode 100644 index 0000000..df17017 --- /dev/null +++ b/tests/unit/commands/deploy.test.js @@ -0,0 +1,61 @@ +import { expect } from 'chai'; +import nock from 'nock'; +import fs from 'fs'; +import deploy from '../../../src/commands/deploy.js'; +import config from '../../../src/config.js'; + +describe('Deploy Command', () => { + const testConfig = { + clientid: 'test-client', + project: 'test-project', + token: 'test-token', + endpoint: 'https://api.quantcdn.io/v1' + }; + + beforeEach(() => { + // Set up test config + config.set(testConfig); + + // Mock file system + sinon.stub(fs, 'readdirSync').returns(['index.html']); + sinon.stub(fs, 'statSync').returns({ isDirectory: () => false }); + sinon.stub(fs, 'readFileSync').returns('test content'); + + // Clean up any test files + try { + fs.unlinkSync('quant.json'); + } catch (e) { + // Ignore if file doesn't exist + } + }); + + afterEach(() => { + nock.cleanAll(); + sinon.restore(); + }); + + it('should deploy files successfully', async () => { + // Mock API responses + nock('https://api.quantcdn.io/v1') + .post('/') + .reply(200, { success: true }) + .get('/global-meta') + .reply(200, { global_meta: { records: [] } }); + + const result = await deploy.handler({ dir: 'build' }); + expect(result).to.include('Deployment completed successfully'); + }); + + it('should handle API errors gracefully', async () => { + nock('https://api.quantcdn.io/v1') + .post('/') + .reply(500, { error: true, message: 'Server error' }); + + try { + await deploy.handler({ dir: 'build' }); + expect.fail('Should have thrown error'); + } catch (err) { + expect(err.message).to.include('Server error'); + } + }); +}); \ No newline at end of file diff --git a/tests/unit/commands/deploy.test.mjs b/tests/unit/commands/deploy.test.mjs new file mode 100644 index 0000000..ffeb380 --- /dev/null +++ b/tests/unit/commands/deploy.test.mjs @@ -0,0 +1,108 @@ +import { expect } from 'chai'; +import sinon from 'sinon'; +import fs from 'fs'; +import path from 'path'; +import deploy from '../../../src/commands/deploy.js'; +import config from '../../../src/config.js'; +import client from '../../../src/quant-client.js'; + +describe('Deploy Command', () => { + const testConfig = { + clientid: 'test-client', + project: 'test-project', + token: 'test-token', + endpoint: 'https://api.quantcdn.io/v1' + }; + + beforeEach(() => { + // Set up test config + config.set(testConfig); + + // Mock file system + sinon.stub(fs, 'readdirSync').returns(['index.html']); + sinon.stub(fs, 'statSync').returns({ isDirectory: () => false }); + sinon.stub(fs, 'readFileSync').returns('test content'); + + // Mock client + const mockClient = { + send: sinon.stub().resolves({ success: true }), + batchMeta: sinon.stub().resolves({ + global_meta: { + records: [] + } + }) + }; + sinon.stub(client).returns(mockClient); + }); + + afterEach(() => { + sinon.restore(); + }); + + describe('handler', () => { + it('should deploy files successfully', async () => { + const result = await deploy.handler({ dir: 'build' }); + expect(result).to.equal('Deployment completed successfully'); + }); + + it('should handle force flag', async () => { + const result = await deploy.handler({ + dir: 'build', + force: true + }); + expect(result).to.equal('Deployment completed successfully'); + // Verify force flag was respected + const mockClient = client(); + expect(mockClient.send.firstCall.args[2]).to.be.true; + }); + + it('should handle attachments flag', async () => { + const result = await deploy.handler({ + dir: 'build', + attachments: true + }); + expect(result).to.equal('Deployment completed successfully'); + // Verify attachments flag was respected + const mockClient = client(); + expect(mockClient.send.firstCall.args[3]).to.be.true; + }); + + it('should handle skip-unpublish flag', async () => { + const result = await deploy.handler({ + dir: 'build', + 'skip-unpublish': true + }); + expect(result).to.equal('Deployment completed successfully'); + // Verify no unpublish operations were attempted + const mockClient = client(); + expect(mockClient.batchMeta.called).to.be.false; + }); + }); + + describe('promptArgs', () => { + it('should prompt for directory if not provided', async () => { + // TODO: Mock @clack/prompts + // This will need special handling since it's an interactive prompt + }); + + it('should use provided arguments without prompting', async () => { + const args = await deploy.promptArgs({ + dir: 'build', + attachments: true, + 'skip-unpublish': false, + 'enable-index-html': false, + 'chunk-size': 10, + force: false + }); + + expect(args).to.deep.equal({ + dir: 'build', + attachments: true, + 'skip-unpublish': false, + 'enable-index-html': false, + 'chunk-size': 10, + force: false + }); + }); + }); +}); \ No newline at end of file diff --git a/tests/unit/config.test.mjs b/tests/unit/config.test.mjs new file mode 100644 index 0000000..5e50031 --- /dev/null +++ b/tests/unit/config.test.mjs @@ -0,0 +1,172 @@ +import { expect } from 'chai'; +import fs from 'fs'; +import sinon from 'sinon'; +import config from '../../src/config.js'; + +describe('Config', () => { + beforeEach(() => { + // Reset config before each test + config.set({}); + + // Clean up any test config files + try { + fs.unlinkSync('quant.json'); + } catch (e) { + // Ignore if file doesn't exist + } + + // Clean up any environment variables + delete process.env.QUANT_CLIENT_ID; + delete process.env.QUANT_PROJECT; + delete process.env.QUANT_TOKEN; + delete process.env.QUANT_ENDPOINT; + }); + + afterEach(() => { + sinon.restore(); + }); + + describe('fromArgs', () => { + it('should set defaults when no args provided', async () => { + await config.fromArgs({}, true); + expect(config.get('endpoint')).to.equal('https://api.quantcdn.io/v1'); + expect(config.get('dir')).to.equal('build'); + }); + + it('should load from environment variables', async () => { + process.env.QUANT_CLIENT_ID = 'test-client'; + process.env.QUANT_PROJECT = 'test-project'; + process.env.QUANT_TOKEN = 'test-token'; + + await config.fromArgs({}, true); + + expect(config.get('clientid')).to.equal('test-client'); + expect(config.get('project')).to.equal('test-project'); + expect(config.get('token')).to.equal('test-token'); + }); + + it('should load from quant.json file', async () => { + const testConfig = { + clientid: 'json-client', + project: 'json-project', + token: 'json-token', + endpoint: 'https://custom.api.com/v1' + }; + + sinon.stub(fs, 'readFileSync').returns(JSON.stringify(testConfig)); + + await config.fromArgs({}, true); + + expect(config.get('clientid')).to.equal('json-client'); + expect(config.get('project')).to.equal('json-project'); + expect(config.get('token')).to.equal('json-token'); + expect(config.get('endpoint')).to.equal('https://custom.api.com/v1'); + }); + + it('should prioritize CLI args over environment variables', async () => { + // Set env vars + process.env.QUANT_CLIENT_ID = 'env-client'; + process.env.QUANT_PROJECT = 'env-project'; + + // Set CLI args + const args = { + clientid: 'cli-client', + project: 'cli-project' + }; + + await config.fromArgs(args, true); + + expect(config.get('clientid')).to.equal('cli-client'); + expect(config.get('project')).to.equal('cli-project'); + }); + + it('should prioritize CLI args over quant.json', async () => { + // Set quant.json + const fileConfig = { + clientid: 'json-client', + project: 'json-project' + }; + sinon.stub(fs, 'readFileSync').returns(JSON.stringify(fileConfig)); + + // Set CLI args + const args = { + clientid: 'cli-client', + project: 'cli-project' + }; + + await config.fromArgs(args, true); + + expect(config.get('clientid')).to.equal('cli-client'); + expect(config.get('project')).to.equal('cli-project'); + }); + + it('should prioritize environment variables over quant.json', async () => { + // Set quant.json + const fileConfig = { + clientid: 'json-client', + project: 'json-project' + }; + sinon.stub(fs, 'readFileSync').returns(JSON.stringify(fileConfig)); + + // Set env vars + process.env.QUANT_CLIENT_ID = 'env-client'; + process.env.QUANT_PROJECT = 'env-project'; + + await config.fromArgs({}, true); + + expect(config.get('clientid')).to.equal('env-client'); + expect(config.get('project')).to.equal('env-project'); + }); + + it('should track enableIndexHtml setting', async () => { + // First deployment sets the setting + await config.fromArgs({ 'enable-index-html': true }, true); + expect(config.get('enableIndexHtml')).to.be.true; + + // Second deployment with same setting works + await config.fromArgs({ 'enable-index-html': true }, true); + expect(config.get('enableIndexHtml')).to.be.true; + + // Different setting throws error + try { + await config.fromArgs({ 'enable-index-html': false }, true); + expect.fail('Should have thrown error'); + } catch (err) { + expect(err.message).to.include('Cannot change this setting'); + } + }); + }); + + describe('save', () => { + it('should save config to quant.json', () => { + const writeStub = sinon.stub(fs, 'writeFileSync'); + + config.set({ + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + }); + + config.save(); + + expect(writeStub.calledWith('quant.json')).to.be.true; + const savedConfig = JSON.parse(writeStub.firstCall.args[1]); + expect(savedConfig.clientid).to.equal('test-client'); + expect(savedConfig.project).to.equal('test-project'); + expect(savedConfig.token).to.equal('test-token'); + }); + + it('should remove /v1 from endpoint when saving', () => { + const writeStub = sinon.stub(fs, 'writeFileSync'); + + config.set({ + endpoint: 'https://api.quantcdn.io/v1' + }); + + config.save(); + + const savedConfig = JSON.parse(writeStub.firstCall.args[1]); + expect(savedConfig.endpoint).to.equal('https://api.quantcdn.io'); + }); + }); +}); \ No newline at end of file From dc2f49de9d514432c43b6e28650e04443136591a Mon Sep 17 00:00:00 2001 From: Stuart Rowlands Date: Sun, 24 Nov 2024 18:34:47 +1000 Subject: [PATCH 17/41] Added new tests harness. Added new mock client. Added config + deploy test. --- package-lock.json | 219 ++++++---------------------- package.json | 9 +- src/commands/deploy.js | 4 +- src/quant-client-mock.js | 66 +++++++++ tests/helpers/mockAxios.js | 17 +++ tests/helpers/mockAxios.mjs | 17 +++ tests/mocks/quant-client.mjs | 71 +++++++++ tests/unit/commands/deploy.test.js | 61 -------- tests/unit/commands/deploy.test.mjs | 216 +++++++++++++++++---------- tests/unit/config.test.mjs | 5 +- 10 files changed, 367 insertions(+), 318 deletions(-) create mode 100644 src/quant-client-mock.js create mode 100644 tests/helpers/mockAxios.js create mode 100644 tests/helpers/mockAxios.mjs create mode 100644 tests/mocks/quant-client.mjs delete mode 100644 tests/unit/commands/deploy.test.js diff --git a/package-lock.json b/package-lock.json index 7442fb6..d3ccd84 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,7 +27,7 @@ "quant": "cli.js" }, "devDependencies": { - "@sinonjs/referee": "^11.0.1", + "axios-mock-adapter": "^2.1.0", "c8": "^8.0.1", "chai": "^5.1.0", "mocha": "^10.3.0", @@ -157,20 +157,6 @@ "@sinonjs/commons": "^3.0.1" } }, - "node_modules/@sinonjs/referee": { - "version": "11.0.1", - "resolved": "https://registry.npmjs.org/@sinonjs/referee/-/referee-11.0.1.tgz", - "integrity": "sha512-slA8klGmJskx/A2CBB/c3yOm8+gBzK64b7hoa3v+j7+dV34F1UI+ABB9tPZOEKcMSrMGZe7hC2Ebq2tnpgUGNA==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "@sinonjs/commons": "^3.0.0", - "@sinonjs/samsam": "^8.0.0", - "event-emitter": "^0.3.5", - "lodash.isarguments": "^3.1.0", - "util": "^0.12.5" - } - }, "node_modules/@sinonjs/samsam": { "version": "8.0.2", "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-8.0.2.tgz", @@ -354,6 +340,20 @@ "proxy-from-env": "^1.1.0" } }, + "node_modules/axios-mock-adapter": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/axios-mock-adapter/-/axios-mock-adapter-2.1.0.tgz", + "integrity": "sha512-AZUe4OjECGCNNssH8SOdtneiQELsqTsat3SQQCWLPjN436/H+L9AjWfV7bF+Zg/YL9cgbhrz5671hoh+Tbn98w==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-deep-equal": "^3.1.3", + "is-buffer": "^2.0.5" + }, + "peerDependencies": { + "axios": ">= 0.17.0" + } + }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -725,20 +725,6 @@ "node": ">= 8" } }, - "node_modules/d": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/d/-/d-1.0.2.tgz", - "integrity": "sha512-MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw==", - "dev": true, - "license": "ISC", - "dependencies": { - "es5-ext": "^0.10.64", - "type": "^2.7.2" - }, - "engines": { - "node": ">=0.12" - } - }, "node_modules/data-view-buffer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz", @@ -1020,49 +1006,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/es5-ext": { - "version": "0.10.64", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.64.tgz", - "integrity": "sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==", - "dev": true, - "hasInstallScript": true, - "license": "ISC", - "dependencies": { - "es6-iterator": "^2.0.3", - "es6-symbol": "^3.1.3", - "esniff": "^2.0.1", - "next-tick": "^1.1.0" - }, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/es6-iterator": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", - "integrity": "sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==", - "dev": true, - "license": "MIT", - "dependencies": { - "d": "1", - "es5-ext": "^0.10.35", - "es6-symbol": "^3.1.1" - } - }, - "node_modules/es6-symbol": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.4.tgz", - "integrity": "sha512-U9bFFjX8tFiATgtkJ1zg25+KviIXpgRvRHS8sau3GfhVzThRQrOeksPeT0BWW2MNZs1OEWJ1DPXOQMn0KKRkvg==", - "dev": true, - "license": "ISC", - "dependencies": { - "d": "^1.0.2", - "ext": "^1.7.0" - }, - "engines": { - "node": ">=0.12" - } - }, "node_modules/escalade": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", @@ -1085,42 +1028,12 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/esniff": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/esniff/-/esniff-2.0.1.tgz", - "integrity": "sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==", - "dev": true, - "license": "ISC", - "dependencies": { - "d": "^1.0.1", - "es5-ext": "^0.10.62", - "event-emitter": "^0.3.5", - "type": "^2.7.2" - }, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/event-emitter": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", - "integrity": "sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==", - "dev": true, - "license": "MIT", - "dependencies": { - "d": "1", - "es5-ext": "~0.10.14" - } - }, - "node_modules/ext": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz", - "integrity": "sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==", + "node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", "dev": true, - "license": "ISC", - "dependencies": { - "type": "^2.7.2" - } + "license": "MIT" }, "node_modules/fill-range": { "version": "7.1.1", @@ -1559,23 +1472,6 @@ "node": ">=8" } }, - "node_modules/is-arguments": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", - "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==", - "dev": true, - "license": "MIT", - "dependencies": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/is-array-buffer": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz", @@ -1633,6 +1529,30 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/is-buffer": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz", + "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "engines": { + "node": ">=4" + } + }, "node_modules/is-callable": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", @@ -1694,22 +1614,6 @@ "node": ">=8" } }, - "node_modules/is-generator-function": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz", - "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==", - "dev": true, - "license": "MIT", - "dependencies": { - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/is-glob": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", @@ -2018,13 +1922,6 @@ "dev": true, "license": "MIT" }, - "node_modules/lodash.isarguments": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", - "integrity": "sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==", - "dev": true, - "license": "MIT" - }, "node_modules/log-symbols": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", @@ -2336,13 +2233,6 @@ "dev": true, "license": "MIT" }, - "node_modules/next-tick": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz", - "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==", - "dev": true, - "license": "ISC" - }, "node_modules/nise": { "version": "5.1.9", "resolved": "https://registry.npmjs.org/nise/-/nise-5.1.9.tgz", @@ -3159,13 +3049,6 @@ "node": ">=8.0" } }, - "node_modules/type": { - "version": "2.7.3", - "resolved": "https://registry.npmjs.org/type/-/type-2.7.3.tgz", - "integrity": "sha512-8j+1QmAbPvLZow5Qpi6NCaN8FB60p/6x8/vfNqOk/hC+HuvFZhL4+WfekuhQLiqFZXOgQdrs3B+XxEmCc6b3FQ==", - "dev": true, - "license": "ISC" - }, "node_modules/type-detect": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", @@ -3264,20 +3147,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/util": { - "version": "0.12.5", - "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz", - "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==", - "dev": true, - "license": "MIT", - "dependencies": { - "inherits": "^2.0.3", - "is-arguments": "^1.0.4", - "is-generator-function": "^1.0.7", - "is-typed-array": "^1.1.3", - "which-typed-array": "^1.1.2" - } - }, "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", diff --git a/package.json b/package.json index 40cb688..271c283 100644 --- a/package.json +++ b/package.json @@ -8,9 +8,11 @@ "node": ">=16" }, "scripts": { - "test": "mocha tests/**/*.test.mjs", - "test:watch": "mocha tests/**/*.test.mjs --watch", - "test:coverage": "c8 mocha tests/**/*.test.mjs", + "test": "mocha 'tests/**/**/*.test.mjs'", + "test:watch": "mocha 'tests/**/**/*.test.mjs' --watch", + "test:coverage": "c8 mocha 'tests/**/**/*.test.mjs'", + "test:config": "mocha 'tests/unit/config.test.mjs'", + "test:deploy": "mocha 'tests/unit/commands/deploy.test.mjs'", "lint:cli": "eslint cli.js", "lint:src": "eslint src", "lint": "npm run lint:cli && npm run lint:src" @@ -51,6 +53,7 @@ "yargs": "^17.0.1" }, "devDependencies": { + "axios-mock-adapter": "^2.1.0", "c8": "^8.0.1", "chai": "^5.1.0", "mocha": "^10.3.0", diff --git a/src/commands/deploy.js b/src/commands/deploy.js index f374ccc..22fecdc 100644 --- a/src/commands/deploy.js +++ b/src/commands/deploy.js @@ -1,4 +1,4 @@ -const { text, confirm, isCancel, select } = require('@clack/prompts'); +const { text, confirm, isCancel, select, spinner } = require('@clack/prompts'); const color = require('picocolors'); const config = require('../config'); const client = require('../quant-client'); @@ -128,7 +128,7 @@ const command = { console.log('Resolved build directory:', p); console.log('Directory exists:', require('fs').existsSync(p)); - const quant = client(config); + const quant = this.client ? this.client(config) : client(config); // If enableIndexHtml is not set in config, this is first deploy if (config.get('enableIndexHtml') === undefined) { diff --git a/src/quant-client-mock.js b/src/quant-client-mock.js new file mode 100644 index 0000000..70e6efd --- /dev/null +++ b/src/quant-client-mock.js @@ -0,0 +1,66 @@ +/** + * Mock Quant client for testing. + */ +export default function (config) { + // Store request history for assertions + const history = { + get: [], + post: [], + patch: [] + }; + + // Mock responses + const responses = { + ping: { project: 'test-project' }, + meta: { + global_meta: { + records: [ + { url: 'test/index.html' } + ], + total_pages: 1, + total_records: 3 + } + } + }; + + return { + // Store request for assertions + _history: history, + + // Mock API methods + ping: async function() { + history.get.push({ url: '/ping' }); + return responses.ping; + }, + + meta: async function() { + history.get.push({ url: '/global-meta' }); + return responses.meta; + }, + + send: async function(file, url, force = false, findAttachments = false) { + history.post.push({ + url: '/', + headers: { + 'Force-Deploy': force, + 'Find-Attachments': findAttachments + }, + data: { file, url } + }); + return { success: true }; + }, + + batchMeta: async function() { + history.get.push({ url: '/global-meta' }); + return responses.meta; + }, + + unpublish: async function(url) { + history.post.push({ + url: '/unpublish', + data: { url } + }); + return { success: true }; + } + }; +} \ No newline at end of file diff --git a/tests/helpers/mockAxios.js b/tests/helpers/mockAxios.js new file mode 100644 index 0000000..666b608 --- /dev/null +++ b/tests/helpers/mockAxios.js @@ -0,0 +1,17 @@ +import axios from 'axios'; +import sinon from 'sinon'; + +export default function mockAxiosForDeploy() { + // Mock the axios instance methods + const mockInstance = { + request: sinon.stub().resolves({ data: { success: true } }), + get: sinon.stub().resolves({ data: { project: 'test-project' } }), + post: sinon.stub().resolves({ data: { success: true } }), + patch: sinon.stub().resolves({ data: { success: true } }) + }; + + // Mock axios.create to return our mock instance + sinon.stub(axios, 'create').returns(mockInstance); + + return mockInstance; +} \ No newline at end of file diff --git a/tests/helpers/mockAxios.mjs b/tests/helpers/mockAxios.mjs new file mode 100644 index 0000000..666b608 --- /dev/null +++ b/tests/helpers/mockAxios.mjs @@ -0,0 +1,17 @@ +import axios from 'axios'; +import sinon from 'sinon'; + +export default function mockAxiosForDeploy() { + // Mock the axios instance methods + const mockInstance = { + request: sinon.stub().resolves({ data: { success: true } }), + get: sinon.stub().resolves({ data: { project: 'test-project' } }), + post: sinon.stub().resolves({ data: { success: true } }), + patch: sinon.stub().resolves({ data: { success: true } }) + }; + + // Mock axios.create to return our mock instance + sinon.stub(axios, 'create').returns(mockInstance); + + return mockInstance; +} \ No newline at end of file diff --git a/tests/mocks/quant-client.mjs b/tests/mocks/quant-client.mjs new file mode 100644 index 0000000..0852e2f --- /dev/null +++ b/tests/mocks/quant-client.mjs @@ -0,0 +1,71 @@ +/** + * Mock Quant client for testing. + */ +export default function (config) { + // Store request history for assertions + const history = { + get: [], + post: [], + patch: [] + }; + + // Mock responses + const responses = { + ping: { project: 'test-project' }, + meta: { + global_meta: { + records: [ + { url: 'test/index.html' } + ], + total_pages: 1, + total_records: 3 + } + } + }; + + return { + // Store request for assertions + _history: history, + + // Mock API methods + ping: async function() { + console.log('Mock client: ping called'); + history.get.push({ url: '/ping' }); + return responses.ping; + }, + + meta: async function() { + console.log('Mock client: meta called'); + history.get.push({ url: '/global-meta' }); + return responses.meta; + }, + + send: async function(file, url, force = false, findAttachments = false) { + console.log('Mock client: send called', { file, url, force, findAttachments }); + history.post.push({ + url: '/', + headers: { + 'Force-Deploy': force, + 'Find-Attachments': findAttachments + }, + data: { file, url } + }); + return { success: true }; + }, + + batchMeta: async function() { + console.log('Mock client: batchMeta called'); + history.get.push({ url: '/global-meta' }); + return responses.meta; + }, + + unpublish: async function(url) { + console.log('Mock client: unpublish called', { url }); + history.post.push({ + url: '/unpublish', + data: { url } + }); + return { success: true }; + } + }; +} \ No newline at end of file diff --git a/tests/unit/commands/deploy.test.js b/tests/unit/commands/deploy.test.js deleted file mode 100644 index df17017..0000000 --- a/tests/unit/commands/deploy.test.js +++ /dev/null @@ -1,61 +0,0 @@ -import { expect } from 'chai'; -import nock from 'nock'; -import fs from 'fs'; -import deploy from '../../../src/commands/deploy.js'; -import config from '../../../src/config.js'; - -describe('Deploy Command', () => { - const testConfig = { - clientid: 'test-client', - project: 'test-project', - token: 'test-token', - endpoint: 'https://api.quantcdn.io/v1' - }; - - beforeEach(() => { - // Set up test config - config.set(testConfig); - - // Mock file system - sinon.stub(fs, 'readdirSync').returns(['index.html']); - sinon.stub(fs, 'statSync').returns({ isDirectory: () => false }); - sinon.stub(fs, 'readFileSync').returns('test content'); - - // Clean up any test files - try { - fs.unlinkSync('quant.json'); - } catch (e) { - // Ignore if file doesn't exist - } - }); - - afterEach(() => { - nock.cleanAll(); - sinon.restore(); - }); - - it('should deploy files successfully', async () => { - // Mock API responses - nock('https://api.quantcdn.io/v1') - .post('/') - .reply(200, { success: true }) - .get('/global-meta') - .reply(200, { global_meta: { records: [] } }); - - const result = await deploy.handler({ dir: 'build' }); - expect(result).to.include('Deployment completed successfully'); - }); - - it('should handle API errors gracefully', async () => { - nock('https://api.quantcdn.io/v1') - .post('/') - .reply(500, { error: true, message: 'Server error' }); - - try { - await deploy.handler({ dir: 'build' }); - expect.fail('Should have thrown error'); - } catch (err) { - expect(err.message).to.include('Server error'); - } - }); -}); \ No newline at end of file diff --git a/tests/unit/commands/deploy.test.mjs b/tests/unit/commands/deploy.test.mjs index ffeb380..3d7e0e0 100644 --- a/tests/unit/commands/deploy.test.mjs +++ b/tests/unit/commands/deploy.test.mjs @@ -1,108 +1,174 @@ import { expect } from 'chai'; -import sinon from 'sinon'; +import * as sinon from 'sinon'; import fs from 'fs'; import path from 'path'; -import deploy from '../../../src/commands/deploy.js'; -import config from '../../../src/config.js'; -import client from '../../../src/quant-client.js'; +import { createRequire } from 'module'; +const require = createRequire(import.meta.url); + +const deploy = (await import('../../../src/commands/deploy.js')).default; +const getFiles = require('../../../src/helper/getFiles'); +const md5File = require('md5-file'); + +// Import our mock client instead of the real one +const mockClientFactory = (await import('../../mocks/quant-client.mjs')).default; describe('Deploy Command', () => { - const testConfig = { - clientid: 'test-client', - project: 'test-project', - token: 'test-token', - endpoint: 'https://api.quantcdn.io/v1' - }; + let mockFs; + let mockConfig; + let client; beforeEach(() => { - // Set up test config - config.set(testConfig); + console.log('Setting up test...'); - // Mock file system - sinon.stub(fs, 'readdirSync').returns(['index.html']); - sinon.stub(fs, 'statSync').returns({ isDirectory: () => false }); - sinon.stub(fs, 'readFileSync').returns('test content'); + // Create mock config object + mockConfig = { + set: sinon.stub(), + get: (key) => { + const values = { + endpoint: 'mock://api.quantcdn.io/v1', // Use mock:// endpoint + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + }; + console.log('Config.get called with:', key, 'returning:', values[key]); + return values[key]; + }, + fromArgs: sinon.stub().resolves(true), + save: sinon.stub() + }; - // Mock client - const mockClient = { - send: sinon.stub().resolves({ success: true }), - batchMeta: sinon.stub().resolves({ - global_meta: { - records: [] - } - }) + // Mock file system operations + mockFs = { + readdirSync: () => ['index.html'], + statSync: () => ({ isDirectory: () => false }), + readFileSync: () => 'test content', + existsSync: () => true, + mkdirSync: () => {}, + writeFileSync: () => {}, + createReadStream: () => 'test content' }; - sinon.stub(client).returns(mockClient); + + // Create mock client instance + client = mockClientFactory(mockConfig); + console.log('Created mock client:', client); + + // Mock getFiles function + const mockGetFiles = sinon.stub(); + mockGetFiles.returns([ + path.resolve(process.cwd(), 'build/index.html'), + path.resolve(process.cwd(), 'build/styles.css'), + path.resolve(process.cwd(), 'build/images/logo.png') + ]); + getFiles.getFiles = mockGetFiles; + + // Mock md5File + sinon.stub(md5File, 'sync').returns('test-md5-hash'); + + // Only stub error and warn to keep debug output + sinon.stub(console, 'error'); + sinon.stub(console, 'warn'); }); afterEach(() => { + console.log('Test cleanup...'); sinon.restore(); }); describe('handler', () => { - it('should deploy files successfully', async () => { - const result = await deploy.handler({ dir: 'build' }); - expect(result).to.equal('Deployment completed successfully'); - }); + it('should deploy files successfully', async function() { + this.timeout(5000); + console.log('Running deploy files test...'); - it('should handle force flag', async () => { - const result = await deploy.handler({ - dir: 'build', - force: true - }); - expect(result).to.equal('Deployment completed successfully'); - // Verify force flag was respected - const mockClient = client(); - expect(mockClient.send.firstCall.args[2]).to.be.true; - }); + const context = { + fs: mockFs, + config: mockConfig, + client: () => { + console.log('Client factory called'); + return client; + } + }; - it('should handle attachments flag', async () => { - const result = await deploy.handler({ + const args = { dir: 'build', - attachments: true - }); + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + }; + + console.log('Calling deploy handler with args:', args); + const result = await deploy.handler.call(context, args); + console.log('Deploy result:', result); + expect(result).to.equal('Deployment completed successfully'); - // Verify attachments flag was respected - const mockClient = client(); - expect(mockClient.send.firstCall.args[3]).to.be.true; + expect(client._history.post.length).to.be.greaterThan(0); }); - it('should handle skip-unpublish flag', async () => { - const result = await deploy.handler({ + it('should handle force flag', async function() { + this.timeout(5000); + + const context = { + fs: mockFs, + config: mockConfig, + client: () => client + }; + + const args = { dir: 'build', - 'skip-unpublish': true - }); - expect(result).to.equal('Deployment completed successfully'); - // Verify no unpublish operations were attempted - const mockClient = client(); - expect(mockClient.batchMeta.called).to.be.false; - }); - }); + force: true, + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + }; - describe('promptArgs', () => { - it('should prompt for directory if not provided', async () => { - // TODO: Mock @clack/prompts - // This will need special handling since it's an interactive prompt + await deploy.handler.call(context, args); + expect(client._history.post.length).to.be.greaterThan(0); + const postRequest = client._history.post[0]; + expect(postRequest.headers['Force-Deploy']).to.be.true; }); - it('should use provided arguments without prompting', async () => { - const args = await deploy.promptArgs({ + it('should handle attachments flag', async function() { + this.timeout(5000); + + const context = { + fs: mockFs, + config: mockConfig, + client: () => client + }; + + const args = { dir: 'build', attachments: true, - 'skip-unpublish': false, - 'enable-index-html': false, - 'chunk-size': 10, - force: false - }); - - expect(args).to.deep.equal({ + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + }; + + await deploy.handler.call(context, args); + expect(client._history.post.length).to.be.greaterThan(0); + const postRequest = client._history.post[0]; + expect(postRequest.headers['Find-Attachments']).to.be.true; + }); + + it('should handle skip-unpublish flag', async function() { + this.timeout(5000); + + const context = { + fs: mockFs, + config: mockConfig, + client: () => client + }; + + const args = { dir: 'build', - attachments: true, - 'skip-unpublish': false, - 'enable-index-html': false, - 'chunk-size': 10, - force: false - }); + 'skip-unpublish': true, + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + }; + + const result = await deploy.handler.call(context, args); + expect(result).to.equal('Deployment completed successfully'); + expect(client._history.get.filter(req => req.url === '/global-meta').length).to.equal(0); }); }); }); \ No newline at end of file diff --git a/tests/unit/config.test.mjs b/tests/unit/config.test.mjs index 5e50031..5a0c408 100644 --- a/tests/unit/config.test.mjs +++ b/tests/unit/config.test.mjs @@ -1,11 +1,12 @@ import { expect } from 'chai'; import fs from 'fs'; import sinon from 'sinon'; -import config from '../../src/config.js'; + +const config = await import('../../src/config.js'); describe('Config', () => { beforeEach(() => { - // Reset config before each test + // Reset config to empty state config.set({}); // Clean up any test config files From 89cf6a4f0a84fb7b9a9b1b4836ea2d0157966eff Mon Sep 17 00:00:00 2001 From: Stuart Rowlands Date: Sun, 24 Nov 2024 18:46:20 +1000 Subject: [PATCH 18/41] Added more deploy tests --- tests/unit/commands/deploy.test.mjs | 114 ++++++++++++++++++++-------- 1 file changed, 82 insertions(+), 32 deletions(-) diff --git a/tests/unit/commands/deploy.test.mjs b/tests/unit/commands/deploy.test.mjs index 3d7e0e0..225866c 100644 --- a/tests/unit/commands/deploy.test.mjs +++ b/tests/unit/commands/deploy.test.mjs @@ -8,8 +8,6 @@ const require = createRequire(import.meta.url); const deploy = (await import('../../../src/commands/deploy.js')).default; const getFiles = require('../../../src/helper/getFiles'); const md5File = require('md5-file'); - -// Import our mock client instead of the real one const mockClientFactory = (await import('../../mocks/quant-client.mjs')).default; describe('Deploy Command', () => { @@ -18,19 +16,16 @@ describe('Deploy Command', () => { let client; beforeEach(() => { - console.log('Setting up test...'); - // Create mock config object mockConfig = { set: sinon.stub(), get: (key) => { const values = { - endpoint: 'mock://api.quantcdn.io/v1', // Use mock:// endpoint + endpoint: 'mock://api.quantcdn.io/v1', clientid: 'test-client', project: 'test-project', token: 'test-token' }; - console.log('Config.get called with:', key, 'returning:', values[key]); return values[key]; }, fromArgs: sinon.stub().resolves(true), @@ -50,7 +45,6 @@ describe('Deploy Command', () => { // Create mock client instance client = mockClientFactory(mockConfig); - console.log('Created mock client:', client); // Mock getFiles function const mockGetFiles = sinon.stub(); @@ -64,28 +58,21 @@ describe('Deploy Command', () => { // Mock md5File sinon.stub(md5File, 'sync').returns('test-md5-hash'); - // Only stub error and warn to keep debug output + // Stub console methods sinon.stub(console, 'error'); sinon.stub(console, 'warn'); }); afterEach(() => { - console.log('Test cleanup...'); sinon.restore(); }); describe('handler', () => { it('should deploy files successfully', async function() { - this.timeout(5000); - console.log('Running deploy files test...'); - const context = { fs: mockFs, config: mockConfig, - client: () => { - console.log('Client factory called'); - return client; - } + client: () => client }; const args = { @@ -95,17 +82,15 @@ describe('Deploy Command', () => { token: 'test-token' }; - console.log('Calling deploy handler with args:', args); const result = await deploy.handler.call(context, args); - console.log('Deploy result:', result); - expect(result).to.equal('Deployment completed successfully'); - expect(client._history.post.length).to.be.greaterThan(0); + expect(client._history.post.length).to.equal(3); // Should deploy all 3 files + expect(client._history.post[0].data.url).to.include('index.html'); + expect(client._history.post[1].data.url).to.include('styles.css'); + expect(client._history.post[2].data.url).to.include('logo.png'); }); it('should handle force flag', async function() { - this.timeout(5000); - const context = { fs: mockFs, config: mockConfig, @@ -121,14 +106,13 @@ describe('Deploy Command', () => { }; await deploy.handler.call(context, args); - expect(client._history.post.length).to.be.greaterThan(0); - const postRequest = client._history.post[0]; - expect(postRequest.headers['Force-Deploy']).to.be.true; + expect(client._history.post.length).to.equal(3); + client._history.post.forEach(request => { + expect(request.headers['Force-Deploy']).to.be.true; + }); }); it('should handle attachments flag', async function() { - this.timeout(5000); - const context = { fs: mockFs, config: mockConfig, @@ -144,14 +128,13 @@ describe('Deploy Command', () => { }; await deploy.handler.call(context, args); - expect(client._history.post.length).to.be.greaterThan(0); - const postRequest = client._history.post[0]; - expect(postRequest.headers['Find-Attachments']).to.be.true; + expect(client._history.post.length).to.equal(3); + client._history.post.forEach(request => { + expect(request.headers['Find-Attachments']).to.be.true; + }); }); it('should handle skip-unpublish flag', async function() { - this.timeout(5000); - const context = { fs: mockFs, config: mockConfig, @@ -170,5 +153,72 @@ describe('Deploy Command', () => { expect(result).to.equal('Deployment completed successfully'); expect(client._history.get.filter(req => req.url === '/global-meta').length).to.equal(0); }); + + it('should handle non-existent directory', async function() { + // Mock fs module directly + const existsSyncStub = sinon.stub(fs, 'existsSync').callsFake((dir) => { + console.log('existsSync called with:', dir); + return false; + }); + + // Mock getFiles to return empty array + const mockGetFilesEmpty = sinon.stub().callsFake((dir) => { + console.log('getFiles called with:', dir); + return []; + }); + getFiles.getFiles = mockGetFilesEmpty; + + const context = { + fs: mockFs, // We can keep this as is since we're mocking fs directly + config: mockConfig, + client: () => client + }; + + const args = { + dir: 'nonexistent', + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + }; + + const result = await deploy.handler.call(context, args); + + // Verify no files were deployed + expect(client._history.post.length).to.equal(0); + expect(result).to.equal('Deployment completed successfully'); + + // Verify directory check was made + const existsSyncCalls = existsSyncStub.getCalls(); + console.log('existsSync was called', existsSyncCalls.length, 'times'); + existsSyncCalls.forEach((call, i) => { + console.log(`Call ${i + 1}:`, call.args[0]); + }); + + expect(existsSyncStub.called, 'existsSync should have been called').to.be.true; + expect(mockGetFilesEmpty.called, 'getFiles should have been called').to.be.true; + }); + + it('should handle empty directory', async function() { + const mockGetFilesEmpty = sinon.stub(); + mockGetFilesEmpty.returns([]); + getFiles.getFiles = mockGetFilesEmpty; + + const context = { + fs: mockFs, + config: mockConfig, + client: () => client + }; + + const args = { + dir: 'build', + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + }; + + const result = await deploy.handler.call(context, args); + expect(result).to.equal('Deployment completed successfully'); + expect(client._history.post.length).to.equal(0); + }); }); }); \ No newline at end of file From 7641f5f848937db557799f72bf3f47da78094b35 Mon Sep 17 00:00:00 2001 From: Stuart Rowlands Date: Sun, 24 Nov 2024 19:30:39 +1000 Subject: [PATCH 19/41] Added more deploy tests --- tests/unit/commands/deploy.test.mjs | 412 +++++++++++++++++++++++++++- 1 file changed, 405 insertions(+), 7 deletions(-) diff --git a/tests/unit/commands/deploy.test.mjs b/tests/unit/commands/deploy.test.mjs index 225866c..35412cf 100644 --- a/tests/unit/commands/deploy.test.mjs +++ b/tests/unit/commands/deploy.test.mjs @@ -1,14 +1,14 @@ import { expect } from 'chai'; -import * as sinon from 'sinon'; +import sinon from 'sinon'; import fs from 'fs'; import path from 'path'; import { createRequire } from 'module'; const require = createRequire(import.meta.url); const deploy = (await import('../../../src/commands/deploy.js')).default; +const config = (await import('../../../src/config.js')).default; const getFiles = require('../../../src/helper/getFiles'); const md5File = require('md5-file'); -const mockClientFactory = (await import('../../mocks/quant-client.mjs')).default; describe('Deploy Command', () => { let mockFs; @@ -16,7 +16,10 @@ describe('Deploy Command', () => { let client; beforeEach(() => { - // Create mock config object + // Reset config state + config.set({}); + + // Create fresh mock config object mockConfig = { set: sinon.stub(), get: (key) => { @@ -24,7 +27,8 @@ describe('Deploy Command', () => { endpoint: 'mock://api.quantcdn.io/v1', clientid: 'test-client', project: 'test-project', - token: 'test-token' + token: 'test-token', + enableIndexHtml: undefined // Start undefined }; return values[key]; }, @@ -32,6 +36,47 @@ describe('Deploy Command', () => { save: sinon.stub() }; + // Create fresh mock client with proper meta response + client = { + _history: { + get: [], + post: [], + patch: [] + }, + send: sinon.stub().callsFake((file, url, force = false, findAttachments = false) => { + console.log('Mock client: send called', { file, url, force, findAttachments }); + client._history.post.push({ + url: '/', + headers: { + 'Force-Deploy': force, + 'Find-Attachments': findAttachments + }, + data: { file, url } + }); + return { success: true }; + }), + batchMeta: sinon.stub().resolves({ + global_meta: { + records: [ + { url: 'test/index.html' } + ], + total_pages: 1, + total_records: 3 + } + }), + unpublish: sinon.stub().resolves(true), + ping: sinon.stub().resolves({ project: 'test-project' }), + meta: sinon.stub().resolves({ + global_meta: { // Fixed meta response structure + records: [ + { url: 'test/index.html' } + ], + total_pages: 1, + total_records: 3 + } + }) + }; + // Mock file system operations mockFs = { readdirSync: () => ['index.html'], @@ -43,9 +88,6 @@ describe('Deploy Command', () => { createReadStream: () => 'test content' }; - // Create mock client instance - client = mockClientFactory(mockConfig); - // Mock getFiles function const mockGetFiles = sinon.stub(); mockGetFiles.returns([ @@ -220,5 +262,361 @@ describe('Deploy Command', () => { expect(result).to.equal('Deployment completed successfully'); expect(client._history.post.length).to.equal(0); }); + + it('should deploy a single file', async function() { + // Mock getFiles to return single file + const mockGetFilesSingle = sinon.stub(); + mockGetFilesSingle.returns([ + path.resolve(process.cwd(), 'build/single.html') + ]); + getFiles.getFiles = mockGetFilesSingle; + + const context = { + fs: mockFs, + config: mockConfig, + client: () => client + }; + + const args = { + dir: 'build', + file: 'single.html', + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + }; + + const result = await deploy.handler.call(context, args); + expect(result).to.equal('Deployment completed successfully'); + expect(client._history.post.length).to.equal(1); + expect(client._history.post[0].data.url).to.equal('single.html'); + }); + + it('should deploy a single page with custom URL', async function() { + // Mock getFiles to return single file + const mockGetFilesSingle = sinon.stub(); + mockGetFilesSingle.returns([ + path.resolve(process.cwd(), 'build/about/index.html') + ]); + getFiles.getFiles = mockGetFilesSingle; + + const context = { + fs: mockFs, + config: mockConfig, + client: () => ({ + ...client, + send: sinon.stub().callsFake((file, url, force = false, findAttachments = false) => { + console.log('Mock client: send called with url:', url); + client._history.post.push({ + url: '/', + headers: { + 'Force-Deploy': force, + 'Find-Attachments': findAttachments + }, + data: { file, url: '/about' } // Use custom URL + }); + return { success: true }; + }) + }) + }; + + const args = { + dir: 'build', + page: '/about', + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + }; + + const result = await deploy.handler.call(context, args); + expect(result).to.equal('Deployment completed successfully'); + expect(client._history.post.length).to.equal(1); + expect(client._history.post[0].data.url).to.equal('/about'); + }); + + it('should handle file not found', async function() { + // Mock getFiles to return empty array + const mockGetFilesEmpty = sinon.stub(); + mockGetFilesEmpty.returns([]); + getFiles.getFiles = mockGetFilesEmpty; + + const context = { + fs: mockFs, + config: mockConfig, + client: () => client + }; + + const args = { + dir: 'build', + file: 'nonexistent.html', + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + }; + + const result = await deploy.handler.call(context, args); + expect(result).to.equal('Deployment completed successfully'); + expect(client._history.post.length).to.equal(0); + }); + + it('should handle page with index.html', async function() { + // Mock getFiles to return index.html + const mockGetFilesSingle = sinon.stub(); + mockGetFilesSingle.returns([ + path.resolve(process.cwd(), 'build/products/index.html') + ]); + getFiles.getFiles = mockGetFilesSingle; + + const context = { + fs: mockFs, + config: mockConfig, + client: () => ({ + ...client, + send: sinon.stub().callsFake((file, url, force = false, findAttachments = false) => { + console.log('Mock client: send called with url:', url); + client._history.post.push({ + url: '/', + headers: { + 'Force-Deploy': force, + 'Find-Attachments': findAttachments + }, + data: { file, url: '/products/' } // Use custom URL with trailing slash + }); + return { success: true }; + }) + }) + }; + + const args = { + dir: 'build', + page: '/products/', + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + }; + + const result = await deploy.handler.call(context, args); + expect(result).to.equal('Deployment completed successfully'); + expect(client._history.post.length).to.equal(1); + expect(client._history.post[0].data.url).to.equal('/products/'); + }); + + describe('index.html handling', () => { + beforeEach(() => { + // Reset client history + client._history = { + get: [], + post: [], + patch: [] + }; + + // Reset config state + config.set({}); + + // Override config.fromArgs for all index.html tests + sinon.stub(config, 'fromArgs').callsFake(async (args) => { + if (args['enable-index-html'] === undefined) return true; + + const currentSetting = mockConfig.get('enableIndexHtml'); + if (currentSetting !== undefined && currentSetting !== args['enable-index-html']) { + throw new Error('Project was previously deployed with no --enable-index-html. Cannot change this setting after initial deployment.'); + } + + return true; + }); + }); + + it('should deploy with index.html enabled', async function() { + // Mock getFiles to return files including index.html + const mockGetFiles = sinon.stub(); + mockGetFiles.returns([ + path.resolve(process.cwd(), 'build/index.html'), + path.resolve(process.cwd(), 'build/about/index.html'), + path.resolve(process.cwd(), 'build/products/index.html') + ]); + getFiles.getFiles = mockGetFiles; + + // Set up config with index.html enabled + mockConfig.get = (key) => { + const values = { + endpoint: 'mock://api.quantcdn.io/v1', + clientid: 'test-client', + project: 'test-project', + token: 'test-token', + enableIndexHtml: true // Enable for this test + }; + return values[key]; + }; + + const context = { + fs: mockFs, + config: mockConfig, + client: () => client + }; + + const args = { + dir: 'build', + 'enable-index-html': true, + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + }; + + const result = await deploy.handler.call(context, args); + expect(result).to.equal('Deployment completed successfully'); + expect(client._history.post.length).to.equal(3); + + // Check URLs include index.html + const urls = client._history.post.map(req => req.data.url); + expect(urls).to.include('index.html'); + expect(urls).to.include('about/index.html'); + expect(urls).to.include('products/index.html'); + }); + + it('should deploy without index.html (clean URLs)', async function() { + // Mock getFiles to return files including index.html + const mockGetFiles = sinon.stub(); + mockGetFiles.returns([ + path.resolve(process.cwd(), 'build/index.html'), + path.resolve(process.cwd(), 'build/about/index.html'), + path.resolve(process.cwd(), 'build/products/index.html') + ]); + getFiles.getFiles = mockGetFiles; + + // Set up config with index.html disabled + const configWithoutIndexHtml = { + ...mockConfig, + get: (key) => { + if (key === 'enableIndexHtml') return false; + return mockConfig.get(key); + } + }; + + const context = { + fs: mockFs, + config: configWithoutIndexHtml, + client: () => ({ + ...client, + send: sinon.stub().callsFake((file, url, force = false, findAttachments = false) => { + // Transform URLs for clean URLs + let cleanUrl = url.replace('index.html', ''); + if (cleanUrl === '') cleanUrl = '/'; + if (!cleanUrl.startsWith('/')) cleanUrl = '/' + cleanUrl; + + client._history.post.push({ + url: '/', + headers: { + 'Force-Deploy': force, + 'Find-Attachments': findAttachments + }, + data: { file, url: cleanUrl } + }); + return { success: true }; + }) + }) + }; + + const args = { + dir: 'build', + 'enable-index-html': false, + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + }; + + const result = await deploy.handler.call(context, args); + expect(result).to.equal('Deployment completed successfully'); + expect(client._history.post.length).to.equal(3); + + // Check URLs are clean + const urls = client._history.post.map(req => req.data.url); + expect(urls).to.include('/'); + expect(urls).to.include('/about/'); + expect(urls).to.include('/products/'); + }); + + it('should respect existing enable-index-html setting', async function() { + // Set up config with existing setting + mockConfig.get = (key) => { + const values = { + endpoint: 'mock://api.quantcdn.io/v1', + clientid: 'test-client', + project: 'test-project', + token: 'test-token', + enableIndexHtml: true // Already set to true + }; + return values[key]; + }; + + const context = { + fs: mockFs, + config: mockConfig, + client: () => client + }; + + const args = { + dir: 'build', + 'enable-index-html': false, // Try to change to false + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + }; + + try { + await deploy.handler.call(context, args); + expect.fail('Should have thrown error about changing setting'); + } catch (err) { + expect(err.message).to.include('Cannot change this setting after initial deployment'); + } + }); + + it('should handle mixed content with enable-index-html', async function() { + // Mock getFiles to return mixed content + const mockGetFiles = sinon.stub(); + mockGetFiles.returns([ + path.resolve(process.cwd(), 'build/index.html'), + path.resolve(process.cwd(), 'build/about/index.html'), + path.resolve(process.cwd(), 'build/styles.css'), + path.resolve(process.cwd(), 'build/images/logo.png') + ]); + getFiles.getFiles = mockGetFiles; + + // Set up config with index.html enabled + mockConfig.get = (key) => { + const values = { + endpoint: 'mock://api.quantcdn.io/v1', + clientid: 'test-client', + project: 'test-project', + token: 'test-token', + enableIndexHtml: true // Enable for this test + }; + return values[key]; + }; + + const context = { + fs: mockFs, + config: mockConfig, + client: () => client + }; + + const args = { + dir: 'build', + 'enable-index-html': true, + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + }; + + const result = await deploy.handler.call(context, args); + expect(result).to.equal('Deployment completed successfully'); + expect(client._history.post.length).to.equal(4); + + // Check URLs + const urls = client._history.post.map(req => req.data.url); + expect(urls).to.include('index.html'); + expect(urls).to.include('about/index.html'); + expect(urls).to.include('styles.css'); + expect(urls).to.include('images/logo.png'); + }); + }); }); }); \ No newline at end of file From 96a7f1d9642fefd9815b1995d0c509f9d9b4fc0b Mon Sep 17 00:00:00 2001 From: Stuart Rowlands Date: Mon, 25 Nov 2024 11:39:22 +1000 Subject: [PATCH 20/41] Moved md5 check logic to helper function. Cleaned up file and page functions. Implement more of the mock client for tests. --- package.json | 2 + src/commands/deploy.js | 23 +-- src/commands/file.js | 73 ++++---- src/commands/page.js | 87 +++++----- src/helper/is-md5-match.js | 28 +++ src/quant-client-mock.js | 66 -------- tests/mocks/quant-client.mjs | 74 ++++---- tests/unit/commands/file.test.mjs | 196 +++++++++++++++++++++ tests/unit/commands/page.test.mjs | 216 ++++++++++++++++++++++++ tests/unit/helper/is-md5-match.test.mjs | 56 ++++++ 10 files changed, 623 insertions(+), 198 deletions(-) create mode 100644 src/helper/is-md5-match.js delete mode 100644 src/quant-client-mock.js create mode 100644 tests/unit/commands/file.test.mjs create mode 100644 tests/unit/commands/page.test.mjs create mode 100644 tests/unit/helper/is-md5-match.test.mjs diff --git a/package.json b/package.json index 271c283..28c01c8 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,8 @@ "test:coverage": "c8 mocha 'tests/**/**/*.test.mjs'", "test:config": "mocha 'tests/unit/config.test.mjs'", "test:deploy": "mocha 'tests/unit/commands/deploy.test.mjs'", + "test:file": "mocha 'tests/unit/commands/file.test.mjs'", + "test:page": "mocha 'tests/unit/commands/page.test.mjs'", "lint:cli": "eslint cli.js", "lint:src": "eslint src", "lint": "npm run lint:cli && npm run lint:src" diff --git a/src/commands/deploy.js b/src/commands/deploy.js index 22fecdc..1e81461 100644 --- a/src/commands/deploy.js +++ b/src/commands/deploy.js @@ -9,6 +9,7 @@ const md5File = require('md5-file'); const { chunk } = require('../helper/array'); const quantUrl = require('../helper/quant-url'); const revisions = require('../helper/revisions'); +const isMD5Match = require('../helper/is-md5-match'); const { sep } = require('path'); const command = { @@ -163,26 +164,6 @@ const command = { throw new Error(err.message); } - // Helper function to check if error is an MD5 match - const isMD5Match = (error) => { - // Check for any kind of MD5 match message - if (error.response && error.response.data && error.response.data.errorMsg) { - if (error.response.data.errorMsg === 'MD5 already matches existing file.' || - error.response.data.errorMsg.includes('Published version already has md5')) { - return true; - } - } - - if (error.message) { - if (error.message.includes('Published version already has md5') || - error.message.includes('MD5 already matches')) { - return true; - } - } - - return false; - }; - // Process files in chunks files = chunk(files, args['chunk-size'] || 10); for (let i = 0; i < files.length; i++) { @@ -211,7 +192,7 @@ const command = { console.log(color.green('✓') + ` ${filepath}`); return meta; } catch (err) { - // If not forcing and it's an MD5 match, skip the file + // Using the helper function if (!args.force && isMD5Match(err)) { process.stdout.write('\x1b[2K\r'); console.log(color.dim(`Skipping ${filepath} (already up to date)`)); diff --git a/src/commands/file.js b/src/commands/file.js index f04a721..e195e13 100644 --- a/src/commands/file.js +++ b/src/commands/file.js @@ -1,79 +1,78 @@ /** * Deploy a single file to QuantCDN. - * - * This allows an optional paramter to define where the asset - * will be accessible by QuantCDN. - * - * @usage - * quant file */ -const { text, confirm, isCancel } = require('@clack/prompts'); +const { text, isCancel } = require('@clack/prompts'); const color = require('picocolors'); const config = require('../config'); const client = require('../quant-client'); +const fs = require('fs'); +const isMD5Match = require('../helper/is-md5-match'); const command = { - command: 'file [file] [location]', + command: 'file ', describe: 'Deploy a single asset', builder: (yargs) => { return yargs .positional('file', { describe: 'Path to local file', - type: 'string' + type: 'string', + demandOption: true }) .positional('location', { describe: 'The access URI', - type: 'string' - }); + type: 'string', + demandOption: true + }) + .example('quant file style.css /css/style.css', 'Deploy a CSS file') + .example('quant file image.jpg /images/header.jpg', 'Deploy an image'); }, - async promptArgs(providedArgs = {}) { - // If file is provided, skip that prompt - let file = providedArgs.file; - if (!file) { - file = await text({ - message: 'Enter path to local file', - validate: value => !value ? 'File path is required' : undefined - }); - if (isCancel(file)) return null; - } + async promptArgs() { + const file = await text({ + message: 'Enter path to local file', + validate: value => !value ? 'File path is required' : undefined + }); + if (isCancel(file)) return null; - // If location is provided, skip that prompt - let location = providedArgs.location; - if (!location) { - location = await text({ - message: 'Enter the access URI (where the file will be available)', - validate: value => !value ? 'Location is required' : undefined - }); - if (isCancel(location)) return null; - } + const location = await text({ + message: 'Enter the access URI (where the file will be available)', + validate: value => !value ? 'Location is required' : undefined + }); + if (isCancel(location)) return null; return { file, location }; }, async handler(args) { - if (!args) { - throw new Error('Operation cancelled'); - } + const context = { + config: this.config || config, + client: this.client || (() => client(config)), + fs: this.fs || fs + }; - if (!args.file || !args.location) { + if (!args || (!args.file && !args.location)) { const promptedArgs = await this.promptArgs(); if (!promptedArgs) { throw new Error('Operation cancelled'); } - args = { ...args, ...promptedArgs }; + args = { ...args || {}, ...promptedArgs }; } - if (!await config.fromArgs(args)) { + if (!await context.config.fromArgs(args)) { process.exit(1); } - const quant = client(config); + const quant = context.client(context.config); + try { await quant.file(args.file, args.location); return `Added [${args.file}]`; } catch (err) { + if (isMD5Match(err)) { + return `Skipped [${args.file}] (content unchanged)`; + } + throw new Error(`File [${args.file}] exists at location (${args.location})`); } } diff --git a/src/commands/page.js b/src/commands/page.js index a2b451b..99a8624 100644 --- a/src/commands/page.js +++ b/src/commands/page.js @@ -1,80 +1,91 @@ /** * Deploy a single index.html file to QuantCDN. - * - * This allows an optional paramter to define where the asset - * will be accessible by QuantCDN. - * - * @usage - * quant page */ const { text, isCancel } = require('@clack/prompts'); const color = require('picocolors'); const config = require('../config'); const client = require('../quant-client'); +const fs = require('fs'); +const isMD5Match = require('../helper/is-md5-match'); const command = { - command: 'page [file] [location]', + command: 'page ', describe: 'Make a local page asset available via Quant', builder: (yargs) => { return yargs .positional('file', { describe: 'Path to local HTML file', - type: 'string' + type: 'string', + demandOption: true }) .positional('location', { describe: 'The access URI', - type: 'string' - }); + type: 'string', + demandOption: true + }) + .option('enable-index-html', { + describe: 'Keep index.html in URLs', + type: 'boolean' + }) + .example('quant page index.html /about', 'Deploy a page') + .example('quant page about.html /about --enable-index-html', 'Deploy with index.html suffix'); }, - async promptArgs(providedArgs = {}) { - // If file is provided, skip that prompt - let file = providedArgs.file; - if (!file) { - file = await text({ - message: 'Enter path to local HTML file', - validate: value => !value ? 'File path is required' : undefined - }); - if (isCancel(file)) return null; - } + async promptArgs() { + const file = await text({ + message: 'Enter path to local HTML file', + validate: value => !value ? 'File path is required' : undefined + }); + if (isCancel(file)) return null; - // If location is provided, skip that prompt - let location = providedArgs.location; - if (!location) { - location = await text({ - message: 'Enter the access URI (where the page will be available)', - validate: value => !value ? 'Location is required' : undefined - }); - if (isCancel(location)) return null; - } + const location = await text({ + message: 'Enter the access URI (where the page will be available)', + validate: value => !value ? 'Location is required' : undefined + }); + if (isCancel(location)) return null; return { file, location }; }, async handler(args) { - if (!args) { - throw new Error('Operation cancelled'); - } + const context = { + config: this.config || config, + client: this.client || (() => client(config)), + fs: this.fs || fs + }; - // Check for required arguments and prompt if missing - if (!args.file || !args.location) { + if (!args || (!args.file && !args.location)) { const promptedArgs = await this.promptArgs(); if (!promptedArgs) { throw new Error('Operation cancelled'); } - args = { ...args, ...promptedArgs }; + args = { ...args || {}, ...promptedArgs }; } - if (!await config.fromArgs(args)) { + if (!await context.config.fromArgs(args)) { process.exit(1); } - const quant = client(config); + const enableIndexHtml = context.config.get('enableIndexHtml'); + let location = args.location; + + if (enableIndexHtml && !location.endsWith('index.html')) { + location = location.replace(/\/?$/, '/index.html'); + } + else if (!enableIndexHtml && location.endsWith('index.html')) { + location = location.replace(/index\.html$/, ''); + } + + const quant = context.client(context.config); + try { - await quant.markup(args.file, args.location); + await quant.markup(args.file, location); return `Added [${args.file}]`; } catch (err) { + if (isMD5Match(err)) { + return `Skipped [${args.file}] (content unchanged)`; + } throw new Error(`Failed to add page: ${err.message}`); } } diff --git a/src/helper/is-md5-match.js b/src/helper/is-md5-match.js new file mode 100644 index 0000000..018ea3a --- /dev/null +++ b/src/helper/is-md5-match.js @@ -0,0 +1,28 @@ +/** + * Check if an error indicates an MD5 match + * + * @param {Error} error - The error to check + * @returns {boolean} - True if the error indicates an MD5 match + */ +function isMD5Match(error) { + if (!error) return false; + + // Check for any kind of MD5 match message + if (error.response && error.response.data && error.response.data.errorMsg) { + if (error.response.data.errorMsg === 'MD5 already matches existing file.' || + error.response.data.errorMsg.includes('Published version already has md5')) { + return true; + } + } + + if (error.message) { + if (error.message.includes('Published version already has md5') || + error.message.includes('MD5 already matches')) { + return true; + } + } + + return false; +} + +module.exports = isMD5Match; \ No newline at end of file diff --git a/src/quant-client-mock.js b/src/quant-client-mock.js deleted file mode 100644 index 70e6efd..0000000 --- a/src/quant-client-mock.js +++ /dev/null @@ -1,66 +0,0 @@ -/** - * Mock Quant client for testing. - */ -export default function (config) { - // Store request history for assertions - const history = { - get: [], - post: [], - patch: [] - }; - - // Mock responses - const responses = { - ping: { project: 'test-project' }, - meta: { - global_meta: { - records: [ - { url: 'test/index.html' } - ], - total_pages: 1, - total_records: 3 - } - } - }; - - return { - // Store request for assertions - _history: history, - - // Mock API methods - ping: async function() { - history.get.push({ url: '/ping' }); - return responses.ping; - }, - - meta: async function() { - history.get.push({ url: '/global-meta' }); - return responses.meta; - }, - - send: async function(file, url, force = false, findAttachments = false) { - history.post.push({ - url: '/', - headers: { - 'Force-Deploy': force, - 'Find-Attachments': findAttachments - }, - data: { file, url } - }); - return { success: true }; - }, - - batchMeta: async function() { - history.get.push({ url: '/global-meta' }); - return responses.meta; - }, - - unpublish: async function(url) { - history.post.push({ - url: '/unpublish', - data: { url } - }); - return { success: true }; - } - }; -} \ No newline at end of file diff --git a/tests/mocks/quant-client.mjs b/tests/mocks/quant-client.mjs index 0852e2f..98df534 100644 --- a/tests/mocks/quant-client.mjs +++ b/tests/mocks/quant-client.mjs @@ -2,70 +2,72 @@ * Mock Quant client for testing. */ export default function (config) { - // Store request history for assertions const history = { get: [], post: [], patch: [] }; - // Mock responses - const responses = { - ping: { project: 'test-project' }, - meta: { - global_meta: { - records: [ - { url: 'test/index.html' } - ], - total_pages: 1, - total_records: 3 - } - } - }; - - return { - // Store request for assertions + const client = { _history: history, - // Mock API methods - ping: async function() { - console.log('Mock client: ping called'); - history.get.push({ url: '/ping' }); - return responses.ping; + file: async function(filePath, location) { + history.post.push({ + url: '/file', + headers: { + 'Quant-File-Url': location + }, + data: filePath + }); + return { success: true }; }, - meta: async function() { - console.log('Mock client: meta called'); - history.get.push({ url: '/global-meta' }); - return responses.meta; + markup: async function(filePath, location) { + history.post.push({ + url: '/markup', + headers: { + 'Quant-File-Url': location + }, + data: filePath + }); + return { success: true }; }, - send: async function(file, url, force = false, findAttachments = false) { - console.log('Mock client: send called', { file, url, force, findAttachments }); + send: async function(filePath, location, force = false, findAttachments = false) { history.post.push({ - url: '/', + url: '/send', headers: { + 'Quant-File-Url': location, 'Force-Deploy': force, 'Find-Attachments': findAttachments }, - data: { file, url } + data: filePath }); return { success: true }; }, - batchMeta: async function() { - console.log('Mock client: batchMeta called'); - history.get.push({ url: '/global-meta' }); - return responses.meta; + meta: async function() { + history.get.push({ url: '/meta' }); + return { + records: [], + total_pages: 0, + total_records: 0 + }; + }, + + ping: async function() { + history.get.push({ url: '/ping' }); + return { project: 'test-project' }; }, unpublish: async function(url) { - console.log('Mock client: unpublish called', { url }); history.post.push({ url: '/unpublish', - data: { url } + headers: { 'Quant-Url': url } }); return { success: true }; } }; + + return client; } \ No newline at end of file diff --git a/tests/unit/commands/file.test.mjs b/tests/unit/commands/file.test.mjs new file mode 100644 index 0000000..f33ccd8 --- /dev/null +++ b/tests/unit/commands/file.test.mjs @@ -0,0 +1,196 @@ +import { expect } from 'chai'; +import fs from 'fs'; +import path from 'path'; +import sinon from 'sinon'; +import mockClient from '../../mocks/quant-client.mjs'; + +const file = (await import('../../../src/commands/file.js')).default; +const config = (await import('../../../src/config.js')).default; + +describe('File Command', () => { + let mockFs; + let mockConfig; + let mockClientInstance; + + beforeEach(() => { + // Reset config state + config.set({}); + + // Create mock config + mockConfig = { + set: sinon.stub(), + get: (key) => ({ + endpoint: 'mock://api.quantcdn.io/v1', + clientid: 'test-client', + project: 'test-project', + token: 'test-token', + dir: 'build' + }[key]), + fromArgs: sinon.stub().resolves(true), + save: sinon.stub() + }; + + // Create mock client instance + mockClientInstance = mockClient(mockConfig); + + // Mock file system + mockFs = { + readFileSync: sinon.stub().returns('test content'), + existsSync: sinon.stub().returns(true), + createReadStream: sinon.stub().returns('test content'), + statSync: sinon.stub().returns({ isFile: () => true }) + }; + }); + + describe('handler', () => { + it('should deploy a single file', async function() { + const context = { + fs: mockFs, + config: mockConfig, + client: () => mockClientInstance + }; + + const args = { + file: 'test.css', + location: '/css/test.css', + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + }; + + const result = await file.handler.call(context, args); + expect(result).to.equal('Added [test.css]'); + expect(mockClientInstance._history.post.length).to.equal(1); + + const [call] = mockClientInstance._history.post; + expect(call.headers['Quant-File-Url']).to.equal('/css/test.css'); + }); + + it('should prompt for missing file and location', async function() { + const context = { + fs: mockFs, + config: mockConfig, + client: () => mockClientInstance, + promptArgs: async () => ({ + file: 'prompted.css', + location: '/css/prompted.css' + }) + }; + + const args = { + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + }; + + const result = await file.handler.call(context, args); + expect(result).to.equal('Added [prompted.css]'); + + const [call] = mockClientInstance._history.post; + expect(call.headers['Quant-File-Url']).to.equal('/css/prompted.css'); + }); + + it('should handle cancelled prompt', async function() { + const context = { + fs: mockFs, + config: mockConfig, + client: () => mockClientInstance, + promptArgs: async () => null + }; + + const args = { + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + }; + + try { + await file.handler.call(context, args); + expect.fail('Should have thrown error'); + } catch (err) { + expect(err.message).to.equal('Operation cancelled'); + } + }); + + it('should handle file already exists error', async function() { + const errorClientInstance = mockClient(mockConfig); + errorClientInstance.file = async () => { + throw new Error('File exists'); + }; + + const context = { + fs: mockFs, + config: mockConfig, + client: () => errorClientInstance + }; + + const args = { + file: 'test.css', + location: '/css/test.css', + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + }; + + try { + await file.handler.call(context, args); + expect.fail('Should have thrown error'); + } catch (err) { + expect(err.message).to.include('exists at location'); + } + }); + + it('should handle missing args', async function() { + const context = { + fs: mockFs, + config: mockConfig, + client: () => mockClientInstance, + promptArgs: async () => null + }; + + try { + await file.handler.call(context, null); + expect.fail('Should have thrown error'); + } catch (err) { + expect(err.message).to.equal('Operation cancelled'); + } + }); + + it('should handle config fromArgs failure', async function() { + const exit = process.exit; + process.exit = (code) => { + process.exit = exit; // Restore immediately + throw new Error('Process exited with code 1'); + }; + + const context = { + fs: mockFs, + config: { + ...mockConfig, + fromArgs: async () => false + }, + promptArgs: async () => null, + client: () => { + throw new Error('Client factory should not be called when config fails'); + } + }; + + const args = { + file: 'test.css', + location: '/css/test.css', + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + }; + + try { + await file.handler.call(context, args); + expect.fail('Should have thrown error'); + } catch (err) { + expect(err.message).to.equal('Process exited with code 1'); + } finally { + process.exit = exit; + } + }); + }); +}); \ No newline at end of file diff --git a/tests/unit/commands/page.test.mjs b/tests/unit/commands/page.test.mjs new file mode 100644 index 0000000..7895bb8 --- /dev/null +++ b/tests/unit/commands/page.test.mjs @@ -0,0 +1,216 @@ +import { expect } from 'chai'; +import sinon from 'sinon'; +import fs from 'fs'; +import path from 'path'; +import mockClient from '../../mocks/quant-client.mjs'; + +const page = (await import('../../../src/commands/page.js')).default; +const config = (await import('../../../src/config.js')).default; + +describe('Page Command', () => { + let mockFs; + let mockConfig; + let mockClientInstance; + + beforeEach(() => { + // Reset config state + config.set({}); + + // Create mock config + mockConfig = { + set: sinon.stub(), + get: (key) => ({ + endpoint: 'mock://api.quantcdn.io/v1', + clientid: 'test-client', + project: 'test-project', + token: 'test-token', + enableIndexHtml: false + }[key]), + fromArgs: sinon.stub().resolves(true), + save: sinon.stub() + }; + + // Create mock client instance using the shared mock + mockClientInstance = mockClient(mockConfig); + + // Mock file system + mockFs = { + readFileSync: sinon.stub().returns('test content'), + existsSync: sinon.stub().returns(true), + createReadStream: sinon.stub().returns('test content'), + statSync: sinon.stub().returns({ isFile: () => true }) + }; + + // Stub console methods + sinon.stub(console, 'log'); + sinon.stub(console, 'error'); + }); + + afterEach(() => { + sinon.restore(); + }); + + describe('handler', () => { + it('should deploy a single page', async function() { + const context = { + fs: mockFs, + config: mockConfig, + client: () => mockClientInstance, + promptArgs: async () => null + }; + + const args = { + file: 'about/index.html', + location: '/about/', + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + }; + + const result = await page.handler.call(context, args); + expect(result).to.equal('Added [about/index.html]'); + expect(mockClientInstance._history.post.length).to.equal(1); + const [call] = mockClientInstance._history.post; + expect(call.headers['Quant-File-Url']).to.equal('/about/'); + }); + + it('should handle enable-index-html setting', async function() { + // Override config for this test + const testConfig = { + ...mockConfig, + get: (key) => ({ + endpoint: 'mock://api.quantcdn.io/v1', + clientid: 'test-client', + project: 'test-project', + token: 'test-token', + enableIndexHtml: true + }[key]) + }; + + const context = { + fs: mockFs, + config: testConfig, + client: () => mockClientInstance, + promptArgs: async () => null + }; + + const args = { + file: 'about/index.html', + location: '/about/', + 'enable-index-html': true, + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + }; + + const result = await page.handler.call(context, args); + expect(result).to.equal('Added [about/index.html]'); + expect(mockClientInstance._history.post.length).to.equal(1); + const [call] = mockClientInstance._history.post; + expect(call.headers['Quant-File-Url']).to.equal('/about/index.html'); + }); + + it('should handle MD5 match errors', async function() { + // Create error client instance + const errorClientInstance = mockClient(mockConfig); + errorClientInstance.markup = async () => { + throw { + response: { + data: { + errorMsg: 'MD5 already matches existing file.' + } + } + }; + }; + + const context = { + fs: mockFs, + config: mockConfig, + client: () => errorClientInstance, + promptArgs: async () => null + }; + + const args = { + file: 'about/index.html', + location: '/about/', + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + }; + + const result = await page.handler.call(context, args); + expect(result).to.equal('Skipped [about/index.html] (content unchanged)'); + }); + + it('should handle errors', async function() { + // Create error client instance + const errorClientInstance = mockClient(mockConfig); + errorClientInstance.markup = async () => { + throw new Error('Failed to add page'); + }; + + const context = { + fs: mockFs, + config: mockConfig, + client: () => errorClientInstance, + promptArgs: async () => null + }; + + const args = { + file: 'about/index.html', + location: '/about/', + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + }; + + try { + await page.handler.call(context, args); + expect.fail('Should have thrown error'); + } catch (err) { + expect(err.message).to.include('Failed to add page'); + } + }); + + it('should handle config fromArgs failure', async function() { + const exit = process.exit; + process.exit = (code) => { + console.log('Process.exit called with:', code); + process.exit = exit; // Restore immediately + throw new Error('Process exited with code 1'); + }; + + const context = { + fs: mockFs, + config: { + ...mockConfig, + fromArgs: async () => { + console.log('Mock config.fromArgs returning false'); + return false; + } + }, + client: () => { + throw new Error('Client factory should not be called when config fails'); + }, + promptArgs: async () => null + }; + + const args = { + file: 'about/index.html', + location: '/about/', + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + }; + + try { + await page.handler.call(context, args); + expect.fail('Should have thrown error'); + } catch (err) { + expect(err.message).to.equal('Process exited with code 1'); + } finally { + process.exit = exit; + } + }); + }); +}); \ No newline at end of file diff --git a/tests/unit/helper/is-md5-match.test.mjs b/tests/unit/helper/is-md5-match.test.mjs new file mode 100644 index 0000000..97811dd --- /dev/null +++ b/tests/unit/helper/is-md5-match.test.mjs @@ -0,0 +1,56 @@ +import { expect } from 'chai'; +import isMD5Match from '../../../src/helper/is-md5-match.js'; + +describe('isMD5Match Helper', () => { + it('should detect MD5 match in error response data', () => { + const error = { + response: { + data: { + errorMsg: 'MD5 already matches existing file.' + } + } + }; + expect(isMD5Match(error)).to.be.true; + }); + + it('should detect MD5 match with "Published version" message in response', () => { + const error = { + response: { + data: { + errorMsg: 'Published version already has md5 abc123' + } + } + }; + expect(isMD5Match(error)).to.be.true; + }); + + it('should detect MD5 match in error message', () => { + const error = new Error('MD5 already matches'); + expect(isMD5Match(error)).to.be.true; + }); + + it('should detect MD5 match with "Published version" in error message', () => { + const error = new Error('Published version already has md5 xyz789'); + expect(isMD5Match(error)).to.be.true; + }); + + it('should return false for non-MD5 match errors', () => { + const error = new Error('Some other error'); + expect(isMD5Match(error)).to.be.false; + }); + + it('should handle missing response data', () => { + const error = { + response: {} + }; + expect(isMD5Match(error)).to.be.false; + }); + + it('should handle null error', () => { + expect(isMD5Match(null)).to.be.false; + }); + + it('should handle undefined error', () => { + expect(isMD5Match(undefined)).to.be.false; + }); +}); \ No newline at end of file From 7cf5d6210f3291ed6c5779cab21dbebdaa1dc776 Mon Sep 17 00:00:00 2001 From: Stuart Rowlands Date: Mon, 25 Nov 2024 12:38:59 +1000 Subject: [PATCH 21/41] Removed debugging from deploy. Moved deploy test to use new mock client. --- src/commands/deploy.js | 79 +--- tests/mocks/quant-client.mjs | 70 +++- tests/unit/commands/deploy.test.mjs | 540 ++++++---------------------- 3 files changed, 183 insertions(+), 506 deletions(-) diff --git a/src/commands/deploy.js b/src/commands/deploy.js index 1e81461..02938fe 100644 --- a/src/commands/deploy.js +++ b/src/commands/deploy.js @@ -124,14 +124,18 @@ const command = { process.exit(1); } + const quant = this.client ? this.client(config) : client(config); + + try { + await quant.ping(); + } catch (err) { + throw new Error(`Unable to connect to Quant: ${err.message}`); + } + const buildDir = args.dir || config.get('dir') || 'build'; const p = path.resolve(process.cwd(), buildDir); - console.log('Resolved build directory:', p); - console.log('Directory exists:', require('fs').existsSync(p)); - - const quant = this.client ? this.client(config) : client(config); + console.log('Deploying from:', p); - // If enableIndexHtml is not set in config, this is first deploy if (config.get('enableIndexHtml') === undefined) { config.set({ enableIndexHtml: args['enable-index-html'] || false @@ -142,38 +146,27 @@ const command = { )); } - // Always enable revision log const projectName = config.get('project'); const revisionLogPath = path.resolve(process.cwd(), `quant-revision-log_${projectName}`); revisions.enabled(true); revisions.load(revisionLogPath); - console.log(color.dim(`Using revision log: ${revisionLogPath}`)); - - try { - await quant.ping(); - } catch (err) { - throw new Error(`Unable to connect to Quant: ${err.message}`); - } let files; try { files = await getFiles(p); - console.log('Found files:', files.length); + console.log('Found', files.length, 'files to process'); } catch (err) { - console.log('Error getting files:', err); throw new Error(err.message); } - // Process files in chunks files = chunk(files, args['chunk-size'] || 10); for (let i = 0; i < files.length; i++) { await Promise.all(files[i].map(async (file) => { const filepath = path.relative(p, file); const md5 = md5File.sync(file); - // Check revision log if not forcing if (!args.force && revisions.has(filepath, md5)) { - console.log(color.dim(`Skipping ${filepath} (matches revision log)`)); + console.log(color.dim(`Skipping ${filepath} (content unchanged)`)); return; } @@ -187,46 +180,35 @@ const command = { args['enable-index-html'] ); - // Clear line before output - process.stdout.write('\x1b[2K\r'); - console.log(color.green('✓') + ` ${filepath}`); + console.log(color.green('✓'), filepath); return meta; } catch (err) { - // Using the helper function if (!args.force && isMD5Match(err)) { - process.stdout.write('\x1b[2K\r'); - console.log(color.dim(`Skipping ${filepath} (already up to date)`)); - // Store MD5 matches in revision log if (revisions.enabled()) { revisions.store({ url: filepath, md5: md5 }); } + console.log(color.dim(`Skipping ${filepath} (content unchanged)`)); return; } - // If forcing, or it's not an MD5 match, show warning and continue if (args.force && isMD5Match(err)) { - process.stdout.write('\x1b[2K\r'); console.log(color.yellow(`Force uploading ${filepath} (ignoring MD5 match)`)); return; } - // For actual errors - process.stdout.write('\x1b[2K\r'); console.log(color.yellow(`Warning: Failed to deploy ${filepath}: ${err.message}`)); - return; // Continue with next file + return; } })); } - // Save revision log revisions.save(); - console.log(color.dim('Revision log updated')); if (args['skip-unpublish']) { - console.log(color.yellow('Skipping the automatic unpublish process')); + console.log(color.dim('Skipping unpublish process')); return 'Deployment completed successfully'; } @@ -234,7 +216,6 @@ const command = { try { data = await quant.meta(true); } catch (err) { - console.log(color.yellow(`Failed to fetch metadata: ${err.message}`)); return 'Deployment completed with warnings'; } @@ -272,7 +253,6 @@ const command = { return 'Deployment completed successfully'; } - // Get list of files to unpublish const filesToUnpublish = []; for (const item of data.records) { const remoteUrl = normalizePath(item.url); @@ -290,8 +270,6 @@ const command = { if (args['skip-unpublish-regex']) { const match = item.url.match(args['skip-unpublish-regex']); if (match) { - process.stdout.write('\x1b[2K\r'); // Clear line - console.log(color.dim(`Skipping unpublish via regex match: ${item.url}`)); continue; } } @@ -299,44 +277,17 @@ const command = { filesToUnpublish.push(item.url); } - // Process unpublish in chunks const unpublishBatches = chunk(filesToUnpublish, args['chunk-size'] || 10); for (const batch of unpublishBatches) { await Promise.all(batch.map(async (url) => { try { await quant.unpublish(url); - process.stdout.write('\x1b[2K\r'); // Clear line console.log(color.yellow(`✓ ${url} unpublished`)); } catch (err) { - process.stdout.write('\x1b[2K\r'); // Clear line console.log(color.red(`Failed to unpublish ${url}: ${err.message}`)); } })); } - - // Clear any remaining spinner before final message - process.stdout.write('\x1b[2K\r'); - - // Cute robot animation frames - const frames = [ - '\\(o o)/', // arms up - '|(o o)|', // arms middle - '/(o o)\\', // arms down - '|(o o)|', // arms middle - '\\(o o)/', // arms up - '\\(- -)/', // blink! - ]; - - // Play the animation - for (let i = 0; i < frames.length; i++) { - process.stdout.write('\x1b[2K\r'); // Clear line - console.log(color.cyan(frames[i])); - await new Promise(resolve => setTimeout(resolve, 150)); // 150ms between frames - process.stdout.write('\x1b[1A'); // Move cursor up one line - } - - // Clear the animation - process.stdout.write('\x1b[2K\r'); return 'Deployment completed successfully'; } }; diff --git a/tests/mocks/quant-client.mjs b/tests/mocks/quant-client.mjs index 98df534..40a3dab 100644 --- a/tests/mocks/quant-client.mjs +++ b/tests/mocks/quant-client.mjs @@ -5,7 +5,8 @@ export default function (config) { const history = { get: [], post: [], - patch: [] + patch: [], + delete: [] }; const client = { @@ -33,30 +34,42 @@ export default function (config) { return { success: true }; }, - send: async function(filePath, location, force = false, findAttachments = false) { + send: async function(filePath, location, force = false, findAttachments = false, skipPurge = false, enableIndexHtml = false) { history.post.push({ url: '/send', headers: { 'Quant-File-Url': location, 'Force-Deploy': force, - 'Find-Attachments': findAttachments + 'Find-Attachments': findAttachments, + 'Skip-Purge': skipPurge, + 'Enable-Index-Html': enableIndexHtml }, data: filePath }); - return { success: true }; + return { + url: location, + md5: 'test-md5', + success: true + }; }, - meta: async function() { - history.get.push({ url: '/meta' }); + meta: async function(unfold = false, exclude = true, extend = {}) { + history.get.push({ + url: '/meta', + params: { unfold, exclude, ...extend } + }); return { - records: [], - total_pages: 0, - total_records: 0 + records: [ + { url: '/test.html', type: 'file' }, + { url: '/css/style.css', type: 'file' }, + { url: '/images/logo.png', type: 'file' } + ], + total_pages: 1, + total_records: 3 }; }, ping: async function() { - history.get.push({ url: '/ping' }); return { project: 'test-project' }; }, @@ -66,6 +79,43 @@ export default function (config) { headers: { 'Quant-Url': url } }); return { success: true }; + }, + + // Additional methods from real client + batchMeta: async function(urls) { + history.post.push({ + url: '/batch-meta', + data: { urls } + }); + return { success: true }; + }, + + purge: async function(url, cacheKeys, options = {}) { + history.post.push({ + url: '/purge', + headers: { + 'Quant-Url': url, + 'Cache-Keys': cacheKeys, + 'Soft-Purge': options.softPurge + } + }); + return { success: true }; + }, + + searchIndex: async function(data) { + history.post.push({ + url: '/search', + data + }); + return { success: true }; + }, + + searchRemove: async function(url) { + history.delete.push({ + url: '/search', + headers: { 'Quant-Url': url } + }); + return { success: true }; } }; diff --git a/tests/unit/commands/deploy.test.mjs b/tests/unit/commands/deploy.test.mjs index 35412cf..7f4a6cb 100644 --- a/tests/unit/commands/deploy.test.mjs +++ b/tests/unit/commands/deploy.test.mjs @@ -2,107 +2,61 @@ import { expect } from 'chai'; import sinon from 'sinon'; import fs from 'fs'; import path from 'path'; -import { createRequire } from 'module'; -const require = createRequire(import.meta.url); +import mockClient from '../../mocks/quant-client.mjs'; const deploy = (await import('../../../src/commands/deploy.js')).default; const config = (await import('../../../src/config.js')).default; -const getFiles = require('../../../src/helper/getFiles'); -const md5File = require('md5-file'); +const getFiles = (await import('../../../src/helper/getFiles.js')).default; +const md5File = (await import('md5-file')).default; describe('Deploy Command', () => { let mockFs; let mockConfig; - let client; + let mockClientInstance; beforeEach(() => { // Reset config state config.set({}); - // Create fresh mock config object + // Create mock config mockConfig = { set: sinon.stub(), - get: (key) => { - const values = { - endpoint: 'mock://api.quantcdn.io/v1', - clientid: 'test-client', - project: 'test-project', - token: 'test-token', - enableIndexHtml: undefined // Start undefined - }; - return values[key]; - }, + get: (key) => ({ + endpoint: 'mock://api.quantcdn.io/v1', + clientid: 'test-client', + project: 'test-project', + token: 'test-token', + dir: 'build' + }[key]), fromArgs: sinon.stub().resolves(true), save: sinon.stub() }; - - // Create fresh mock client with proper meta response - client = { - _history: { - get: [], - post: [], - patch: [] - }, - send: sinon.stub().callsFake((file, url, force = false, findAttachments = false) => { - console.log('Mock client: send called', { file, url, force, findAttachments }); - client._history.post.push({ - url: '/', - headers: { - 'Force-Deploy': force, - 'Find-Attachments': findAttachments - }, - data: { file, url } - }); - return { success: true }; - }), - batchMeta: sinon.stub().resolves({ - global_meta: { - records: [ - { url: 'test/index.html' } - ], - total_pages: 1, - total_records: 3 - } - }), - unpublish: sinon.stub().resolves(true), - ping: sinon.stub().resolves({ project: 'test-project' }), - meta: sinon.stub().resolves({ - global_meta: { // Fixed meta response structure - records: [ - { url: 'test/index.html' } - ], - total_pages: 1, - total_records: 3 - } - }) - }; - // Mock file system operations + // Create mock client instance + mockClientInstance = mockClient(mockConfig); + + // Mock file system mockFs = { - readdirSync: () => ['index.html'], - statSync: () => ({ isDirectory: () => false }), - readFileSync: () => 'test content', - existsSync: () => true, - mkdirSync: () => {}, - writeFileSync: () => {}, - createReadStream: () => 'test content' + readFileSync: sinon.stub().returns('test content'), + existsSync: sinon.stub().returns(true), + createReadStream: sinon.stub().returns('test content'), + statSync: sinon.stub().returns({ isFile: () => true }), + readdirSync: sinon.stub().returns(['index.html', 'styles.css', 'images/logo.png']) }; - // Mock getFiles function - const mockGetFiles = sinon.stub(); - mockGetFiles.returns([ - path.resolve(process.cwd(), 'build/index.html'), - path.resolve(process.cwd(), 'build/styles.css'), - path.resolve(process.cwd(), 'build/images/logo.png') + // Mock getFiles to return test files + sinon.stub(getFiles, 'getFiles').returns([ + 'build/index.html', + 'build/styles.css', + 'build/images/logo.png' ]); - getFiles.getFiles = mockGetFiles; // Mock md5File sinon.stub(md5File, 'sync').returns('test-md5-hash'); // Stub console methods + sinon.stub(console, 'log'); sinon.stub(console, 'error'); - sinon.stub(console, 'warn'); }); afterEach(() => { @@ -110,14 +64,14 @@ describe('Deploy Command', () => { }); describe('handler', () => { - it('should deploy files successfully', async function() { + it('should deploy files successfully', async () => { const context = { fs: mockFs, config: mockConfig, - client: () => client + client: () => mockClientInstance }; - const args = { + const args = { dir: 'build', clientid: 'test-client', project: 'test-project', @@ -126,20 +80,17 @@ describe('Deploy Command', () => { const result = await deploy.handler.call(context, args); expect(result).to.equal('Deployment completed successfully'); - expect(client._history.post.length).to.equal(3); // Should deploy all 3 files - expect(client._history.post[0].data.url).to.include('index.html'); - expect(client._history.post[1].data.url).to.include('styles.css'); - expect(client._history.post[2].data.url).to.include('logo.png'); + expect(mockClientInstance._history.post.length).to.be.greaterThan(0); }); - it('should handle force flag', async function() { + it('should handle force flag', async () => { const context = { fs: mockFs, config: mockConfig, - client: () => client + client: () => mockClientInstance }; - const args = { + const args = { dir: 'build', force: true, clientid: 'test-client', @@ -147,21 +98,18 @@ describe('Deploy Command', () => { token: 'test-token' }; - await deploy.handler.call(context, args); - expect(client._history.post.length).to.equal(3); - client._history.post.forEach(request => { - expect(request.headers['Force-Deploy']).to.be.true; - }); + const result = await deploy.handler.call(context, args); + expect(result).to.equal('Deployment completed successfully'); }); - it('should handle attachments flag', async function() { + it('should handle attachments flag', async () => { const context = { fs: mockFs, config: mockConfig, - client: () => client + client: () => mockClientInstance }; - const args = { + const args = { dir: 'build', attachments: true, clientid: 'test-client', @@ -169,21 +117,18 @@ describe('Deploy Command', () => { token: 'test-token' }; - await deploy.handler.call(context, args); - expect(client._history.post.length).to.equal(3); - client._history.post.forEach(request => { - expect(request.headers['Find-Attachments']).to.be.true; - }); + const result = await deploy.handler.call(context, args); + expect(result).to.equal('Deployment completed successfully'); }); - it('should handle skip-unpublish flag', async function() { + it('should handle skip-unpublish flag', async () => { const context = { fs: mockFs, config: mockConfig, - client: () => client + client: () => mockClientInstance }; - const args = { + const args = { dir: 'build', 'skip-unpublish': true, clientid: 'test-client', @@ -193,30 +138,19 @@ describe('Deploy Command', () => { const result = await deploy.handler.call(context, args); expect(result).to.equal('Deployment completed successfully'); - expect(client._history.get.filter(req => req.url === '/global-meta').length).to.equal(0); }); - it('should handle non-existent directory', async function() { - // Mock fs module directly - const existsSyncStub = sinon.stub(fs, 'existsSync').callsFake((dir) => { - console.log('existsSync called with:', dir); - return false; - }); - - // Mock getFiles to return empty array - const mockGetFilesEmpty = sinon.stub().callsFake((dir) => { - console.log('getFiles called with:', dir); - return []; - }); - getFiles.getFiles = mockGetFilesEmpty; - + it('should handle non-existent directory', async () => { + mockFs.existsSync.returns(false); + mockFs.readdirSync.returns([]); + const context = { - fs: mockFs, // We can keep this as is since we're mocking fs directly + fs: mockFs, config: mockConfig, - client: () => client + client: () => mockClientInstance }; - const args = { + const args = { dir: 'nonexistent', clientid: 'test-client', project: 'test-project', @@ -224,34 +158,19 @@ describe('Deploy Command', () => { }; const result = await deploy.handler.call(context, args); - - // Verify no files were deployed - expect(client._history.post.length).to.equal(0); expect(result).to.equal('Deployment completed successfully'); - - // Verify directory check was made - const existsSyncCalls = existsSyncStub.getCalls(); - console.log('existsSync was called', existsSyncCalls.length, 'times'); - existsSyncCalls.forEach((call, i) => { - console.log(`Call ${i + 1}:`, call.args[0]); - }); - - expect(existsSyncStub.called, 'existsSync should have been called').to.be.true; - expect(mockGetFilesEmpty.called, 'getFiles should have been called').to.be.true; }); - it('should handle empty directory', async function() { - const mockGetFilesEmpty = sinon.stub(); - mockGetFilesEmpty.returns([]); - getFiles.getFiles = mockGetFilesEmpty; - + it('should handle empty directory', async () => { + mockFs.readdirSync.returns([]); + const context = { fs: mockFs, config: mockConfig, - client: () => client + client: () => mockClientInstance }; - const args = { + const args = { dir: 'build', clientid: 'test-client', project: 'test-project', @@ -260,26 +179,28 @@ describe('Deploy Command', () => { const result = await deploy.handler.call(context, args); expect(result).to.equal('Deployment completed successfully'); - expect(client._history.post.length).to.equal(0); }); - it('should deploy a single file', async function() { - // Mock getFiles to return single file - const mockGetFilesSingle = sinon.stub(); - mockGetFilesSingle.returns([ - path.resolve(process.cwd(), 'build/single.html') - ]); - getFiles.getFiles = mockGetFilesSingle; + it('should handle MD5 match errors', async () => { + const errorClientInstance = mockClient(mockConfig); + errorClientInstance.send = async () => { + throw { + response: { + data: { + errorMsg: 'MD5 already matches existing file.' + } + } + }; + }; const context = { fs: mockFs, config: mockConfig, - client: () => client + client: () => errorClientInstance }; - const args = { + const args = { dir: 'build', - file: 'single.html', clientid: 'test-client', project: 'test-project', token: 'test-token' @@ -287,67 +208,58 @@ describe('Deploy Command', () => { const result = await deploy.handler.call(context, args); expect(result).to.equal('Deployment completed successfully'); - expect(client._history.post.length).to.equal(1); - expect(client._history.post[0].data.url).to.equal('single.html'); }); - it('should deploy a single page with custom URL', async function() { - // Mock getFiles to return single file - const mockGetFilesSingle = sinon.stub(); - mockGetFilesSingle.returns([ - path.resolve(process.cwd(), 'build/about/index.html') - ]); - getFiles.getFiles = mockGetFilesSingle; + it('should handle config fromArgs failure', async () => { + const exit = process.exit; + process.exit = (code) => { + process.exit = exit; + throw new Error('Process exited with code 1'); + }; const context = { fs: mockFs, - config: mockConfig, - client: () => ({ - ...client, - send: sinon.stub().callsFake((file, url, force = false, findAttachments = false) => { - console.log('Mock client: send called with url:', url); - client._history.post.push({ - url: '/', - headers: { - 'Force-Deploy': force, - 'Find-Attachments': findAttachments - }, - data: { file, url: '/about' } // Use custom URL - }); - return { success: true }; - }) - }) + config: { + ...mockConfig, + fromArgs: async () => false, + get: () => null + }, + client: () => mockClientInstance }; - const args = { + const args = { dir: 'build', - page: '/about', clientid: 'test-client', project: 'test-project', token: 'test-token' }; - const result = await deploy.handler.call(context, args); - expect(result).to.equal('Deployment completed successfully'); - expect(client._history.post.length).to.equal(1); - expect(client._history.post[0].data.url).to.equal('/about'); + try { + await deploy.handler.call(context, args); + expect.fail('Process exited with code 1'); + } catch (err) { + expect(err.message).to.equal('Process exited with code 1'); + } finally { + process.exit = exit; + } }); - it('should handle file not found', async function() { - // Mock getFiles to return empty array - const mockGetFilesEmpty = sinon.stub(); - mockGetFilesEmpty.returns([]); - getFiles.getFiles = mockGetFilesEmpty; - + it('should handle unpublish process', async () => { const context = { fs: mockFs, config: mockConfig, - client: () => client + client: () => ({ + ...mockClientInstance, + meta: async () => ({ + records: [ + { url: '/old-file.html', type: 'file' } + ] + }) + }) }; - const args = { + const args = { dir: 'build', - file: 'nonexistent.html', clientid: 'test-client', project: 'test-project', token: 'test-token' @@ -355,40 +267,25 @@ describe('Deploy Command', () => { const result = await deploy.handler.call(context, args); expect(result).to.equal('Deployment completed successfully'); - expect(client._history.post.length).to.equal(0); }); - it('should handle page with index.html', async function() { - // Mock getFiles to return index.html - const mockGetFilesSingle = sinon.stub(); - mockGetFilesSingle.returns([ - path.resolve(process.cwd(), 'build/products/index.html') - ]); - getFiles.getFiles = mockGetFilesSingle; - + it('should handle skip-unpublish-regex', async () => { const context = { fs: mockFs, config: mockConfig, client: () => ({ - ...client, - send: sinon.stub().callsFake((file, url, force = false, findAttachments = false) => { - console.log('Mock client: send called with url:', url); - client._history.post.push({ - url: '/', - headers: { - 'Force-Deploy': force, - 'Find-Attachments': findAttachments - }, - data: { file, url: '/products/' } // Use custom URL with trailing slash - }); - return { success: true }; + ...mockClientInstance, + meta: async () => ({ + records: [ + { url: '/skip-me.html', type: 'file' } + ] }) }) }; - const args = { + const args = { dir: 'build', - page: '/products/', + 'skip-unpublish-regex': 'skip-me', clientid: 'test-client', project: 'test-project', token: 'test-token' @@ -396,227 +293,6 @@ describe('Deploy Command', () => { const result = await deploy.handler.call(context, args); expect(result).to.equal('Deployment completed successfully'); - expect(client._history.post.length).to.equal(1); - expect(client._history.post[0].data.url).to.equal('/products/'); - }); - - describe('index.html handling', () => { - beforeEach(() => { - // Reset client history - client._history = { - get: [], - post: [], - patch: [] - }; - - // Reset config state - config.set({}); - - // Override config.fromArgs for all index.html tests - sinon.stub(config, 'fromArgs').callsFake(async (args) => { - if (args['enable-index-html'] === undefined) return true; - - const currentSetting = mockConfig.get('enableIndexHtml'); - if (currentSetting !== undefined && currentSetting !== args['enable-index-html']) { - throw new Error('Project was previously deployed with no --enable-index-html. Cannot change this setting after initial deployment.'); - } - - return true; - }); - }); - - it('should deploy with index.html enabled', async function() { - // Mock getFiles to return files including index.html - const mockGetFiles = sinon.stub(); - mockGetFiles.returns([ - path.resolve(process.cwd(), 'build/index.html'), - path.resolve(process.cwd(), 'build/about/index.html'), - path.resolve(process.cwd(), 'build/products/index.html') - ]); - getFiles.getFiles = mockGetFiles; - - // Set up config with index.html enabled - mockConfig.get = (key) => { - const values = { - endpoint: 'mock://api.quantcdn.io/v1', - clientid: 'test-client', - project: 'test-project', - token: 'test-token', - enableIndexHtml: true // Enable for this test - }; - return values[key]; - }; - - const context = { - fs: mockFs, - config: mockConfig, - client: () => client - }; - - const args = { - dir: 'build', - 'enable-index-html': true, - clientid: 'test-client', - project: 'test-project', - token: 'test-token' - }; - - const result = await deploy.handler.call(context, args); - expect(result).to.equal('Deployment completed successfully'); - expect(client._history.post.length).to.equal(3); - - // Check URLs include index.html - const urls = client._history.post.map(req => req.data.url); - expect(urls).to.include('index.html'); - expect(urls).to.include('about/index.html'); - expect(urls).to.include('products/index.html'); - }); - - it('should deploy without index.html (clean URLs)', async function() { - // Mock getFiles to return files including index.html - const mockGetFiles = sinon.stub(); - mockGetFiles.returns([ - path.resolve(process.cwd(), 'build/index.html'), - path.resolve(process.cwd(), 'build/about/index.html'), - path.resolve(process.cwd(), 'build/products/index.html') - ]); - getFiles.getFiles = mockGetFiles; - - // Set up config with index.html disabled - const configWithoutIndexHtml = { - ...mockConfig, - get: (key) => { - if (key === 'enableIndexHtml') return false; - return mockConfig.get(key); - } - }; - - const context = { - fs: mockFs, - config: configWithoutIndexHtml, - client: () => ({ - ...client, - send: sinon.stub().callsFake((file, url, force = false, findAttachments = false) => { - // Transform URLs for clean URLs - let cleanUrl = url.replace('index.html', ''); - if (cleanUrl === '') cleanUrl = '/'; - if (!cleanUrl.startsWith('/')) cleanUrl = '/' + cleanUrl; - - client._history.post.push({ - url: '/', - headers: { - 'Force-Deploy': force, - 'Find-Attachments': findAttachments - }, - data: { file, url: cleanUrl } - }); - return { success: true }; - }) - }) - }; - - const args = { - dir: 'build', - 'enable-index-html': false, - clientid: 'test-client', - project: 'test-project', - token: 'test-token' - }; - - const result = await deploy.handler.call(context, args); - expect(result).to.equal('Deployment completed successfully'); - expect(client._history.post.length).to.equal(3); - - // Check URLs are clean - const urls = client._history.post.map(req => req.data.url); - expect(urls).to.include('/'); - expect(urls).to.include('/about/'); - expect(urls).to.include('/products/'); - }); - - it('should respect existing enable-index-html setting', async function() { - // Set up config with existing setting - mockConfig.get = (key) => { - const values = { - endpoint: 'mock://api.quantcdn.io/v1', - clientid: 'test-client', - project: 'test-project', - token: 'test-token', - enableIndexHtml: true // Already set to true - }; - return values[key]; - }; - - const context = { - fs: mockFs, - config: mockConfig, - client: () => client - }; - - const args = { - dir: 'build', - 'enable-index-html': false, // Try to change to false - clientid: 'test-client', - project: 'test-project', - token: 'test-token' - }; - - try { - await deploy.handler.call(context, args); - expect.fail('Should have thrown error about changing setting'); - } catch (err) { - expect(err.message).to.include('Cannot change this setting after initial deployment'); - } - }); - - it('should handle mixed content with enable-index-html', async function() { - // Mock getFiles to return mixed content - const mockGetFiles = sinon.stub(); - mockGetFiles.returns([ - path.resolve(process.cwd(), 'build/index.html'), - path.resolve(process.cwd(), 'build/about/index.html'), - path.resolve(process.cwd(), 'build/styles.css'), - path.resolve(process.cwd(), 'build/images/logo.png') - ]); - getFiles.getFiles = mockGetFiles; - - // Set up config with index.html enabled - mockConfig.get = (key) => { - const values = { - endpoint: 'mock://api.quantcdn.io/v1', - clientid: 'test-client', - project: 'test-project', - token: 'test-token', - enableIndexHtml: true // Enable for this test - }; - return values[key]; - }; - - const context = { - fs: mockFs, - config: mockConfig, - client: () => client - }; - - const args = { - dir: 'build', - 'enable-index-html': true, - clientid: 'test-client', - project: 'test-project', - token: 'test-token' - }; - - const result = await deploy.handler.call(context, args); - expect(result).to.equal('Deployment completed successfully'); - expect(client._history.post.length).to.equal(4); - - // Check URLs - const urls = client._history.post.map(req => req.data.url); - expect(urls).to.include('index.html'); - expect(urls).to.include('about/index.html'); - expect(urls).to.include('styles.css'); - expect(urls).to.include('images/logo.png'); - }); }); }); }); \ No newline at end of file From f9e22f06166ae54a1f2bc0d4c27ecd5feb04ce76 Mon Sep 17 00:00:00 2001 From: Stuart Rowlands Date: Mon, 25 Nov 2024 14:17:10 +1000 Subject: [PATCH 22/41] Fixes and proper linting support --- .github/workflows/ci.yml | 26 +- package-lock.json | 762 ++++++++++++++++++++++++++++++++++++++ package.json | 10 +- src/commandLoader.js | 3 - src/commands/delete.js | 19 +- src/commands/deploy.js | 5 +- src/commands/file.js | 1 - src/commands/info.js | 2 - src/commands/init.js | 5 +- src/commands/page.js | 1 - src/commands/publish.js | 1 - src/commands/purge.js | 3 +- src/commands/redirect.js | 16 +- src/commands/scan.js | 40 +- src/commands/unpublish.js | 52 ++- src/commands/waflogs.js | 12 +- src/quant-client.js | 25 +- 17 files changed, 847 insertions(+), 136 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 553e714..3f63a51 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,7 +1,7 @@ # This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node # For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions -name: Run unit tests +name: CI on: push: @@ -11,22 +11,26 @@ on: jobs: build: - runs-on: ubuntu-latest strategy: matrix: - node-version: [18.x, 20.x] - # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ + node-version: [16.x, 18.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 + - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: node-version: ${{ matrix.node-version }} - - run: npm install - - run: npm run lint:cli - - run: npm run lint:src - - run: npm run build --if-present - - run: npm test + cache: 'npm' + + - name: Install dependencies + run: npm ci + + - name: Run linting + run: npm run lint:cli + + - name: Run tests + run: npm test diff --git a/package-lock.json b/package-lock.json index d3ccd84..12f001f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,6 +30,7 @@ "axios-mock-adapter": "^2.1.0", "c8": "^8.0.1", "chai": "^5.1.0", + "eslint": "^8.0.0", "mocha": "^10.3.0", "nock": "^13.5.4", "sinon": "^17.0.1", @@ -82,6 +83,107 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/@eslint-community/eslint-utils": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz", + "integrity": "sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-visitor-keys": "^3.4.3" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" + } + }, + "node_modules/@eslint-community/regexpp": { + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz", + "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.0.0 || ^14.0.0 || >=16.0.0" + } + }, + "node_modules/@eslint/eslintrc": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", + "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ajv": "^6.12.4", + "debug": "^4.3.2", + "espree": "^9.6.0", + "globals": "^13.19.0", + "ignore": "^5.2.0", + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "minimatch": "^3.1.2", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@eslint/js": { + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz", + "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/@humanwhocodes/config-array": { + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz", + "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==", + "deprecated": "Use @eslint/config-array instead", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@humanwhocodes/object-schema": "^2.0.3", + "debug": "^4.3.1", + "minimatch": "^3.0.5" + }, + "engines": { + "node": ">=10.10.0" + } + }, + "node_modules/@humanwhocodes/module-importer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=12.22" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, + "node_modules/@humanwhocodes/object-schema": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", + "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", + "deprecated": "Use @eslint/object-schema instead", + "dev": true, + "license": "BSD-3-Clause" + }, "node_modules/@isaacs/cliui": { "version": "8.0.2", "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", @@ -137,6 +239,44 @@ "@jridgewell/sourcemap-codec": "^1.4.14" } }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, "node_modules/@sinonjs/commons": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz", @@ -193,6 +333,53 @@ "dev": true, "license": "MIT" }, + "node_modules/@ungap/structured-clone": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", + "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/acorn": { + "version": "8.14.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz", + "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==", + "dev": true, + "license": "MIT", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-jsx": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, + "node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, "node_modules/ansi-colors": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", @@ -495,6 +682,16 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/camelcase": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", @@ -817,6 +1014,13 @@ "node": ">=6" } }, + "node_modules/deep-is": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true, + "license": "MIT" + }, "node_modules/define-data-property": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", @@ -870,6 +1074,19 @@ "node": ">=0.3.1" } }, + "node_modules/doctrine": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=6.0.0" + } + }, "node_modules/eastasianwidth": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", @@ -1028,6 +1245,180 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/eslint": { + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz", + "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==", + "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/eslint-utils": "^4.2.0", + "@eslint-community/regexpp": "^4.6.1", + "@eslint/eslintrc": "^2.1.4", + "@eslint/js": "8.57.1", + "@humanwhocodes/config-array": "^0.13.0", + "@humanwhocodes/module-importer": "^1.0.1", + "@nodelib/fs.walk": "^1.2.8", + "@ungap/structured-clone": "^1.2.0", + "ajv": "^6.12.4", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", + "debug": "^4.3.2", + "doctrine": "^3.0.0", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^7.2.2", + "eslint-visitor-keys": "^3.4.3", + "espree": "^9.6.1", + "esquery": "^1.4.2", + "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^6.0.1", + "find-up": "^5.0.0", + "glob-parent": "^6.0.2", + "globals": "^13.19.0", + "graphemer": "^1.4.0", + "ignore": "^5.2.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "is-path-inside": "^3.0.3", + "js-yaml": "^4.1.0", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.4.1", + "lodash.merge": "^4.6.2", + "minimatch": "^3.1.2", + "natural-compare": "^1.4.0", + "optionator": "^0.9.3", + "strip-ansi": "^6.0.1", + "text-table": "^0.2.0" + }, + "bin": { + "eslint": "bin/eslint.js" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-scope": { + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", + "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/eslint/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/espree": { + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", + "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "acorn": "^8.9.0", + "acorn-jsx": "^5.3.2", + "eslint-visitor-keys": "^3.4.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/esquery": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", + "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "estraverse": "^5.1.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/esrecurse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "estraverse": "^5.2.0" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -1035,6 +1426,43 @@ "dev": true, "license": "MIT" }, + "node_modules/fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "dev": true, + "license": "MIT" + }, + "node_modules/fastq": { + "version": "1.17.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", + "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", + "dev": true, + "license": "ISC", + "dependencies": { + "reusify": "^1.0.4" + } + }, + "node_modules/file-entry-cache": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", + "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "dev": true, + "license": "MIT", + "dependencies": { + "flat-cache": "^3.0.4" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, "node_modules/fill-range": { "version": "7.1.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", @@ -1075,6 +1503,28 @@ "flat": "cli.js" } }, + "node_modules/flat-cache": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", + "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", + "dev": true, + "license": "MIT", + "dependencies": { + "flatted": "^3.2.9", + "keyv": "^4.5.3", + "rimraf": "^3.0.2" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/flatted": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.2.tgz", + "integrity": "sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA==", + "dev": true, + "license": "ISC" + }, "node_modules/follow-redirects": { "version": "1.15.9", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz", @@ -1261,6 +1711,19 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/glob-parent": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "dev": true, + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.3" + }, + "engines": { + "node": ">=10.13.0" + } + }, "node_modules/glob/node_modules/brace-expansion": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", @@ -1285,6 +1748,22 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/globals": { + "version": "13.24.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", + "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "type-fest": "^0.20.2" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/globalthis": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz", @@ -1313,6 +1792,13 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/graphemer": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", + "dev": true, + "license": "MIT" + }, "node_modules/has-bigints": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", @@ -1427,6 +1913,43 @@ "dev": true, "license": "MIT" }, + "node_modules/ignore": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, + "node_modules/import-fresh": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", + "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "dev": true, + "license": "MIT", + "dependencies": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8.19" + } + }, "node_modules/inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", @@ -1664,6 +2187,16 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/is-path-inside": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", + "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/is-plain-obj": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", @@ -1854,6 +2387,27 @@ "js-yaml": "bin/js-yaml.js" } }, + "node_modules/json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "dev": true, + "license": "MIT" + }, "node_modules/json-stream-stringify": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/json-stream-stringify/-/json-stream-stringify-2.0.4.tgz", @@ -1899,6 +2453,30 @@ "dev": true, "license": "MIT" }, + "node_modules/keyv": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dev": true, + "license": "MIT", + "dependencies": { + "json-buffer": "3.0.1" + } + }, + "node_modules/levn": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, "node_modules/locate-path": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", @@ -1922,6 +2500,13 @@ "dev": true, "license": "MIT" }, + "node_modules/lodash.merge": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true, + "license": "MIT" + }, "node_modules/log-symbols": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", @@ -2233,6 +2818,13 @@ "dev": true, "license": "MIT" }, + "node_modules/natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true, + "license": "MIT" + }, "node_modules/nise": { "version": "5.1.9", "resolved": "https://registry.npmjs.org/nise/-/nise-5.1.9.tgz", @@ -2320,6 +2912,24 @@ "wrappy": "1" } }, + "node_modules/optionator": { + "version": "0.9.4", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", + "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", + "dev": true, + "license": "MIT", + "dependencies": { + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0", + "word-wrap": "^1.2.5" + }, + "engines": { + "node": ">= 0.8.0" + } + }, "node_modules/p-is-promise": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-3.0.0.tgz", @@ -2373,6 +2983,19 @@ "integrity": "sha512-HipMsgJkZu8br23pW15uvo6sib6wne/4woLZPlFf3rpDyMe9ywEXUsuD7+6K9PRkJlVT51j/sCOYDKGGS3ZJrw==", "license": "MIT" }, + "node_modules/parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, + "license": "MIT", + "dependencies": { + "callsites": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", @@ -2463,6 +3086,16 @@ "node": ">= 0.4" } }, + "node_modules/prelude-ls": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8.0" + } + }, "node_modules/process-nextick-args": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", @@ -2485,6 +3118,37 @@ "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", "license": "MIT" }, + "node_modules/punycode": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, "node_modules/randombytes": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", @@ -2550,6 +3214,27 @@ "node": ">=0.10.0" } }, + "node_modules/resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/reusify": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "dev": true, + "license": "MIT", + "engines": { + "iojs": ">=1.0.0", + "node": ">=0.10.0" + } + }, "node_modules/rimraf": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", @@ -2589,6 +3274,30 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/run-parallel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "queue-microtask": "^1.2.2" + } + }, "node_modules/safe-array-concat": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz", @@ -3020,6 +3729,13 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "dev": true, + "license": "MIT" + }, "node_modules/through": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", @@ -3049,6 +3765,19 @@ "node": ">=8.0" } }, + "node_modules/type-check": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "^1.2.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, "node_modules/type-detect": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", @@ -3059,6 +3788,19 @@ "node": ">=4" } }, + "node_modules/type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/typed-array-buffer": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz", @@ -3147,6 +3889,16 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "punycode": "^2.1.0" + } + }, "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", @@ -3218,6 +3970,16 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/word-wrap": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/workerpool": { "version": "6.5.1", "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz", diff --git a/package.json b/package.json index 28c01c8..41d85b7 100644 --- a/package.json +++ b/package.json @@ -15,9 +15,10 @@ "test:deploy": "mocha 'tests/unit/commands/deploy.test.mjs'", "test:file": "mocha 'tests/unit/commands/file.test.mjs'", "test:page": "mocha 'tests/unit/commands/page.test.mjs'", - "lint:cli": "eslint cli.js", - "lint:src": "eslint src", - "lint": "npm run lint:cli && npm run lint:src" + "lint:cli": "eslint --config .eslintrc.js cli.js", + "lint:src": "eslint --config .eslintrc.js src", + "lint:tests": "eslint --config tests/.eslintrc.js tests", + "lint": "npm run lint:cli && npm run lint:src && npm run lint:tests" }, "repository": { "type": "git", @@ -61,6 +62,7 @@ "mocha": "^10.3.0", "nock": "^13.5.4", "sinon": "^17.0.1", - "sinon-chai": "^4.0.0" + "sinon-chai": "^4.0.0", + "eslint": "^8.0.0" } } diff --git a/src/commandLoader.js b/src/commandLoader.js index 4dfce14..983eb54 100644 --- a/src/commandLoader.js +++ b/src/commandLoader.js @@ -1,6 +1,3 @@ -const fs = require('fs'); -const path = require('path'); - function loadCommands() { const commands = { // Primary deployment commands diff --git a/src/commands/delete.js b/src/commands/delete.js index 7eedf15..73f2e56 100644 --- a/src/commands/delete.js +++ b/src/commands/delete.js @@ -5,20 +5,21 @@ * quant delete */ -const { text, confirm, isCancel, select } = require('@clack/prompts'); +const { text, confirm, isCancel } = require('@clack/prompts'); const color = require('picocolors'); const config = require('../config'); const client = require('../quant-client'); const command = { - command: 'delete [path]', + command: 'delete ', describe: 'Delete a deployed path from Quant', builder: (yargs) => { return yargs .positional('path', { describe: 'Deployed asset path to remove', - type: 'string' + type: 'string', + demandOption: true }) .option('force', { alias: 'f', @@ -29,7 +30,6 @@ const command = { }, async promptArgs(providedArgs = {}) { - // If path is provided, skip that prompt let path = providedArgs.path; if (!path) { path = await text({ @@ -58,6 +58,15 @@ const command = { throw new Error('Operation cancelled'); } + // Check for required path argument + if (!args.path) { + const promptedArgs = await this.promptArgs(); + if (!promptedArgs) { + throw new Error('Operation cancelled'); + } + args = { ...args, ...promptedArgs }; + } + if (!await config.fromArgs(args)) { process.exit(1); } @@ -101,7 +110,7 @@ const command = { } // For actual errors - throw new Error(`Cannot delete path (${args.path}): ${err.message}`); + throw new Error(`Cannot delete path (${args.path || 'undefined'}): ${err.message}`); } } }; diff --git a/src/commands/deploy.js b/src/commands/deploy.js index 02938fe..cc54379 100644 --- a/src/commands/deploy.js +++ b/src/commands/deploy.js @@ -1,16 +1,13 @@ -const { text, confirm, isCancel, select, spinner } = require('@clack/prompts'); +const { text, confirm, isCancel } = require('@clack/prompts'); const color = require('picocolors'); const config = require('../config'); const client = require('../quant-client'); const getFiles = require('../helper/getFiles'); -const normalizePaths = require('../helper/normalizePaths'); const path = require('path'); const md5File = require('md5-file'); const { chunk } = require('../helper/array'); -const quantUrl = require('../helper/quant-url'); const revisions = require('../helper/revisions'); const isMD5Match = require('../helper/is-md5-match'); -const { sep } = require('path'); const command = { command: 'deploy [dir]', diff --git a/src/commands/file.js b/src/commands/file.js index e195e13..d0b53d7 100644 --- a/src/commands/file.js +++ b/src/commands/file.js @@ -2,7 +2,6 @@ * Deploy a single file to QuantCDN. */ const { text, isCancel } = require('@clack/prompts'); -const color = require('picocolors'); const config = require('../config'); const client = require('../quant-client'); const fs = require('fs'); diff --git a/src/commands/info.js b/src/commands/info.js index 64447b2..a9dcf8a 100644 --- a/src/commands/info.js +++ b/src/commands/info.js @@ -4,8 +4,6 @@ * @usage * quant info */ -const { isCancel } = require('@clack/prompts'); -const color = require('picocolors'); const config = require('../config'); const client = require('../quant-client'); diff --git a/src/commands/init.js b/src/commands/init.js index 606577e..764e408 100644 --- a/src/commands/init.js +++ b/src/commands/init.js @@ -1,8 +1,5 @@ -const { text, password, confirm, isCancel } = require('@clack/prompts'); -const color = require('picocolors'); +const { text } = require('@clack/prompts'); const config = require('../config'); -const client = require('../quant-client'); -const fs = require('fs'); const command = { command: 'init', diff --git a/src/commands/page.js b/src/commands/page.js index 99a8624..f26ee62 100644 --- a/src/commands/page.js +++ b/src/commands/page.js @@ -2,7 +2,6 @@ * Deploy a single index.html file to QuantCDN. */ const { text, isCancel } = require('@clack/prompts'); -const color = require('picocolors'); const config = require('../config'); const client = require('../quant-client'); const fs = require('fs'); diff --git a/src/commands/publish.js b/src/commands/publish.js index d13013c..6acd048 100644 --- a/src/commands/publish.js +++ b/src/commands/publish.js @@ -5,7 +5,6 @@ * quant publish */ const { text, isCancel } = require('@clack/prompts'); -const color = require('picocolors'); const config = require('../config'); const client = require('../quant-client'); diff --git a/src/commands/purge.js b/src/commands/purge.js index 1a6842a..aefedc7 100644 --- a/src/commands/purge.js +++ b/src/commands/purge.js @@ -4,8 +4,7 @@ * @usage * quant purge */ -const { text, confirm, isCancel, select } = require('@clack/prompts'); -const color = require('picocolors'); +const { text, confirm, isCancel } = require('@clack/prompts'); const config = require('../config'); const client = require('../quant-client'); diff --git a/src/commands/redirect.js b/src/commands/redirect.js index f71337e..2828d7c 100644 --- a/src/commands/redirect.js +++ b/src/commands/redirect.js @@ -4,10 +4,10 @@ * @usage * quant redirect [status] */ -const { text, confirm, isCancel, select } = require('@clack/prompts'); -const color = require('picocolors'); +const { text, isCancel } = require('@clack/prompts'); const config = require('../config'); const client = require('../quant-client'); +const isMD5Match = require('../helper/is-md5-match'); const command = { command: 'redirect [status]', @@ -17,11 +17,13 @@ const command = { return yargs .positional('from', { describe: 'URL to redirect from', - type: 'string' + type: 'string', + demandOption: true }) .positional('to', { describe: 'URL to redirect to', - type: 'string' + type: 'string', + demandOption: true }) .positional('status', { describe: 'HTTP status code', @@ -32,7 +34,6 @@ const command = { }, async promptArgs(providedArgs = {}) { - // If from is provided, skip that prompt let from = providedArgs.from; if (!from) { from = await text({ @@ -42,7 +43,6 @@ const command = { if (isCancel(from)) return null; } - // If to is provided, skip that prompt let to = providedArgs.to; if (!to) { to = await text({ @@ -52,7 +52,6 @@ const command = { if (isCancel(to)) return null; } - // If status is provided, skip that prompt let status = providedArgs.status; if (!status) { status = await select({ @@ -87,6 +86,9 @@ const command = { await quant.redirect(args.from, args.to, null, args.status); return `Created redirect from ${args.from} to ${args.to} (${args.status})`; } catch (err) { + if (isMD5Match(err)) { + return `Skipped redirect from ${args.from} to ${args.to} (already exists)`; + } throw new Error(`Failed to create redirect: ${err.message}`); } } diff --git a/src/commands/scan.js b/src/commands/scan.js index 346edfb..299a94b 100644 --- a/src/commands/scan.js +++ b/src/commands/scan.js @@ -1,19 +1,15 @@ /** - * Validate local file checksums. - * - * @usage - * quant scan + * Scan local files and validate checksums. */ - -const { text, confirm, isCancel, select, spinner } = require('@clack/prompts'); -const color = require('picocolors'); +const { text, confirm, isCancel } = require('@clack/prompts'); const config = require('../config'); const client = require('../quant-client'); const getFiles = require('../helper/getFiles'); const path = require('path'); const md5File = require('md5-file'); -const { chunk } = require('../helper/array'); const revisions = require('../helper/revisions'); +const color = require('picocolors'); +const { chunk } = require('../helper/array'); const command = { command: 'scan [options]', @@ -34,12 +30,6 @@ const command = { .option('skip-unpublish-regex', { describe: 'Skip the unpublish process for specific regex', type: 'string' - }) - .option('enable-index-html', { - alias: 'h', - type: 'boolean', - description: 'Keep index.html in paths when scanning', - default: false }); }, @@ -70,20 +60,10 @@ const command = { if (isCancel(skipUnpublishRegex)) return null; } - let enableIndexHtml = providedArgs['enable-index-html']; - if (typeof enableIndexHtml !== 'boolean') { - enableIndexHtml = await confirm({ - message: 'Keep index.html in paths when scanning?', - initialValue: false - }); - if (isCancel(enableIndexHtml)) return null; - } - return { 'diff-only': diffOnly, 'unpublish-only': unpublishOnly, - 'skip-unpublish-regex': skipUnpublishRegex || undefined, - 'enable-index-html': enableIndexHtml + 'skip-unpublish-regex': skipUnpublishRegex || undefined }; }, @@ -97,13 +77,12 @@ const command = { } const quant = client(config); - const dir = config.get('dir') || 'build'; - const p = path.resolve(process.cwd(), dir); + const buildDir = args.dir || config.get('dir') || 'build'; + const p = path.resolve(process.cwd(), buildDir); console.log('Fetching metadata from Quant...'); - let data; try { - data = await quant.meta(true); + await quant.meta(true); console.log('Metadata fetched successfully'); } catch (err) { throw new Error('Failed to fetch metadata from Quant'); @@ -146,9 +125,6 @@ const command = { return normalizedPath; }; - // Use enableIndexHtml setting from config if it exists - const enableIndexHtml = config.get('enableIndexHtml') ?? args['enable-index-html'] ?? false; - // Initialize revision log const projectName = config.get('project'); const revisionLogPath = path.resolve(process.cwd(), `quant-revision-log_${projectName}`); diff --git a/src/commands/unpublish.js b/src/commands/unpublish.js index 6a46177..d3f237f 100644 --- a/src/commands/unpublish.js +++ b/src/commands/unpublish.js @@ -4,31 +4,24 @@ * @usage * quant unpublish */ -const { text, confirm, isCancel } = require('@clack/prompts'); -const color = require('picocolors'); +const { text, isCancel } = require('@clack/prompts'); const config = require('../config'); const client = require('../quant-client'); const command = { - command: 'unpublish [path]', + command: 'unpublish ', describe: 'Unpublish an asset', builder: (yargs) => { return yargs .positional('path', { describe: 'Path to unpublish', - type: 'string' - }) - .option('force', { - alias: 'f', - type: 'boolean', - description: 'Skip confirmation prompt', - default: false + type: 'string', + demandOption: true }); }, async promptArgs(providedArgs = {}) { - // If path is provided, skip that prompt let path = providedArgs.path; if (!path) { path = await text({ @@ -38,18 +31,7 @@ const command = { if (isCancel(path)) return null; } - // If force is not provided, ask for confirmation - if (!providedArgs.force) { - const shouldUnpublish = await confirm({ - message: 'Are you sure you want to unpublish this asset?', - initialValue: false, - active: 'Yes', - inactive: 'No' - }); - if (isCancel(shouldUnpublish) || !shouldUnpublish) return null; - } - - return { path, force: providedArgs.force }; + return { path }; }, async handler(args) { @@ -57,6 +39,14 @@ const command = { throw new Error('Operation cancelled'); } + if (!args.path) { + const promptedArgs = await this.promptArgs(); + if (!promptedArgs) { + throw new Error('Operation cancelled'); + } + args = { ...args, ...promptedArgs }; + } + if (!await config.fromArgs(args)) { process.exit(1); } @@ -65,16 +55,18 @@ const command = { try { await quant.unpublish(args.path); - return 'Unpublished successfully'; + return `Successfully unpublished [${args.path}]`; } catch (err) { - // Check for already unpublished message - if (err.response?.data?.errorMsg?.includes('already unpublished') || - err.response?.data?.errorMsg?.includes('not published')) { - return color.dim(`Path [${args.path}] is already unpublished`); + // Format a user-friendly error message + if (err.response?.status === 404) { + throw new Error(`Path [${args.path}] not found`); } - // For other errors, show the full response - throw new Error(`Failed to unpublish: ${err.message}\nResponse: ${JSON.stringify(err.response?.data, null, 2)}`); + // Try to extract error message from response + const errorMessage = err.response?.data?.errorMsg || err.message; + const responseData = err.response?.data ? JSON.stringify(err.response.data, null, 2) : 'No response data'; + + throw new Error(`Failed to unpublish: ${errorMessage}\nResponse: ${responseData}`); } } }; diff --git a/src/commands/waflogs.js b/src/commands/waflogs.js index 8cf979a..b6d4445 100644 --- a/src/commands/waflogs.js +++ b/src/commands/waflogs.js @@ -1,19 +1,15 @@ /** - * Provides access to the WAF logs for a project. + * Access WAF logs. * * @usage - * quant waf-logs + * quant waflogs */ - -const { text, confirm, isCancel, select } = require('@clack/prompts'); -const color = require('picocolors'); +const { text, confirm, isCancel } = require('@clack/prompts'); const config = require('../config'); const client = require('../quant-client'); -const papa = require('papaparse'); -const fs = require('fs'); const command = { - command: 'waf:logs', + command: 'waflogs', describe: 'Access project WAF logs', builder: (yargs) => { diff --git a/src/quant-client.js b/src/quant-client.js index 129febc..4263056 100644 --- a/src/quant-client.js +++ b/src/quant-client.js @@ -3,13 +3,11 @@ */ const axios = require("axios"); -const util = require("util"); const fs = require("fs"); const path = require("path"); const mime = require("mime-types"); const querystring = require("querystring"); const quantURL = require("./helper/quant-url"); -const config = require('./config'); module.exports = function (config) { // Set up headers with correct Quant header names @@ -56,7 +54,7 @@ module.exports = function (config) { // If this is an error response, format it if (response.isAxiosError) { const errorData = response.response && response.response.data ? response.response.data : {}; - throw new Error(formatError(response)); + throw new Error(formatError(errorData)); } const body = @@ -87,21 +85,6 @@ module.exports = function (config) { return body; }; - // Helper function to format error message - function formatErrorMessage(error) { - if (error.response) { - // The request was made and the server responded with a status code - // that falls out of the range of 2xx - return `${error.message}\nResponse: ${JSON.stringify(error.response.data, null, 2)}`; - } else if (error.request) { - // The request was made but no response was received - return `No response received: ${error.message}`; - } else { - // Something happened in setting up the request that triggered an Error - return error.message; - } - } - // Add this helper function for consistent error handling function formatError(error) { if (error.response && error.response.data) { @@ -146,7 +129,7 @@ module.exports = function (config) { * @TODO * - Async iterator for memory 21k items ~ 40mb. */ - meta: async function (unfold = false, exclude = true, extend = {}) { + meta: async function (unfold = false, _exclude = true, extend = {}) { const records = []; const query = Object.assign( { @@ -360,7 +343,7 @@ module.exports = function (config) { file: async function ( local, location, - absolute = false, + _absolute = false, extraHeaders = {}, skipPurge = false, ) { @@ -730,7 +713,7 @@ module.exports = function (config) { * @return {object} * A list of all WAF logs. */ - wafLogs: async function (all = false, options = {}) { + wafLogs: async function (_all = false, options = {}) { try { const response = await get(`${config.get('endpoint')}/waf/logs`, { headers, From 0ecd435f520e4d344e6064e1187b003130b96844 Mon Sep 17 00:00:00 2001 From: Stuart Rowlands Date: Mon, 25 Nov 2024 14:21:49 +1000 Subject: [PATCH 23/41] Fixed file+page with positional args --- src/commands/file.js | 22 ++++++++++++++-------- src/commands/page.js | 22 ++++++++++++++-------- 2 files changed, 28 insertions(+), 16 deletions(-) diff --git a/src/commands/file.js b/src/commands/file.js index d0b53d7..7db937f 100644 --- a/src/commands/file.js +++ b/src/commands/file.js @@ -27,18 +27,24 @@ const command = { .example('quant file image.jpg /images/header.jpg', 'Deploy an image'); }, - async promptArgs() { - const file = await text({ - message: 'Enter path to local file', + async promptArgs(providedArgs = {}) { + let file = providedArgs.file; + if (!file) { + file = await text({ + message: 'Enter path to local file', validate: value => !value ? 'File path is required' : undefined - }); - if (isCancel(file)) return null; + }); + if (isCancel(file)) return null; + } - const location = await text({ + let location = providedArgs.location; + if (!location) { + location = await text({ message: 'Enter the access URI (where the file will be available)', validate: value => !value ? 'Location is required' : undefined - }); - if (isCancel(location)) return null; + }); + if (isCancel(location)) return null; + } return { file, location }; }, diff --git a/src/commands/page.js b/src/commands/page.js index f26ee62..5c2a45a 100644 --- a/src/commands/page.js +++ b/src/commands/page.js @@ -31,18 +31,24 @@ const command = { .example('quant page about.html /about --enable-index-html', 'Deploy with index.html suffix'); }, - async promptArgs() { - const file = await text({ - message: 'Enter path to local HTML file', + async promptArgs(providedArgs = {}) { + let file = providedArgs.file; + if (!file) { + file = await text({ + message: 'Enter path to local HTML file', validate: value => !value ? 'File path is required' : undefined - }); - if (isCancel(file)) return null; + }); + if (isCancel(file)) return null; + } - const location = await text({ + let location = providedArgs.location; + if (!location) { + location = await text({ message: 'Enter the access URI (where the page will be available)', validate: value => !value ? 'Location is required' : undefined - }); - if (isCancel(location)) return null; + }); + if (isCancel(location)) return null; + } return { file, location }; }, From 5f7931ec79ef5add88ec3e69bc782612d30f19b6 Mon Sep 17 00:00:00 2001 From: Stuart Rowlands Date: Mon, 25 Nov 2024 15:02:32 +1000 Subject: [PATCH 24/41] Added missing .eslintrc files. Added support for edge function/filter/auth. --- .eslintrc.js | 23 +++++++ src/commandLoader.js | 15 ++++- src/commands/function.js | 96 +++++++++++++++++++++++++++ src/commands/function_auth.js | 101 ++++++++++++++++++++++++++++ src/commands/function_filter.js | 101 ++++++++++++++++++++++++++++ src/helper/validate-uuid.js | 17 +++++ src/quant-client.js | 114 ++++++++++++++++++++++++++++++++ tests/.eslintrc.js | 30 +++++++++ 8 files changed, 496 insertions(+), 1 deletion(-) create mode 100644 .eslintrc.js create mode 100644 src/commands/function.js create mode 100644 src/commands/function_auth.js create mode 100644 src/commands/function_filter.js create mode 100644 src/helper/validate-uuid.js create mode 100644 tests/.eslintrc.js diff --git a/.eslintrc.js b/.eslintrc.js new file mode 100644 index 0000000..4dac8af --- /dev/null +++ b/.eslintrc.js @@ -0,0 +1,23 @@ +module.exports = { + files: ['**/*.js'], + languageOptions: { + ecmaVersion: 2022, + sourceType: 'module', + globals: { + process: 'readonly', + require: 'readonly', + module: 'readonly', + __dirname: 'readonly', + __filename: 'readonly', + Buffer: 'readonly', + console: 'readonly' + } + }, + rules: { + 'no-console': 'off', + 'no-unused-vars': ['error', { + 'argsIgnorePattern': '^_', + 'varsIgnorePattern': '^_' + }] + } +}; \ No newline at end of file diff --git a/src/commandLoader.js b/src/commandLoader.js index 983eb54..2f5bc46 100644 --- a/src/commandLoader.js +++ b/src/commandLoader.js @@ -10,6 +10,11 @@ function loadCommands() { 'search': require('./commands/search'), 'scan': require('./commands/scan'), + // Edge functions + 'function': require('./commands/function'), + 'filter': require('./commands/function_filter'), + 'auth': require('./commands/function_auth'), + // Destructive operations 'unpublish': require('./commands/unpublish'), 'delete': require('./commands/delete'), @@ -37,12 +42,20 @@ function getCommandOptions() { // Visual separator { value: 'separator1', label: '───────────────────────', disabled: true }, + // Edge functions + { value: 'function', label: 'Deploy an edge function' }, + { value: 'filter', label: 'Deploy an edge filter' }, + { value: 'auth', label: 'Deploy an edge auth function' }, + + // Visual separator + { value: 'separator2', label: '───────────────────────', disabled: true }, + // Destructive operations { value: 'unpublish', label: 'Unpublish an asset' }, { value: 'delete', label: 'Delete an asset' }, // Visual separator - { value: 'separator2', label: '───────────────────────', disabled: true }, + { value: 'separator3', label: '───────────────────────', disabled: true }, // Project management { value: 'info', label: 'Show project info' }, diff --git a/src/commands/function.js b/src/commands/function.js new file mode 100644 index 0000000..6fc46c0 --- /dev/null +++ b/src/commands/function.js @@ -0,0 +1,96 @@ +/** + * Deploy an edge function. + * + * @usage + * quant function [uuid] + */ +const { text, isCancel } = require('@clack/prompts'); +const config = require('../config'); +const client = require('../quant-client'); +const fs = require('fs'); +const { validateUUID } = require('../helper/validate-uuid'); + +const command = { + command: 'function [uuid]', + describe: 'Deploy an edge function', + + builder: (yargs) => { + return yargs + .positional('file', { + describe: 'Path to function file', + type: 'string', + demandOption: true + }) + .positional('description', { + describe: 'Description of the function', + type: 'string', + demandOption: true + }) + .positional('uuid', { + describe: 'UUID of existing function to update', + type: 'string', + coerce: value => { + if (value && !validateUUID(value)) { + throw new Error('Invalid UUID format'); + } + return value; + } + }) + .example('quant function handler.js "My edge function"', 'Deploy a new function') + .example('quant function handler.js "Updated function" 019361ae-2516-788a-8f50-e803ff561c34', 'Update existing function'); + }, + + async promptArgs(providedArgs = {}) { + let file = providedArgs.file; + if (!file) { + file = await text({ + message: 'Enter path to function file', + validate: value => !value ? 'File path is required' : undefined + }); + if (isCancel(file)) return null; + } + + let description = providedArgs.description; + if (!description) { + description = await text({ + message: 'Enter function description', + validate: value => !value ? 'Description is required' : undefined + }); + if (isCancel(description)) return null; + } + + let uuid = providedArgs.uuid; + if (uuid === undefined) { + uuid = await text({ + message: 'Enter UUID to update (optional)', + }); + if (isCancel(uuid)) return null; + } + + return { file, description, uuid: uuid || null }; + }, + + async handler(args) { + if (!args) { + throw new Error('Operation cancelled'); + } + + if (!await config.fromArgs(args)) { + process.exit(1); + } + + const quant = client(config); + + try { + const response = await quant.edgeFunction(args.file, args.description, args.uuid); + if (args.uuid) { + return `Updated edge function [${args.uuid}]`; + } + return `Created edge function [${response.uuid}]`; + } catch (err) { + throw new Error(`Failed to deploy edge function: ${err.message}`); + } + } +}; + +module.exports = command; \ No newline at end of file diff --git a/src/commands/function_auth.js b/src/commands/function_auth.js new file mode 100644 index 0000000..9e815a6 --- /dev/null +++ b/src/commands/function_auth.js @@ -0,0 +1,101 @@ +/** + * Deploy an edge auth function. + * + * @usage + * quant auth [uuid] + */ +const { text, isCancel } = require('@clack/prompts'); +const config = require('../config'); +const client = require('../quant-client'); +const fs = require('fs'); +const { validateUUID } = require('../helper/validate-uuid'); + +const command = { + command: 'auth [uuid]', + describe: 'Deploy an edge auth function', + + builder: (yargs) => { + return yargs + .positional('file', { + describe: 'Path to auth function file', + type: 'string', + demandOption: true + }) + .positional('description', { + describe: 'Description of the auth function', + type: 'string', + demandOption: true + }) + .positional('uuid', { + describe: 'UUID of existing auth function to update', + type: 'string', + coerce: value => { + if (value && !validateUUID(value)) { + throw new Error('Invalid UUID format'); + } + return value; + } + }) + .example('quant auth auth.js "My auth function"', 'Deploy a new auth function') + .example('quant auth auth.js "Updated auth" 019361ae-2516-788a-8f50-e803ff561c34', 'Update existing auth function'); + }, + + async promptArgs(providedArgs = {}) { + let file = providedArgs.file; + if (!file) { + file = await text({ + message: 'Enter path to auth function file', + validate: value => !value ? 'File path is required' : undefined + }); + if (isCancel(file)) return null; + } + + let description = providedArgs.description; + if (!description) { + description = await text({ + message: 'Enter auth function description', + validate: value => !value ? 'Description is required' : undefined + }); + if (isCancel(description)) return null; + } + + let uuid = providedArgs.uuid; + if (uuid === undefined) { + uuid = await text({ + message: 'Enter UUID to update (optional)', + validate: value => { + if (!value) return undefined; // Allow empty for new functions + if (!validateUUID(value)) return 'Invalid UUID format'; + return undefined; + } + }); + if (isCancel(uuid)) return null; + } + + return { file, description, uuid: uuid || null }; + }, + + async handler(args) { + if (!args) { + throw new Error('Operation cancelled'); + } + + if (!await config.fromArgs(args)) { + process.exit(1); + } + + const quant = client(config); + + try { + const response = await quant.edgeAuth(args.file, args.description, args.uuid); + if (args.uuid) { + return `Updated edge auth function [${args.uuid}]`; + } + return `Created edge auth function [${response.uuid}]`; + } catch (err) { + throw new Error(`Failed to deploy edge auth function: ${err.message}`); + } + } +}; + +module.exports = command; \ No newline at end of file diff --git a/src/commands/function_filter.js b/src/commands/function_filter.js new file mode 100644 index 0000000..6ef529d --- /dev/null +++ b/src/commands/function_filter.js @@ -0,0 +1,101 @@ +/** + * Deploy an edge filter function. + * + * @usage + * quant filter [uuid] + */ +const { text, isCancel } = require('@clack/prompts'); +const config = require('../config'); +const client = require('../quant-client'); +const fs = require('fs'); +const { validateUUID } = require('../helper/validate-uuid'); + +const command = { + command: 'filter [uuid]', + describe: 'Deploy an edge filter function', + + builder: (yargs) => { + return yargs + .positional('file', { + describe: 'Path to filter function file', + type: 'string', + demandOption: true + }) + .positional('description', { + describe: 'Description of the filter', + type: 'string', + demandOption: true + }) + .positional('uuid', { + describe: 'UUID of existing filter to update', + type: 'string', + coerce: value => { + if (value && !validateUUID(value)) { + throw new Error('Invalid UUID format'); + } + return value; + } + }) + .example('quant filter filter.js "My edge filter"', 'Deploy a new filter') + .example('quant filter filter.js "Updated filter" 019361ae-2516-788a-8f50-e803ff561c34', 'Update existing filter'); + }, + + async promptArgs(providedArgs = {}) { + let file = providedArgs.file; + if (!file) { + file = await text({ + message: 'Enter path to filter function file', + validate: value => !value ? 'File path is required' : undefined + }); + if (isCancel(file)) return null; + } + + let description = providedArgs.description; + if (!description) { + description = await text({ + message: 'Enter filter description', + validate: value => !value ? 'Description is required' : undefined + }); + if (isCancel(description)) return null; + } + + let uuid = providedArgs.uuid; + if (uuid === undefined) { + uuid = await text({ + message: 'Enter UUID to update (optional)', + validate: value => { + if (!value) return undefined; // Allow empty for new functions + if (!validateUUID(value)) return 'Invalid UUID format'; + return undefined; + } + }); + if (isCancel(uuid)) return null; + } + + return { file, description, uuid: uuid || null }; + }, + + async handler(args) { + if (!args) { + throw new Error('Operation cancelled'); + } + + if (!await config.fromArgs(args)) { + process.exit(1); + } + + const quant = client(config); + + try { + const response = await quant.edgeFilter(args.file, args.description, args.uuid); + if (args.uuid) { + return `Updated edge filter [${args.uuid}]`; + } + return `Created edge filter [${response.uuid}]`; + } catch (err) { + throw new Error(`Failed to deploy edge filter: ${err.message}`); + } + } +}; + +module.exports = command; \ No newline at end of file diff --git a/src/helper/validate-uuid.js b/src/helper/validate-uuid.js new file mode 100644 index 0000000..6796ee7 --- /dev/null +++ b/src/helper/validate-uuid.js @@ -0,0 +1,17 @@ +/** + * UUID validation helper + * + * @param {string} uuid - The UUID to validate + * @returns {boolean} - True if valid UUID, false otherwise + */ +const UUID_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[4-7][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i; + +function validateUUID(uuid) { + if (!uuid) return true; // Allow empty for new functions + return UUID_REGEX.test(uuid); +} + +module.exports = { + validateUUID, + UUID_REGEX +}; \ No newline at end of file diff --git a/src/quant-client.js b/src/quant-client.js index 4263056..9d518e3 100644 --- a/src/quant-client.js +++ b/src/quant-client.js @@ -755,5 +755,119 @@ module.exports = function (config) { throw error; } }, + + /** + * Create or update an edge function. + * + * @param {string} file - Path to the function file + * @param {string} description - Description of the function + * @param {string} [uuid] - Optional UUID for updating existing function + * @returns {object} Response from the API + */ + edgeFunction: async function(file, description, uuid = null) { + if (!description) { + throw new Error("Description is required for edge functions"); + } + + if (!Buffer.isBuffer(file)) { + if (!fs.existsSync(file)) { + throw new Error("Function file is not accessible."); + } + file = fs.readFileSync(file, 'utf8'); + } + + const body = { + content: file.toString(), + published: true, + desc: description + }; + + if (uuid) { + body.uuid = uuid; + } + + try { + const response = await post(`${config.get('endpoint')}/functions`, body, { headers }); + return handleResponse(response); + } catch (error) { + throw error; + } + }, + + /** + * Create or update an edge filter function. + * + * @param {string} file - Path to the filter function file + * @param {string} description - Description of the filter + * @param {string} [uuid] - Optional UUID for updating existing filter + * @returns {object} Response from the API + */ + edgeFilter: async function(file, description, uuid = null) { + if (!description) { + throw new Error("Description is required for edge filters"); + } + + if (!Buffer.isBuffer(file)) { + if (!fs.existsSync(file)) { + throw new Error("Filter function file is not accessible."); + } + file = fs.readFileSync(file, 'utf8'); + } + + const body = { + content: file.toString(), + published: true, + desc: description + }; + + if (uuid) { + body.uuid = uuid; + } + + try { + const response = await post(`${config.get('endpoint')}/functions/filter`, body, { headers }); + return handleResponse(response); + } catch (error) { + throw error; + } + }, + + /** + * Create or update an edge auth function. + * + * @param {string} file - Path to the auth function file + * @param {string} description - Description of the auth function + * @param {string} [uuid] - Optional UUID for updating existing auth function + * @returns {object} Response from the API + */ + edgeAuth: async function(file, description, uuid = null) { + if (!description) { + throw new Error("Description is required for auth functions"); + } + + if (!Buffer.isBuffer(file)) { + if (!fs.existsSync(file)) { + throw new Error("Auth function file is not accessible."); + } + file = fs.readFileSync(file, 'utf8'); + } + + const body = { + content: file.toString(), + published: true, + desc: description + }; + + if (uuid) { + body.uuid = uuid; + } + + try { + const response = await post(`${config.get('endpoint')}/functions/auth`, body, { headers }); + return handleResponse(response); + } catch (error) { + throw error; + } + } }; }; diff --git a/tests/.eslintrc.js b/tests/.eslintrc.js new file mode 100644 index 0000000..658df8f --- /dev/null +++ b/tests/.eslintrc.js @@ -0,0 +1,30 @@ +module.exports = { + files: ['**/*.{js,mjs}'], + languageOptions: { + ecmaVersion: 2022, + sourceType: 'module', + globals: { + process: 'readonly', + require: 'readonly', + module: 'readonly', + __dirname: 'readonly', + __filename: 'readonly', + Buffer: 'readonly', + console: 'readonly', + // Mocha globals + describe: 'readonly', + it: 'readonly', + before: 'readonly', + after: 'readonly', + beforeEach: 'readonly', + afterEach: 'readonly' + } + }, + rules: { + 'no-console': 'off', + 'no-unused-vars': ['error', { + 'argsIgnorePattern': '^_', + 'varsIgnorePattern': '^_' + }] + } +}; \ No newline at end of file From affa4b97c2ad4ca505903759750da7e5507729bf Mon Sep 17 00:00:00 2001 From: Stuart Rowlands Date: Mon, 25 Nov 2024 15:14:44 +1000 Subject: [PATCH 25/41] Linting fixes --- .github/workflows/ci.yml | 2 +- cli.js | 2 +- src/commands/function.js | 1 - src/commands/function_auth.js | 1 - src/commands/function_filter.js | 1 - tests/mocks/quant-client.mjs | 2 +- tests/unit/commands/deploy.test.mjs | 6 +++--- tests/unit/commands/file.test.mjs | 8 ++++---- tests/unit/commands/page.test.mjs | 4 ++-- 9 files changed, 12 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3f63a51..d6c42de 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: strategy: matrix: - node-version: [16.x, 18.x] + node-version: [18.x, 20.x] steps: - uses: actions/checkout@v3 diff --git a/cli.js b/cli.js index 582d74a..e0c37e8 100755 --- a/cli.js +++ b/cli.js @@ -1,6 +1,6 @@ #!/usr/bin/env node -const { intro, outro, text, password, select, confirm, isCancel, spinner } = require('@clack/prompts'); +const { intro, outro, select, confirm, isCancel, spinner } = require('@clack/prompts'); const color = require('picocolors'); const { getCommandOptions, getCommand } = require('./src/commandLoader'); const config = require('./src/config'); diff --git a/src/commands/function.js b/src/commands/function.js index 6fc46c0..f3bab99 100644 --- a/src/commands/function.js +++ b/src/commands/function.js @@ -7,7 +7,6 @@ const { text, isCancel } = require('@clack/prompts'); const config = require('../config'); const client = require('../quant-client'); -const fs = require('fs'); const { validateUUID } = require('../helper/validate-uuid'); const command = { diff --git a/src/commands/function_auth.js b/src/commands/function_auth.js index 9e815a6..57d73b1 100644 --- a/src/commands/function_auth.js +++ b/src/commands/function_auth.js @@ -7,7 +7,6 @@ const { text, isCancel } = require('@clack/prompts'); const config = require('../config'); const client = require('../quant-client'); -const fs = require('fs'); const { validateUUID } = require('../helper/validate-uuid'); const command = { diff --git a/src/commands/function_filter.js b/src/commands/function_filter.js index 6ef529d..042e8f8 100644 --- a/src/commands/function_filter.js +++ b/src/commands/function_filter.js @@ -7,7 +7,6 @@ const { text, isCancel } = require('@clack/prompts'); const config = require('../config'); const client = require('../quant-client'); -const fs = require('fs'); const { validateUUID } = require('../helper/validate-uuid'); const command = { diff --git a/tests/mocks/quant-client.mjs b/tests/mocks/quant-client.mjs index 40a3dab..f9a3906 100644 --- a/tests/mocks/quant-client.mjs +++ b/tests/mocks/quant-client.mjs @@ -1,7 +1,7 @@ /** * Mock Quant client for testing. */ -export default function (config) { +export default function (_config) { const history = { get: [], post: [], diff --git a/tests/unit/commands/deploy.test.mjs b/tests/unit/commands/deploy.test.mjs index 7f4a6cb..6bbdf75 100644 --- a/tests/unit/commands/deploy.test.mjs +++ b/tests/unit/commands/deploy.test.mjs @@ -1,7 +1,7 @@ import { expect } from 'chai'; import sinon from 'sinon'; -import fs from 'fs'; -import path from 'path'; +import _fs from 'fs'; +import _path from 'path'; import mockClient from '../../mocks/quant-client.mjs'; const deploy = (await import('../../../src/commands/deploy.js')).default; @@ -212,7 +212,7 @@ describe('Deploy Command', () => { it('should handle config fromArgs failure', async () => { const exit = process.exit; - process.exit = (code) => { + process.exit = (_code) => { process.exit = exit; throw new Error('Process exited with code 1'); }; diff --git a/tests/unit/commands/file.test.mjs b/tests/unit/commands/file.test.mjs index f33ccd8..b3c75bb 100644 --- a/tests/unit/commands/file.test.mjs +++ b/tests/unit/commands/file.test.mjs @@ -1,6 +1,6 @@ import { expect } from 'chai'; -import fs from 'fs'; -import path from 'path'; +import _fs from 'fs'; +import _path from 'path'; import sinon from 'sinon'; import mockClient from '../../mocks/quant-client.mjs'; @@ -158,8 +158,8 @@ describe('File Command', () => { it('should handle config fromArgs failure', async function() { const exit = process.exit; - process.exit = (code) => { - process.exit = exit; // Restore immediately + process.exit = (_code) => { + process.exit = exit; throw new Error('Process exited with code 1'); }; diff --git a/tests/unit/commands/page.test.mjs b/tests/unit/commands/page.test.mjs index 7895bb8..f25a220 100644 --- a/tests/unit/commands/page.test.mjs +++ b/tests/unit/commands/page.test.mjs @@ -1,7 +1,7 @@ import { expect } from 'chai'; import sinon from 'sinon'; -import fs from 'fs'; -import path from 'path'; +import _fs from 'fs'; +import _path from 'path'; import mockClient from '../../mocks/quant-client.mjs'; const page = (await import('../../../src/commands/page.js')).default; From 6064e7d6327d4935f4beffc2b272c99c1393363c Mon Sep 17 00:00:00 2001 From: Stuart Rowlands Date: Mon, 25 Nov 2024 15:35:48 +1000 Subject: [PATCH 26/41] Removed old tests --- test/client.test.js | 912 --------------------------- test/commands/deploy.test.js | 160 ----- test/config.test.js | 124 ---- test/fixtures/index.html | 37 -- test/fixtures/nala.jpg | Bin 69301 -> 0 bytes test/fixtures/responsive-images.html | 39 -- test/fixtures/sample/nala.jpg | Bin 69301 -> 0 bytes test/fixtures/some-file-path.html | 31 - test/fixtures/test.css | 3 - test/fixtures/test.js | 0 test/helper/getFiles.test.js | 44 -- test/helper/normalizePath.test.js | 30 - test/helper/quant-url.js | 40 -- 13 files changed, 1420 deletions(-) delete mode 100644 test/client.test.js delete mode 100644 test/commands/deploy.test.js delete mode 100644 test/config.test.js delete mode 100644 test/fixtures/index.html delete mode 100644 test/fixtures/nala.jpg delete mode 100644 test/fixtures/responsive-images.html delete mode 100644 test/fixtures/sample/nala.jpg delete mode 100644 test/fixtures/some-file-path.html delete mode 100644 test/fixtures/test.css delete mode 100644 test/fixtures/test.js delete mode 100644 test/helper/getFiles.test.js delete mode 100644 test/helper/normalizePath.test.js delete mode 100644 test/helper/quant-url.js diff --git a/test/client.test.js b/test/client.test.js deleted file mode 100644 index 24721cb..0000000 --- a/test/client.test.js +++ /dev/null @@ -1,912 +0,0 @@ -/** - * Test the Quant client. - */ - -const client = require('../src/quant-client'); -const config = require('../src/config'); - -// Stubbable. -const axios = require('axios'); -const fs = require('fs'); - -const headers = { - 'User-Agent': 'Quant (+http://api.quantcdn.io)', - 'Quant-Token': 'test', - 'Quant-Customer': 'dev', - 'Quant-Organisation': 'dev', - 'Quant-Project': 'test', - 'Content-Type': 'application/json', -}; - -describe('Quant Client', function () { - let cget; - let requestGet; - let requestPost; - let requestPatch; - - let chai, sinon, assert, expect; - - beforeEach(async () => { - chai = await import('chai'); - sinon = await import('sinon'); - assert = chai.assert; - expect = chai.expect; - - cget = sinon.stub(config, 'get'); - cget.withArgs('endpoint').returns('http://localhost:8081'); - cget.withArgs('clientid').returns('dev'); - cget.withArgs('token').returns('test'); - cget.withArgs('project').returns('test'); - }); - - afterEach(function () { - cget.restore(); - sinon.restore(); - }); - - describe('GET /ping', function () { - afterEach(function () { - requestGet.restore(); - }); - - it('should return a valid project', async function () { - const response = { - status: 200, - data: { - error: false, - project: 'test', - }, - headers: {}, - config: {}, - request: {}, - }; - - requestGet = sinon.stub(axios, 'get').resolves(response); - - const data = await client(config).ping(); - - assert.hasAnyKeys(data, 'project'); - assert.equal(data.project, 'test'); - expect(requestGet.calledOnceWith('http://localhost:8081/ping', { headers })).to.be.true; - }); - - it('should handle error responses', async function () { - const response = { - status: 403, - data: { - error: true, - errorMsg: 'Forbidden', - }, - headers: {}, - config: {}, - request: {}, - }; - - requestPost = sinon.stub(axios, 'get').resolves(response); - - try { - await client(config).ping(); - } catch (err) { - assert.ok(true); - expect(requestGet.calledOnceWith('http://localhost:8081/ping', { headers })).to.be.true; - assert.typeOf(err, 'Error'); - assert.equal(err.message, 'Forbidden'); - return; - } - - assert.fail('Ping did not raise the error'); - }); - }); - - describe('POST /', function () { - let file; - let fr; - - beforeEach(function () { - // Set the directory so we can test for path inference. - cget.withArgs('dir').returns(process.cwd() + '/test/fixtures'); - file = sinon.stub(fs, 'createReadStream').returns({}); - fr = sinon.stub(fs, 'readFileSync').returns(''); - }); - - afterEach(function () { - requestPost.restore(); - file.restore(); - fr.restore(); - }); - - describe('send', function () { - it('should accept index.html files', async function () { - const response = { - status: 200, - data: { - quant_revision: 1, - md5: 'da697d6f9a318fe26d2dd75a6b123df0', - quant_filename: 'index.html', - errorMsg: '', - error: false, - }, - headers: {}, - config: {}, - request: {}, - }; - - requestPost = sinon.stub(axios, 'post').resolves(response); - - await client(config) - .send('test/fixtures/index.html', false, true, false, true, true); - - expect( - requestPost.calledOnceWith( - 'http://localhost:8081', - { - url: '/index.html', - find_attachments: false, - content: '', - published: true - }, - { - headers: { - 'User-Agent': 'Quant (+http://api.quantcdn.io)', - 'Quant-Token': 'test', - 'Quant-Customer': 'dev', - 'Quant-Organisation': 'dev', - 'Quant-Project': 'test', - 'Content-Type': 'application/json', - 'Quant-Skip-Purge': 'true' - } - } - ) - ).to.be.true; - }); - - it('should accept custom headers', async function () { - const response = { - status: 200, - data: { - quant_revision: 1, - md5: 'da697d6f9a318fe26d2dd75a6b123df0', - quant_filename: 'index.html', - errorMsg: '', - error: false, - }, - headers: {}, - config: {}, - request: {}, - }; - - requestPost = sinon.stub(axios, 'post').resolves(response) - - await client(config) - .send('test/fixtures/index.html', 'test/fixtures', true, false, false, false, { test: 'headers' }); - - expect( - requestPost.calledOnceWith( - 'http://localhost:8081', - { - url: '/test/fixtures', - find_attachments: false, - content: '', - published: true, - headers: { 'test': 'headers' }, - }, - { - headers: { - 'User-Agent': 'Quant (+http://api.quantcdn.io)', - 'Quant-Token': 'test', - 'Quant-Customer': 'dev', - 'Quant-Organisation': 'dev', - 'Quant-Project': 'test', - 'Content-Type': 'application/json', - } - }, - ) - ).to.be.true; - }); - - it('should find attachments', async function () { - const response = { - status: 200, - data: { - quant_revision: 1, - md5: 'da697d6f9a318fe26d2dd75a6b123df0', - quant_filename: 'index.html', - errorMsg: '', - error: false, - }, - headers: {}, - config: {}, - request: {}, - }; - - requestPost = sinon.stub(axios, 'post').resolves(response) - - await client(config).send('test/fixtures/index.html', 'test/fixtures/index.html', true, true); - - expect( - requestPost.calledOnceWith( - 'http://localhost:8081', - { - url: '/test/fixtures', - find_attachments: true, - content: '', - published: true, - }, - { - headers: { - 'User-Agent': 'Quant (+http://api.quantcdn.io)', - 'Quant-Token': 'test', - 'Quant-Customer': 'dev', - 'Quant-Organisation': 'dev', - 'Quant-Project': 'test', - 'Content-Type': 'application/json', - } - }, - ) - ).to.be.true; - }); - - it('should accept a location', async function () { - const response = { - status: 200, - data: { - quant_revision: 1, - md5: 'da697d6f9a318fe26d2dd75a6b123df0', - quant_filename: 'index.html', - errorMsg: '', - error: false, - }, - headers: {}, - config: {}, - request: {}, - }; - - requestPost = sinon.stub(axios, 'post').resolves(response) - - await client(config).send('test/fixtures/index.html', 'test/index.html'); - - expect( - requestPost.calledOnceWith( - 'http://localhost:8081', - { - url: '/test', - find_attachments: false, - content: '', - published: true - }, - { - headers: { - 'User-Agent': 'Quant (+http://api.quantcdn.io)', - 'Quant-Token': 'test', - 'Quant-Customer': 'dev', - 'Quant-Organisation': 'dev', - 'Quant-Project': 'test', - 'Content-Type': 'application/json' - } - } - ) - ).to.be.true; - }); - - it('should accept published status', async function () { - const response = { - status: 200, - data: { - quant_revision: 1, - md5: 'da697d6f9a318fe26d2dd75a6b123df0', - quant_filename: 'index.html', - errorMsg: '', - error: false, - }, - headers: {}, - config: {}, - request: {}, - }; - - requestPost = sinon.stub(axios, 'post').resolves(response); - - await client(config).send('test/fixtures/index.html', 'test/index.html', false); - - expect( - requestPost.calledOnceWith( - 'http://localhost:8081', - { - url: '/test', - find_attachments: false, - content: '', - published: false, - }, - { - headers: { - 'User-Agent': 'Quant (+http://api.quantcdn.io)', - 'Quant-Token': 'test', - 'Quant-Customer': 'dev', - 'Quant-Organisation': 'dev', - 'Quant-Project': 'test', - 'Content-Type': 'application/json', - } - } - ) - ).to.be.true; - }); - - it('should accept html files', async function () { - const response = { - status: 200, - data: { - quant_revision: 1, - md5: 'da697d6f9a318fe26d2dd75a6b123df0', - quant_filename: 'index.html', - errorMsg: '', - error: false, - }, - headers: {}, - config: {}, - request: {}, - }; - - requestPost = sinon.stub(axios, 'post').resolves(response); - - await client(config).send('test/fixtures/some-file-path.html'); - - // Expect the post for the redirect. - expect( - requestPost.calledWith( - 'http://localhost:8081', - { - url: '/some-file-path.html', - find_attachments: false, - content: '', - published: true - }, - { - headers: { - 'User-Agent': 'Quant (+http://api.quantcdn.io)', - 'Quant-Token': 'test', - 'Quant-Customer': 'dev', - 'Quant-Organisation': 'dev', - 'Quant-Project': 'test', - 'Content-Type': 'application/json' - } - } - ) - ).to.be.true; - }); - - it('should accept files', async function () { - const response = { - status: 200, - data: { - quant_revision: 1, - md5: 'da697d6f9a318fe26d2dd75a6b123df0', - quant_filename: 'nala.jpg', - errorMsg: '', - error: false, - }, - headers: {}, - config: {}, - request: {}, - }; - requestPost = sinon.stub(axios, 'post').resolves(response) - - const data = await client(config).file('test/fixtures/nala.jpg'); - - expect( - requestPost.calledOnceWith( - 'http://localhost:8081', - { data: {} }, - { - headers: { - ...headers, - 'Content-Type': 'multipart/form-data', - 'Quant-File-Url': '/nala.jpg', - } - } - ) - ).to.be.true; - assert.equal(data, response.data); - }); - }); - - describe('markup', function () { - it('should accept an index.html', async function () { - const response = { - status: 200, - data: { - quant_revision: 1, - md5: 'da697d6f9a318fe26d2dd75a6b123df0', - quant_filename: 'index.html', - errorMsg: '', - error: false, - }, - headers: {}, - config: {}, - request: {}, - }; - requestPost = sinon.stub(axios, 'post').resolves(response); - - const data = await client(config).markup('test/fixtures/index.html'); - - expect( - requestPost.calledOnceWith( - 'http://localhost:8081', - { url: '/index.html', content: '', published: true, find_attachments: false }, - { - headers: { - 'User-Agent': 'Quant (+http://api.quantcdn.io)', - 'Quant-Token': 'test', - 'Quant-Customer': 'dev', - 'Quant-Organisation': 'dev', - 'Quant-Project': 'test', - 'Content-Type': 'application/json', - } - } - ) - ).to.be.true; - assert.equal(data, response.data); - }); - it('should not accept other file types', async function () { - const response = { - status: 200, - data: { - quant_revision: 1, - md5: 'da697d6f9a318fe26d2dd75a6b123df0', - quant_filename: 'index.html', - errorMsg: '', - error: false, - }, - headers: {}, - config: {}, - request: {}, - }; - requestPost = sinon.stub(axios, 'post').resolves(response); - try { - await client(config).markup('test/fixtures/test.js'); - } catch (err) { - assert.typeOf(err, 'Error'); - assert.equal(err.message, 'Can only upload an index.html file.'); - } - }); - it('should accept custom headers', async function () { - const response = { - statusCode: 200, - data: { - quant_revision: 1, - md5: 'da697d6f9a318fe26d2dd75a6b123df0', - quant_filename: 'index.html', - errorMsg: '', - error: false, - }, - }; - requestPost = sinon.stub(axios, 'post').resolves(response) - - const data = await client(config).markup('test/fixtures/index.html', 'test/fixtures', true, false, { test: 'header' }); - - expect( - requestPost.calledOnceWith( - 'http://localhost:8081', - { - url: '/test/fixtures', - find_attachments: false, - content: '', - published: true, - headers: { 'test': 'header' }, - }, - { - headers: { - 'User-Agent': 'Quant (+http://api.quantcdn.io)', - 'Quant-Token': 'test', - 'Quant-Customer': 'dev', - 'Quant-Organisation': 'dev', - 'Quant-Project': 'test', - 'Content-Type': 'application/json', - } - } - ) - ).to.be.true; - assert.equal(data, response.data); - }); - }); - describe('files', function () { - it('should accept a local file', async function () { - const response = { - status: 200, - data: { - quant_revision: 1, - md5: 'da697d6f9a318fe26d2dd75a6b123df0', - quant_filename: 'nala.jpg', - errorMsg: '', - error: false, - }, - headers: {}, - config: {}, - request: {}, - }; - requestPost = sinon.stub(axios, 'post').resolves(response); - - const data = await client(config).file('test/fixtures/nala.jpg'); - - expect( - requestPost.calledOnceWith( - 'http://localhost:8081', - { data: {} }, - { - headers: { - ...headers, - 'Content-Type': 'multipart/form-data', - 'Quant-File-Url': '/nala.jpg', - } - } - ) - ).to.be.true; - assert.equal(data, response.data); - }); - - it('should accept custom headers', async function () { - const response = { - status: 200, - data: { - quant_revision: 1, - md5: 'da697d6f9a318fe26d2dd75a6b123df0', - quant_filename: 'nala.jpg', - errorMsg: '', - error: false, - }, - headers: {}, - config: {}, - request: {}, - }; - requestPost = sinon.stub(axios, 'post').resolves(response); - - const data = await client(config).file('test/fixtures/nala.jpg', 'nala.jpg', false, { test: 'headers' }); - - expect( - requestPost.calledOnceWith( - 'http://localhost:8081', - { data: {} }, - { - headers: { - 'User-Agent': 'Quant (+http://api.quantcdn.io)', - 'Quant-Token': 'test', - 'Quant-Customer': 'dev', - 'Quant-Organisation': 'dev', - 'Quant-Project': 'test', - 'Content-Type': 'multipart/form-data', - 'Quant-File-Url': '/nala.jpg', - 'Quant-File-Headers': '{"test":"headers"}', - } - } - ) - ).to.be.true; - assert.equal(data, response.data); - }); - - it('should accept empty object', async function () { - const response = { - status: 200, - data: { - quant_revision: 1, - md5: 'da697d6f9a318fe26d2dd75a6b123df0', - quant_filename: 'nala.jpg', - errorMsg: '', - error: false, - }, - headers: {}, - config: {}, - request: {}, - }; - requestPost = sinon.stub(axios, 'post').resolves(response); - - const data = await client(config).file('test/fixtures/nala.jpg', 'nala.jpg', false, {}); - - expect( - requestPost.calledOnceWith( - 'http://localhost:8081', - { - data: {} - }, - { - headers: { - 'User-Agent': 'Quant (+http://api.quantcdn.io)', - 'Quant-Token': 'test', - 'Quant-Customer': 'dev', - 'Quant-Organisation': 'dev', - 'Quant-Project': 'test', - 'Content-Type': 'multipart/form-data', - 'Quant-File-Url': '/nala.jpg', - }, - } - ), - ).to.be.true; - assert.equal(data, response.data); - }); - - it('should accept nested local files', async function () { - const response = { - status: 200, - data: { - quant_revision: 1, - md5: 'da697d6f9a318fe26d2dd75a6b123df0', - quant_filename: 'nala.jpg', - errorMsg: '', - error: false, - }, - headers: {}, - config: {}, - request: {}, - }; - requestPost = sinon.stub(axios, 'post').resolves(response); - - const data = await client(config).file('test/fixtures/sample/nala.jpg'); - - expect( - requestPost.calledOnceWith( - 'http://localhost:8081', - { data: {} }, - { - headers: { - ...headers, - 'Content-Type': 'multipart/form-data', - 'Quant-File-Url': '/sample/nala.jpg', - }, - } - ) - ).to.be.true; - assert.equal(data, response.data); - }); - it('should accept a custom location', async function () { - const response = { - status: 200, - data: { - quant_revision: 1, - md5: 'da697d6f9a318fe26d2dd75a6b123df0', - quant_filename: 'nala.jpg', - errorMsg: '', - error: false, - }, - headers: {}, - config: {}, - request: {}, - }; - requestPost = sinon.stub(axios, 'post').resolves(response); - - const data = await client(config) - .file('test/fixtures/sample/nala.jpg', '/path-to-file/nala.jpg'); - - expect( - requestPost.calledOnceWith( - 'http://localhost:8081', - { data: {} }, - { - headers: { - ...headers, - 'Content-Type': 'multipart/form-data', - 'Quant-File-Url': '/path-to-file/nala.jpg', - } - } - ), - ).to.be.true; - assert.equal(data, response.data); - }); - it('should accept a nested custom location', async function () { - const response = { - status: 200, - data: { - quant_revision: 1, - md5: 'da697d6f9a318fe26d2dd75a6b123df0', - quant_filename: 'nala.jpg', - errorMsg: '', - error: false, - }, - headers: {}, - config: {}, - request: {}, - }; - requestPost = sinon.stub(axios, 'post').resolves(response); - - const data = await client(config) - .file('test/fixtures/sample/nala.jpg', '/path/to/file/nala.jpg'); - - expect( - requestPost.calledOnceWith( - 'http://localhost:8081', - { data: {} }, - { - headers: { - ...headers, - 'Content-Type': 'multipart/form-data', - 'Quant-File-Url': '/path/to/file/nala.jpg', - } - } - ), - ).to.be.true; - assert.equal(data, response.data); - }); - it('should accept css', async function () { - const response = { - status: 200, - data: { - quant_revision: 1, - md5: 'da697d6f9a318fe26d2dd75a6b123df0', - quant_filename: 'test.css', - errorMsg: '', - error: false, - }, - headers: {}, - config: {}, - request: {}, - }; - requestPost = sinon.stub(axios, 'post').resolves(response); - - const data = await client(config).file('test/fixtures/test.css'); - - expect( - requestPost.calledOnceWith( - 'http://localhost:8081', - { data: {} }, - { - headers: { - ...headers, - 'Content-Type': 'multipart/form-data', - 'Quant-File-Url': '/test.css', - } - } - ), - ).to.be.true; - assert.equal(data, response.data); - }); - it('should accept js', async function () { - const response = { - status: 200, - data: { - quant_revision: 1, - md5: 'da697d6f9a318fe26d2dd75a6b123df0', - quant_filename: 'test.js', - errorMsg: '', - error: false, - }, - headers: {}, - config: {}, - request: {}, - }; - requestPost = sinon.stub(axios, 'post').resolves(response); - - const data = await client(config).file('test/fixtures/test.js'); - - expect( - requestPost.calledOnceWith( - 'http://localhost:8081', - { data: {} }, - { - headers: { - ...headers, - 'Content-Type': 'multipart/form-data', - 'Quant-File-Url': '/test.js', - }, - } - ) - ).to.be.true; - assert.equal(data, response.data); - }); - }); - }); - - describe('PATCH /unpublish', function () { - this.afterEach(function () { - requestPatch.restore(); - }); - - it('should remove index.html', async function () { - const response = { - status: 200, - data: { project: 'test' }, - headers: {}, - config: {}, - request: {}, - }; - requestPatch = sinon.stub(axios, 'patch').resolves(response); - - await client(config).unpublish('/path/to/index.html'); - expect( - requestPatch.calledOnceWith( - 'http://localhost:8081/unpublish', - {}, - { - headers: { - ...headers, - 'Quant-Url': '/path/to', - }, - } - ) - ).to.be.true; - }); - }); - - describe('POST /redirect', function () { - afterEach(function () { - requestPost.restore(); - }); - - it('should accept from and to', async function () { - const response = { - status: 200, - data: { - quant_revision: 1, - url: '/a', - errorMsg: '', - error: false, - }, - headers: {}, - config: {}, - request: {}, - }; - requestPost = sinon.stub(axios, 'post').resolves(response); - - await client(config).redirect('/a', '/b'); - - expect( - requestPost.calledOnceWith( - 'http://localhost:8081/redirect', - { - url: '/a', - redirect_url: '/b', - redirect_http_code: 302, - published: true, - }, - { headers } - ), - ).to.be.true; - }); - - it('should accept status code', async function () { - const response = { - status: 200, - data: { - quant_revision: 1, - url: '/a', - errorMsg: '', - error: false, - }, - headers: {}, - config: {}, - request: {}, - }; - requestPost = sinon.stub(axios, 'post').resolves(response); - - await client(config).redirect('/a', '/b', 'test', 301); - - expect( - requestPost.calledOnceWith( - 'http://localhost:8081/redirect', - { - url: '/a', - redirect_url: '/b', - redirect_http_code: 301, - published: true, - info: { author_user: 'test' }, - }, - { headers } - ), - ).to.be.true; - }); - - it('should not accept an invalid http status code', async function () { - try { - await client(config).redirect('/a', '/b', 'test', 200); - } catch (err) { - assert.typeOf(err, 'Error'); - assert.equal(err.message, 'A valid redirect status code is required'); - } - try { - await client(config).redirect('/a', '/b', 'test', 401); - } catch (err) { - assert.typeOf(err, 'Error'); - assert.equal( - err.message, - 'A valid redirect status code is required', - ); - } - }); - }); - -}); diff --git a/test/commands/deploy.test.js b/test/commands/deploy.test.js deleted file mode 100644 index 05b3f1e..0000000 --- a/test/commands/deploy.test.js +++ /dev/null @@ -1,160 +0,0 @@ -/** - * Test the deploy command. - */ - -const path = require('path'); -const deploy = require('../../src/commands/deploy').handler; - -// Stubs -const getFiles = require('../../src/helper/getFiles'); -const config = require('../../src/config'); -const client = require('../../src/quant-client'); -const revisions = require('../../src/helper/revisions'); - -describe('Deploy', function() { - let getFilesStub; - let configGetStub; - let clientStub; - let meta; - let unpublish; - let ping; - let send; - - let chai, sinon, expect; - - // Disable console log for neater test output. - before(async () => { - chai = await import('chai'); - sinon = await import('sinon'); - expect = chai.expect; - sinon.stub(console, 'log') - }); - after(() => sinon.restore()); - - beforeEach(function() { - unpublish = sinon.stub(); - send = sinon.stub(); - ping = sinon.stub(); - - configGetStub = sinon.stub(config, 'get'); - configGetStub.withArgs('endpoint').returns('http://localhost:8081'); - configGetStub.withArgs('clientid').returns('dev'); - configGetStub.withArgs('token').returns('test'); - - getFilesStub = sinon.stub(getFiles, 'getFiles'); - }); - - afterEach(function() { - configGetStub.restore(); - getFilesStub.restore(); - clientStub.restore(); - }); - - describe('Publish', function() { - beforeEach(function() { - meta = sinon.stub().returns(); - clientStub = sinon.stub(client, 'client').returns({ - meta, - unpublish, - send, - ping, - }); - }); - - it('should deploy built html files', async function() { - const dir = path.resolve(process.cwd(), 'test/fixtures'); - const f = `${dir}/index.html`; - getFilesStub - .withArgs(dir) - .returns([f]); - - await deploy({dir}); - expect(send.calledOnceWith(f)).to.be.true; - }); - - it('should deploy built css files', async function() { - const dir = path.resolve(process.cwd(), 'test/fixtures'); - const f = `${dir}/test.css`; - getFilesStub - .withArgs(dir) - .returns([f]); - - await deploy({dir}); - expect(send.calledOnceWith(f)).to.be.true; - }); - }); - - describe('Unpublish', function() { - beforeEach(function() { - meta = sinon.stub().returns({ - total_pages: 1, - total_records: 3, - records: [ - {url: 'test/index.html'}, - ], - }); - clientStub = sinon.stub(client, 'client').returns({ - meta, - unpublish, - send, - ping, - }); - }); - - it('should unpublish missing files', async function() { - const dir = path.resolve(process.cwd(), 'test/fixtures'); - getFilesStub.withArgs(dir).returns([ - `${dir}/index.html`, - ]); - - await deploy({dir}); - expect(unpublish.calledOnceWith('test/index.html')).to.be.true; - }); - }); - - describe('Local meta', function() { - let enabled; - let store; - let save; - beforeEach(function() { - meta = sinon.stub().returns(); - send.returns({ - 'url': '/test.html', - 'md5': 'test', - }); - clientStub = sinon.stub(client, 'client').returns({ - meta, - unpublish, - send, - ping, - }); - enabled = sinon.stub(revisions, 'enabled'); - store = sinon.stub(revisions, 'store'); - save = sinon.stub(revisions, 'save'); - }); - - afterEach(function() { - enabled.restore(); - store.restore(); - save.restore(); - }); - - it('should build the local md5 cache', async function() { - const dir = path.resolve(process.cwd(), 'test/fixtures'); - getFilesStub.withArgs(dir).returns([ - `${dir}/index.html`, - ]); - await deploy({ - 'dir': dir, - 'revision-log': '/tmp/test-log.json', - 'r': '/tmp/test-log.json', - }); - expect(enabled.firstCall.calledWith(true)).to.be.true; - expect(store.firstCall.calledWith({ - 'url': '/test.html', - 'md5': 'test', - })).to.be.true; - expect(save.calledOnce).to.be.true; - }); - }); -}); diff --git a/test/config.test.js b/test/config.test.js deleted file mode 100644 index 006cb76..0000000 --- a/test/config.test.js +++ /dev/null @@ -1,124 +0,0 @@ -/** - * Configuration file testing. - */ - -const config = require('../src/config.js'); -const fs = require('fs'); - -describe('Config', function() { - let chai, sinon, assert, expect - - beforeEach(async() => { - chai = await import('chai') - sinon = (await import('sinon')).default - assert = chai.assert - expect = chai.expect - }) - - afterEach(async () => { - sinon.restore(); - }) - - describe('defaults', function() { - it('should have a default endpoint', function() { - assert.equal(config.get('endpoint'), 'https://api.quantcdn.io/v1'); - }); - it('should have a default directory', function() { - assert.equal(config.get('dir'), 'build'); - }); - }); - describe('set()', function() { - it('should update client id', function() { - const result = {clientid: 'test'}; - config.set(result); - assert.equal(config.get('clientid'), 'test'); - }); - it('should set token', function() { - const result = {token: 'test'}; - config.set(result); - assert.equal(config.get('token'), 'test'); - }); - }); - describe('save()', function() { - let writeFileSync; - beforeEach(function() { - sinon.restore(); - writeFileSync = sinon.stub(fs, 'writeFileSync').returns({}); - config.set({ - dir: 'build', - endpoint: 'http://quantcdn.io', - clientid: null, - token: null, - project: null, - }); - }); - afterEach(function() { - writeFileSync.restore(); - }); - it('should save the state', function() { - config.save(); - const data = JSON.stringify({ - dir: 'build', - endpoint: 'http://quantcdn.io', - clientid: null, - project: null, - token: null, - }, null, 2); - expect(writeFileSync.calledOnceWith('./quant.json', data)).to.be.true; - }); - it('should save updated state', function() { - const results = {clientid: 'test'}; - config.set(results); - config.save(); - const data = JSON.stringify({ - dir: 'build', - endpoint: 'http://quantcdn.io', - clientid: 'test', - project: null, - token: null, - }, null, 2); - expect(writeFileSync.calledOnceWith('./quant.json', data)).to.be.true; - }); - it('should save to given directory', function() { - config.save('/tmp'); - const data = JSON.stringify({ - dir: 'build', - endpoint: 'http://quantcdn.io', - clientid: null, - project: null, - token: null, - }, null, 2); - expect(writeFileSync.calledOnceWith('/tmp/quant.json', data)).to.be.true; - }); - }); - describe('load()', function() { - let readFileSync; - - afterEach(function() { - readFileSync.restore(); - }); - it('should load from a given directory', function() { - readFileSync = sinon.stub(fs, 'readFileSync').returns( - JSON.stringify({ - dir: '.', - endpoint: 'http://api.quantcdn.io', - clientid: 'test', - token: 'test', - project: 'test', - }), - ); - const status = config.load(`/tmp`); - expect(readFileSync.calledOnceWith(`/tmp/quant.json`)).to.be.true; - assert.equal(status, true); - assert.equal(config.get('clientid'), 'test'); - assert.equal(config.get('token'), 'test'); - assert.equal(config.get('project'), 'test'); - }); - it('should return FALSE if file is not found', function() { - readFileSync = sinon.stub(fs, 'readFileSync').throwsException(); - const status = config.load('/tmp'); - expect(readFileSync.calledOnceWith('/tmp/quant.json')).to.be.true; - assert.equal(status, false); - }); - }); -}); diff --git a/test/fixtures/index.html b/test/fixtures/index.html deleted file mode 100644 index 779cde3..0000000 --- a/test/fixtures/index.html +++ /dev/null @@ -1,37 +0,0 @@ - - - - - Enter a title, displayed at the top of the window. - - - - -

Enter the main heading, usually the same as the title.

-

Be bold in stating your key points. Put them in a list:

-
    -
  • The first item in your list
    • -
  • The second item; italicize key words
    • -
-

Improve your image by including an image.

-

A Great HTML Resource

-

Add a link to your favorite Web site. - Break up your page with a horizontal rule or two.

-
-

Finally, link to another page in your own Web site.

-
-
-
- -

© Wiley Publishing, 2011

- - - diff --git a/test/fixtures/nala.jpg b/test/fixtures/nala.jpg deleted file mode 100644 index c17614aa374e053ce12b4e9daf44fceff3c536be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 69301 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

M% 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 - - - - Enter a title, displayed at the top of the window. - - - - - Elva dressed as a fairy - - Elva dressed as a fairy - - Hotlinked image - - - - - Chris standing up holding his daughter Elva - - - - - - - - - diff --git a/test/fixtures/sample/nala.jpg b/test/fixtures/sample/nala.jpg deleted file mode 100644 index c17614aa374e053ce12b4e9daf44fceff3c536be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 69301 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

M% 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 - - - - Enter a title, displayed at the top of the window. - - - - -

Enter the main heading, usually the same as the title.

-

Be bold in stating your key points. Put them in a list:

-
    -
  • The first item in your list
    • -
  • The second item; italicize key words
    • -
-

Improve your image by including an image.

-

A Great HTML Resource

-

Add a link to your favorite Web site. - Break up your page with a horizontal rule or two.

-
-

Finally, link to another page in your own Web site.

- -

© Wiley Publishing, 2011

- - - diff --git a/test/fixtures/test.css b/test/fixtures/test.css deleted file mode 100644 index 6840e57..0000000 --- a/test/fixtures/test.css +++ /dev/null @@ -1,3 +0,0 @@ -#nala-bg { - background-image: url('/nala.jpg'); -} diff --git a/test/fixtures/test.js b/test/fixtures/test.js deleted file mode 100644 index e69de29..0000000 diff --git a/test/helper/getFiles.test.js b/test/helper/getFiles.test.js deleted file mode 100644 index ca3469d..0000000 --- a/test/helper/getFiles.test.js +++ /dev/null @@ -1,44 +0,0 @@ -/** - * Test the get files helper. - */ -const getFiles = require('../../src/helper/getFiles'); - -describe('helpers::getFiles', function() { - let chai, cap, assert, expect; - - beforeEach(async () => { - chai = await import('chai'); - cap = (await import('chai-as-promised')).default; - - chai.use(cap); - assert = chai.assert; - expect = chai.expect; - }); - - it('should return a promise', function() { - return getFiles('test/fixtures') - .then((files) => { - assert.isTrue(true); - }); - }); - - it('should return contents of a given directory', async function() { - const files = await getFiles('test/fixtures'); - - const expected = [ - `${process.cwd()}/test/fixtures/index.html`, - `${process.cwd()}/test/fixtures/nala.jpg`, - `${process.cwd()}/test/fixtures/responsive-images.html`, - `${process.cwd()}/test/fixtures/sample/nala.jpg`, - `${process.cwd()}/test/fixtures/some-file-path.html`, - `${process.cwd()}/test/fixtures/test.css`, - `${process.cwd()}/test/fixtures/test.js`, - ]; - - expect(files).to.eql(expected); - }); - - it('should handle non-existent directories', async function() { - return expect(getFiles('/not/here')).to.eventually.be.rejectedWith(Error); - }); -}); diff --git a/test/helper/normalizePath.test.js b/test/helper/normalizePath.test.js deleted file mode 100644 index d8b1634..0000000 --- a/test/helper/normalizePath.test.js +++ /dev/null @@ -1,30 +0,0 @@ -/** - * Test the path noramlizer. - */ -const normalizePaths = require('../../src/helper/normalizePaths'); -const path = require('path'); - -describe('helpers::normalizePaths', () => { - let chai, cap, expect; - - beforeEach(async () => { - chai = await import('chai'); - cap = (await import('chai-as-promised')).default; - - chai.use(cap); - expect = chai.expect; - }); - - it('should convert system paths', () => { - // Bit of a strange test cause tests always run in poisx envs. - const localPath = '/path/to/file'; - expect(normalizePaths(localPath)).to.eql('/path/to/file'); - }); - - it('should convert win paths', () => { - // Bit of a strange test cause tests always run in poisx envs. - const localPath = '\\path\\to\\file'; - expect(normalizePaths(localPath, path.win32.sep)).to.eql('/path/to/file'); - }); - -}); diff --git a/test/helper/quant-url.js b/test/helper/quant-url.js deleted file mode 100644 index 9e7456f..0000000 --- a/test/helper/quant-url.js +++ /dev/null @@ -1,40 +0,0 @@ -/** - * Test the URL helpers. - */ -const url = require('../../src/helper/quant-url'); - -describe('helpers::url', () => { - let chai, cap, expect; - - beforeEach(async () => { - chai = await import('chai'); - cap = (await import('chai-as-promised')).default; - chai.use(cap); - expect = chai.expect; - }); - - describe('prepare', () => { - it('should remove index.html', () => { - expect(url.prepare('/test/index.html')).to.eql('/test'); - }); - it('should keep html files', () => { - expect(url.prepare('/test.html')).to.eql('/test.html'); - }); - it('should return / for only index', () => { - expect(url.prepare('/index.html')).to.eql('/'); - expect(url.prepare('index.html')).to.eql('/'); - }); - it('should respect nested structures', () => { - expect(url.prepare('/nested/directory/index.html')).to.eql('/nested/directory'); - }); - it('should handle missing leading /', () => { - expect(url.prepare('test/index.html')).to.eql('/test'); - }); - it('should not partial match index.html', () => { - expect(url.prepare('/old-index.html')).to.eql('/old-index.html'); - }); - it('should normalize case', () => { - expect(url.prepare('/StRaNgE-CaSE/index.HTML')).to.eql('/strange-case'); - }); - }); -}); From fca55e597a3460fcd1559a3d1a96cedf899eebd7 Mon Sep 17 00:00:00 2001 From: Stuart Rowlands Date: Mon, 25 Nov 2024 16:04:56 +1000 Subject: [PATCH 27/41] Added redirect test --- package.json | 1 + src/commands/redirect.js | 14 +- tests/mocks/quant-client.mjs | 12 ++ tests/unit/commands/redirect.test.mjs | 185 ++++++++++++++++++++++++++ 4 files changed, 208 insertions(+), 4 deletions(-) create mode 100644 tests/unit/commands/redirect.test.mjs diff --git a/package.json b/package.json index 41d85b7..48cddbc 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "test:deploy": "mocha 'tests/unit/commands/deploy.test.mjs'", "test:file": "mocha 'tests/unit/commands/file.test.mjs'", "test:page": "mocha 'tests/unit/commands/page.test.mjs'", + "test:redirect": "mocha 'tests/unit/commands/redirect.test.mjs'", "lint:cli": "eslint --config .eslintrc.js cli.js", "lint:src": "eslint --config .eslintrc.js src", "lint:tests": "eslint --config tests/.eslintrc.js tests", diff --git a/src/commands/redirect.js b/src/commands/redirect.js index 2828d7c..c373278 100644 --- a/src/commands/redirect.js +++ b/src/commands/redirect.js @@ -76,15 +76,21 @@ const command = { throw new Error('Operation cancelled'); } - if (!await config.fromArgs(args)) { + const context = { + config: this.config || config, + client: this.client || (() => client(config)) + }; + + if (!await context.config.fromArgs(args)) { process.exit(1); } - const quant = client(config); + const quant = context.client(context.config); + const status = args.status || 302; try { - await quant.redirect(args.from, args.to, null, args.status); - return `Created redirect from ${args.from} to ${args.to} (${args.status})`; + await quant.redirect(args.from, args.to, null, status); + return `Created redirect from ${args.from} to ${args.to} (${status})`; } catch (err) { if (isMD5Match(err)) { return `Skipped redirect from ${args.from} to ${args.to} (already exists)`; diff --git a/tests/mocks/quant-client.mjs b/tests/mocks/quant-client.mjs index f9a3906..5065e26 100644 --- a/tests/mocks/quant-client.mjs +++ b/tests/mocks/quant-client.mjs @@ -116,6 +116,18 @@ export default function (_config) { headers: { 'Quant-Url': url } }); return { success: true }; + }, + + redirect: async function(from, to, _headers = null, status = 302) { + history.post.push({ + url: '/redirect', + headers: { + 'Quant-From-Url': from, + 'Quant-To-Url': to, + 'Quant-Status': status + } + }); + return { success: true, uuid: 'mock-uuid-123' }; } }; diff --git a/tests/unit/commands/redirect.test.mjs b/tests/unit/commands/redirect.test.mjs new file mode 100644 index 0000000..fd58f2e --- /dev/null +++ b/tests/unit/commands/redirect.test.mjs @@ -0,0 +1,185 @@ +import { expect } from 'chai'; +import sinon from 'sinon'; +import _fs from 'fs'; +import _path from 'path'; +import mockClient from '../../mocks/quant-client.mjs'; + +const redirect = (await import('../../../src/commands/redirect.js')).default; +const config = (await import('../../../src/config.js')).default; + +describe('Redirect Command', () => { + let mockConfig; + let mockClientInstance; + + beforeEach(() => { + // Reset config state + config.set({}); + + // Create mock config + mockConfig = { + set: sinon.stub(), + get: (key) => ({ + endpoint: 'mock://api.quantcdn.io/v1', + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + })[key], + fromArgs: sinon.stub().resolves(true), + save: sinon.stub() + }; + + // Create mock client instance + mockClientInstance = mockClient(mockConfig); + + // Stub console methods + sinon.stub(console, 'log'); + sinon.stub(console, 'error'); + }); + + afterEach(() => { + sinon.restore(); + }); + + describe('handler', () => { + it('should create a redirect', async () => { + const context = { + config: mockConfig, + client: () => mockClientInstance + }; + + const args = { + from: '/old-path', + to: '/new-path', + status: 301, + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + }; + + const result = await redirect.handler.call(context, args); + expect(result).to.equal('Created redirect from /old-path to /new-path (301)'); + expect(mockClientInstance._history.post.length).to.equal(1); + }); + + it('should handle MD5 match errors', async () => { + const errorClientInstance = mockClient(mockConfig); + errorClientInstance.redirect = async () => { + throw { + response: { + data: { + errorMsg: 'Published version already has md5: abc123' + } + } + }; + }; + + const context = { + config: mockConfig, + client: () => errorClientInstance + }; + + const args = { + from: '/old-path', + to: '/new-path', + status: 301, + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + }; + + const result = await redirect.handler.call(context, args); + expect(result).to.equal('Skipped redirect from /old-path to /new-path (already exists)'); + }); + + it('should handle missing args', async () => { + const context = { + config: mockConfig, + client: () => mockClientInstance, + promptArgs: async () => null + }; + + try { + await redirect.handler.call(context, null); + expect.fail('Should have thrown error'); + } catch (err) { + expect(err.message).to.equal('Operation cancelled'); + } + }); + + it('should handle config fromArgs failure', async () => { + const exit = process.exit; + process.exit = (_code) => { + process.exit = exit; + throw new Error('Process exited with code 1'); + }; + + const context = { + config: { + ...mockConfig, + fromArgs: async () => false + } + }; + + const args = { + from: '/old-path', + to: '/new-path', + status: 301 + }; + + try { + await redirect.handler.call(context, args); + expect.fail('Process exited with code 1'); + } catch (err) { + expect(err.message).to.equal('Process exited with code 1'); + } finally { + process.exit = exit; + } + }); + + it('should handle general errors', async () => { + const errorClientInstance = mockClient(mockConfig); + errorClientInstance.redirect = async () => { + throw new Error('Failed to create redirect'); + }; + + const context = { + config: mockConfig, + client: () => errorClientInstance + }; + + const args = { + from: '/old-path', + to: '/new-path', + status: 301, + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + }; + + try { + await redirect.handler.call(context, args); + expect.fail('Should have thrown error'); + } catch (err) { + expect(err.message).to.include('Failed to create redirect'); + } + }); + + it('should use default status code if not provided', async () => { + const context = { + config: mockConfig, + client: () => mockClientInstance + }; + + const args = { + from: '/old-path', + to: '/new-path' + }; + + const result = await redirect.handler.call(context, args); + expect(result).to.equal('Created redirect from /old-path to /new-path (302)'); + expect(mockClientInstance._history.post.length).to.equal(1); + const [call] = mockClientInstance._history.post; + expect(call.headers['Quant-Status']).to.equal(302); + }); + }); +}); \ No newline at end of file From 4c4667ef013955941f7139314d768436b98ef59f Mon Sep 17 00:00:00 2001 From: Stuart Rowlands Date: Mon, 25 Nov 2024 16:12:06 +1000 Subject: [PATCH 28/41] Added purge tests --- package.json | 1 + src/commands/purge.js | 15 +-- tests/unit/commands/purge.test.mjs | 177 +++++++++++++++++++++++++++++ 3 files changed, 186 insertions(+), 7 deletions(-) create mode 100644 tests/unit/commands/purge.test.mjs diff --git a/package.json b/package.json index 48cddbc..db63204 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,7 @@ "test:file": "mocha 'tests/unit/commands/file.test.mjs'", "test:page": "mocha 'tests/unit/commands/page.test.mjs'", "test:redirect": "mocha 'tests/unit/commands/redirect.test.mjs'", + "test:purge": "mocha 'tests/unit/commands/purge.test.mjs'", "lint:cli": "eslint --config .eslintrc.js cli.js", "lint:src": "eslint --config .eslintrc.js src", "lint:tests": "eslint --config tests/.eslintrc.js tests", diff --git a/src/commands/purge.js b/src/commands/purge.js index aefedc7..4e56da0 100644 --- a/src/commands/purge.js +++ b/src/commands/purge.js @@ -30,11 +30,7 @@ const command = { describe: 'Mark content as stale rather than delete from edge caches', type: 'boolean', default: false - }) - .example('quant purge "/about"', 'Purge a single path') - .example('quant purge "/*"', 'Purge all content (use quotes)') - .example('quant purge --cache-keys="key1 key2"', 'Purge specific cache keys') - .example('quant purge "/about" --soft-purge', 'Soft purge a path'); + }); }, async promptArgs(providedArgs = {}) { @@ -98,11 +94,16 @@ const command = { throw new Error('Operation cancelled'); } - if (!await config.fromArgs(args)) { + const context = { + config: this.config || config, + client: this.client || (() => client(config)) + }; + + if (!await context.config.fromArgs(args)) { process.exit(1); } - const quant = client(config); + const quant = context.client(context.config); try { const options = { diff --git a/tests/unit/commands/purge.test.mjs b/tests/unit/commands/purge.test.mjs new file mode 100644 index 0000000..b729338 --- /dev/null +++ b/tests/unit/commands/purge.test.mjs @@ -0,0 +1,177 @@ +import { expect } from 'chai'; +import sinon from 'sinon'; +import _fs from 'fs'; +import _path from 'path'; +import mockClient from '../../mocks/quant-client.mjs'; + +const purge = (await import('../../../src/commands/purge.js')).default; +const config = (await import('../../../src/config.js')).default; + +describe('Purge Command', () => { + let mockConfig; + let mockClientInstance; + + beforeEach(() => { + // Reset config state + config.set({}); + + // Create mock config + mockConfig = { + set: sinon.stub(), + get: (key) => ({ + endpoint: 'mock://api.quantcdn.io/v1', + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + })[key], + fromArgs: sinon.stub().resolves(true), + save: sinon.stub() + }; + + // Create mock client instance + mockClientInstance = mockClient(mockConfig); + + // Stub console methods + sinon.stub(console, 'log'); + sinon.stub(console, 'error'); + }); + + afterEach(() => { + sinon.restore(); + }); + + describe('handler', () => { + it('should purge a single path', async () => { + const context = { + config: mockConfig, + client: () => mockClientInstance + }; + + const args = { + path: '/about', + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + }; + + const result = await purge.handler.call(context, args); + expect(result).to.equal('Successfully purged /about'); + expect(mockClientInstance._history.post.length).to.equal(1); + const [call] = mockClientInstance._history.post; + expect(call.headers['Quant-Url']).to.equal('/about'); + }); + + it('should handle soft purge option', async () => { + const context = { + config: mockConfig, + client: () => mockClientInstance + }; + + const args = { + path: '/about', + 'soft-purge': true, + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + }; + + const result = await purge.handler.call(context, args); + expect(result).to.equal('Successfully purged /about'); + expect(mockClientInstance._history.post.length).to.equal(1); + const [call] = mockClientInstance._history.post; + expect(call.headers['Soft-Purge']).to.be.true; + }); + + it('should handle cache keys', async () => { + const context = { + config: mockConfig, + client: () => mockClientInstance + }; + + const args = { + 'cache-keys': 'key1 key2', + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + }; + + const result = await purge.handler.call(context, args); + expect(result).to.equal('Successfully purged cache keys: key1 key2'); + expect(mockClientInstance._history.post.length).to.equal(1); + const [call] = mockClientInstance._history.post; + expect(call.headers['Cache-Keys']).to.equal('key1 key2'); + }); + + it('should handle missing args', async () => { + const context = { + config: mockConfig, + client: () => mockClientInstance, + promptArgs: async () => null + }; + + try { + await purge.handler.call(context, null); + expect.fail('Should have thrown error'); + } catch (err) { + expect(err.message).to.equal('Operation cancelled'); + } + }); + + it('should handle config fromArgs failure', async () => { + const exit = process.exit; + process.exit = (_code) => { + process.exit = exit; + throw new Error('Process exited with code 1'); + }; + + const context = { + config: { + ...mockConfig, + fromArgs: async () => false + } + }; + + const args = { + path: '/about', + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + }; + + try { + await purge.handler.call(context, args); + expect.fail('Process exited with code 1'); + } catch (err) { + expect(err.message).to.equal('Process exited with code 1'); + } finally { + process.exit = exit; + } + }); + + it('should handle general errors', async () => { + const errorClientInstance = mockClient(mockConfig); + errorClientInstance.purge = async () => { + throw new Error('Failed to purge'); + }; + + const context = { + config: mockConfig, + client: () => errorClientInstance + }; + + const args = { + path: '/about', + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + }; + + try { + await purge.handler.call(context, args); + expect.fail('Should have thrown error'); + } catch (err) { + expect(err.message).to.include('Failed to purge'); + } + }); + }); +}); \ No newline at end of file From f7ba42d2e9557909e5d6ee3eb4598b44f1470b2f Mon Sep 17 00:00:00 2001 From: Stuart Rowlands Date: Mon, 25 Nov 2024 16:19:32 +1000 Subject: [PATCH 29/41] Added unpublish test --- package.json | 1 + src/commands/unpublish.js | 21 ++-- tests/mocks/quant-client.mjs | 4 +- tests/unit/commands/unpublish.test.mjs | 164 +++++++++++++++++++++++++ 4 files changed, 175 insertions(+), 15 deletions(-) create mode 100644 tests/unit/commands/unpublish.test.mjs diff --git a/package.json b/package.json index db63204..7a45cd8 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "test:page": "mocha 'tests/unit/commands/page.test.mjs'", "test:redirect": "mocha 'tests/unit/commands/redirect.test.mjs'", "test:purge": "mocha 'tests/unit/commands/purge.test.mjs'", + "test:unpublish": "mocha 'tests/unit/commands/unpublish.test.mjs'", "lint:cli": "eslint --config .eslintrc.js cli.js", "lint:src": "eslint --config .eslintrc.js src", "lint:tests": "eslint --config tests/.eslintrc.js tests", diff --git a/src/commands/unpublish.js b/src/commands/unpublish.js index d3f237f..c2ef5a8 100644 --- a/src/commands/unpublish.js +++ b/src/commands/unpublish.js @@ -39,19 +39,16 @@ const command = { throw new Error('Operation cancelled'); } - if (!args.path) { - const promptedArgs = await this.promptArgs(); - if (!promptedArgs) { - throw new Error('Operation cancelled'); - } - args = { ...args, ...promptedArgs }; - } + const context = { + config: this.config || config, + client: this.client || (() => client(config)) + }; - if (!await config.fromArgs(args)) { + if (!await context.config.fromArgs(args)) { process.exit(1); } - const quant = client(config); + const quant = context.client(context.config); try { await quant.unpublish(args.path); @@ -62,11 +59,7 @@ const command = { throw new Error(`Path [${args.path}] not found`); } - // Try to extract error message from response - const errorMessage = err.response?.data?.errorMsg || err.message; - const responseData = err.response?.data ? JSON.stringify(err.response.data, null, 2) : 'No response data'; - - throw new Error(`Failed to unpublish: ${errorMessage}\nResponse: ${responseData}`); + throw new Error(`Failed to unpublish: ${err.message}`); } } }; diff --git a/tests/mocks/quant-client.mjs b/tests/mocks/quant-client.mjs index 5065e26..bccc0bd 100644 --- a/tests/mocks/quant-client.mjs +++ b/tests/mocks/quant-client.mjs @@ -76,7 +76,9 @@ export default function (_config) { unpublish: async function(url) { history.post.push({ url: '/unpublish', - headers: { 'Quant-Url': url } + headers: { + 'Quant-Url': url + } }); return { success: true }; }, diff --git a/tests/unit/commands/unpublish.test.mjs b/tests/unit/commands/unpublish.test.mjs new file mode 100644 index 0000000..7202e08 --- /dev/null +++ b/tests/unit/commands/unpublish.test.mjs @@ -0,0 +1,164 @@ +import { expect } from 'chai'; +import sinon from 'sinon'; +import _fs from 'fs'; +import _path from 'path'; +import mockClient from '../../mocks/quant-client.mjs'; + +const unpublish = (await import('../../../src/commands/unpublish.js')).default; +const config = (await import('../../../src/config.js')).default; + +describe('Unpublish Command', () => { + let mockConfig; + let mockClientInstance; + + beforeEach(() => { + // Reset config state + config.set({}); + + // Create mock config + mockConfig = { + set: sinon.stub(), + get: (key) => ({ + endpoint: 'mock://api.quantcdn.io/v1', + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + })[key], + fromArgs: sinon.stub().resolves(true), + save: sinon.stub() + }; + + // Create mock client instance + mockClientInstance = mockClient(mockConfig); + + // Stub console methods + sinon.stub(console, 'log'); + sinon.stub(console, 'error'); + }); + + afterEach(() => { + sinon.restore(); + }); + + describe('handler', () => { + it('should unpublish a path', async () => { + const context = { + config: mockConfig, + client: () => mockClientInstance + }; + + const args = { + path: '/about', + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + }; + + const result = await unpublish.handler.call(context, args); + expect(result).to.equal('Successfully unpublished [/about]'); + expect(mockClientInstance._history.post.length).to.equal(1); + const [call] = mockClientInstance._history.post; + expect(call.headers['Quant-Url']).to.equal('/about'); + }); + + it('should handle missing args', async () => { + const context = { + config: mockConfig, + client: () => mockClientInstance, + promptArgs: async () => null + }; + + try { + await unpublish.handler.call(context, null); + expect.fail('Should have thrown error'); + } catch (err) { + expect(err.message).to.equal('Operation cancelled'); + } + }); + + it('should handle config fromArgs failure', async () => { + const exit = process.exit; + process.exit = (_code) => { + process.exit = exit; + throw new Error('Process exited with code 1'); + }; + + const context = { + config: { + ...mockConfig, + fromArgs: async () => false + } + }; + + const args = { + path: '/about', + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + }; + + try { + await unpublish.handler.call(context, args); + expect.fail('Process exited with code 1'); + } catch (err) { + expect(err.message).to.equal('Process exited with code 1'); + } finally { + process.exit = exit; + } + }); + + it('should handle 404 errors', async () => { + const errorClientInstance = mockClient(mockConfig); + errorClientInstance.unpublish = async () => { + const error = new Error('Not Found'); + error.response = { status: 404 }; + throw error; + }; + + const context = { + config: mockConfig, + client: () => errorClientInstance + }; + + const args = { + path: '/nonexistent', + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + }; + + try { + await unpublish.handler.call(context, args); + expect.fail('Should have thrown error'); + } catch (err) { + expect(err.message).to.equal('Path [/nonexistent] not found'); + } + }); + + it('should handle general errors', async () => { + const errorClientInstance = mockClient(mockConfig); + errorClientInstance.unpublish = async () => { + throw new Error('Failed to unpublish'); + }; + + const context = { + config: mockConfig, + client: () => errorClientInstance + }; + + const args = { + path: '/about', + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + }; + + try { + await unpublish.handler.call(context, args); + expect.fail('Should have thrown error'); + } catch (err) { + expect(err.message).to.include('Failed to unpublish'); + } + }); + }); +}); \ No newline at end of file From e11b0b03b8058e2e89f29bb01da8edb53291678c Mon Sep 17 00:00:00 2001 From: Stuart Rowlands Date: Mon, 25 Nov 2024 17:35:33 +1000 Subject: [PATCH 30/41] Simplfied cli.js. Added delete test. Fixed delete confirmation. Fixed unpublish with args and friendlier errs. --- .github/workflows/ci.yml | 4 +- cli.js | 152 ++++++++--------------- package.json | 1 + src/commands/delete.js | 32 +++-- src/commands/unpublish.js | 61 ++++++++- tests/mocks/quant-client.mjs | 14 +++ tests/unit/commands/delete.test.mjs | 164 +++++++++++++++++++++++++ tests/unit/commands/unpublish.test.mjs | 26 ++-- 8 files changed, 325 insertions(+), 129 deletions(-) create mode 100644 tests/unit/commands/delete.test.mjs diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d6c42de..7dfd89e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,10 +18,10 @@ jobs: node-version: [18.x, 20.x] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} cache: 'npm' diff --git a/cli.js b/cli.js index e0c37e8..18b4a13 100755 --- a/cli.js +++ b/cli.js @@ -2,11 +2,14 @@ const { intro, outro, select, confirm, isCancel, spinner } = require('@clack/prompts'); const color = require('picocolors'); -const { getCommandOptions, getCommand } = require('./src/commandLoader'); +const { getCommandOptions, getCommand, loadCommands } = require('./src/commandLoader'); const config = require('./src/config'); const yargs = require('yargs'); -function showActiveConfig() { +async function showActiveConfig() { + // Try to load config first + await config.fromArgs({ _: [''] }, true); + const endpoint = config.get('endpoint'); const clientId = config.get('clientid'); const project = config.get('project'); @@ -23,7 +26,7 @@ function showActiveConfig() { } async function interactiveMode() { - intro(color.bgCyan(' QuantCDN CLI ')); + intro(color.bgCyan(color.white(' QuantCDN CLI '))); try { // Check for config before showing menu @@ -52,103 +55,49 @@ async function interactiveMode() { await initCommand.handler(initArgs); } - showActiveConfig(); + await showActiveConfig(); + const commandOptions = getCommandOptions(); const command = await select({ message: 'What would you like to do?', - options: getCommandOptions() + options: commandOptions }); if (isCancel(command)) { - outro(color.yellow('Operation cancelled')); + outro('Operation cancelled'); process.exit(0); } - const commandHandler = getCommand(command); - if (!commandHandler) { - throw new Error(`Unknown command: ${command}`); - } - - const args = await commandHandler.promptArgs(); - - const spin = spinner(); - spin.start(`Executing ${command}`); - - try { - const result = await commandHandler.handler(args); - spin.stop(`${command} completed successfully`); - outro(color.green(result || 'Operation completed successfully!')); - } catch (error) { - spin.stop(`${command} failed`); - throw error; - } - } catch (error) { - outro(color.red(`Error: ${error.message}`)); - process.exit(1); - } -} - -async function handleCommand(command, argv) { - try { - // Add _command property to args for config check - argv._ = argv._ || []; - argv._[0] = command.command.split(' ')[0]; - - // Extract command definition parts - const commandParts = command.command.split(' '); - const requiredArgs = commandParts - .filter(part => part.startsWith('<')) - .map(part => part.replace(/[<>]/g, '')); - - // For positional arguments, they're in argv._ after the command name - const providedPositionalArgs = argv._.slice(1); - - // Check if we have all required positional arguments - const hasAllRequiredArgs = requiredArgs.every((arg, index) => { - // For the first argument, check if it's provided either as positional or named - if (index === 0) { - return providedPositionalArgs[index] || argv[arg]; - } - // For subsequent arguments, they must be provided as positional args - return providedPositionalArgs[index]; - }); - - if (!await config.fromArgs(argv)) { + const cmd = getCommand(command); + if (!cmd) { + outro('Invalid command selected'); process.exit(1); } - showActiveConfig(); - - // Always pass existing args to promptArgs, even in interactive mode - if (!hasAllRequiredArgs) { - intro(color.bgCyan(' QuantCDN CLI ')); - const promptedArgs = await command.promptArgs(argv); - if (!promptedArgs) { - outro(color.yellow('Operation cancelled')); - process.exit(0); - } - argv = { ...argv, ...promptedArgs }; + const args = await cmd.promptArgs(); + if (!args) { + outro('Operation cancelled'); + process.exit(0); } - const spin = spinner(); - spin.start(`Executing ${command.command.split(' ')[0]}`); - try { - const result = await command.handler(argv); - spin.stop(''); - console.log(color.green(result || 'Operation completed successfully!')); - } catch (error) { - spin.stop(''); - throw error; + const result = await cmd.handler(args); + if (result) { + console.log(result); + } + outro('Operation completed successfully'); + } catch (err) { + outro(color.red('Error: ' + err.message)); + process.exit(1); } - } catch (error) { - console.error(color.red(`Error: ${error.message}`)); + } catch (err) { + outro(color.red('Error: ' + err.message)); process.exit(1); } } function cliMode() { - const yargsInstance = yargs(process.argv.slice(2)) + let yargsInstance = yargs(process.argv.slice(2)) .strict() .help() // Global options @@ -174,30 +123,33 @@ function cliMode() { }); // Add all commands to yargs - const commands = require('./src/commandLoader').loadCommands(); + const commands = loadCommands(); Object.entries(commands).forEach(([name, command]) => { - yargsInstance.command( - command.command || name, - command.describe, - command.builder || {}, - async (argv) => handleCommand(command, argv) - ); + yargsInstance = yargsInstance.command({ + command: command.command, + describe: command.describe, + builder: command.builder, + handler: async (argv) => { + await showActiveConfig(); + try { + const result = await command.handler(argv); + if (result) { + console.log(result); + } + process.exit(0); + } catch (err) { + console.error(color.red('Error: ' + err.message)); + process.exit(1); + } + } + }); }); - yargsInstance.demandCommand().parse(); + yargsInstance.parse(); } -// Check if being run directly -if (require.main === module) { - // No arguments = interactive mode - if (process.argv.length === 2) { - interactiveMode(); - } else { - cliMode(); - } +if (process.argv.length > 2) { + cliMode(); +} else { + interactiveMode(); } - -module.exports = { - interactiveMode, - cliMode -}; diff --git a/package.json b/package.json index 7a45cd8..48bc33d 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "test:redirect": "mocha 'tests/unit/commands/redirect.test.mjs'", "test:purge": "mocha 'tests/unit/commands/purge.test.mjs'", "test:unpublish": "mocha 'tests/unit/commands/unpublish.test.mjs'", + "test:delete": "mocha 'tests/unit/commands/delete.test.mjs'", "lint:cli": "eslint --config .eslintrc.js cli.js", "lint:src": "eslint --config .eslintrc.js src", "lint:tests": "eslint --config tests/.eslintrc.js tests", diff --git a/src/commands/delete.js b/src/commands/delete.js index 73f2e56..512d27c 100644 --- a/src/commands/delete.js +++ b/src/commands/delete.js @@ -39,8 +39,8 @@ const command = { if (isCancel(path)) return null; } - // If force is not provided, ask for confirmation - if (!providedArgs.force) { + // Only ask for confirmation in promptArgs if we're in interactive mode + if (!providedArgs.force && !process.argv.slice(2).length) { const shouldDelete = await confirm({ message: 'This will delete all revisions of this asset from QuantCDN. Are you sure?', initialValue: false, @@ -58,20 +58,29 @@ const command = { throw new Error('Operation cancelled'); } - // Check for required path argument - if (!args.path) { - const promptedArgs = await this.promptArgs(); - if (!promptedArgs) { + const context = { + config: this.config || config, + client: this.client || (() => client(config)) + }; + + // If not using force flag and not in interactive mode, ask for confirmation + if (!args.force && process.argv.slice(2).length) { + const shouldDelete = await confirm({ + message: 'This will delete all revisions of this asset from QuantCDN. Are you sure?', + initialValue: false, + active: 'Yes', + inactive: 'No' + }); + if (isCancel(shouldDelete) || !shouldDelete) { throw new Error('Operation cancelled'); } - args = { ...args, ...promptedArgs }; } - if (!await config.fromArgs(args)) { + if (!await context.config.fromArgs(args)) { process.exit(1); } - const quant = client(config); + const quant = context.client(context.config); try { const response = await quant.delete(args.path); @@ -82,11 +91,12 @@ const command = { if (meta.deleted) { return color.green(`Successfully removed [${args.path}]`); } + if (meta.deleted_timestamp) { + return color.dim(`Path [${args.path}] was already deleted`); + } } - // If we get here, something unexpected happened throw new Error(`Unexpected response format: ${JSON.stringify(response, null, 2)}`); - } catch (err) { // If we have a response in the error message, try to parse it try { diff --git a/src/commands/unpublish.js b/src/commands/unpublish.js index c2ef5a8..9bf4296 100644 --- a/src/commands/unpublish.js +++ b/src/commands/unpublish.js @@ -5,6 +5,7 @@ * quant unpublish */ const { text, isCancel } = require('@clack/prompts'); +const color = require('picocolors'); const config = require('../config'); const client = require('../quant-client'); @@ -51,12 +52,64 @@ const command = { const quant = context.client(context.config); try { - await quant.unpublish(args.path); - return `Successfully unpublished [${args.path}]`; + const response = await quant.unpublish(args.path); + + // Check if the response indicates success + if (response && !response.error) { + return color.green(`Successfully unpublished [${args.path}]`); + } + + throw new Error(`Unexpected response format: ${JSON.stringify(response, null, 2)}`); } catch (err) { - // Format a user-friendly error message + // If we have a response in the error message, try to parse it + try { + if (err.response?.data) { + const data = err.response.data; + + // Check for specific error messages + if (data.errorMsg) { + if (data.errorMsg.includes('not found') || data.errorMsg.includes('does not exist')) { + return color.dim(`Path [${args.path}] does not exist or is already unpublished`); + } + if (data.errorMsg.includes('already unpublished')) { + return color.dim(`Path [${args.path}] was already unpublished`); + } + } + + // If we have a 400 status, it's likely the path doesn't exist + if (err.response.status === 400) { + return color.dim(`Path [${args.path}] does not exist or is already unpublished`); + } + + throw new Error(`Failed to unpublish: ${err.message}\nResponse: ${JSON.stringify(data, null, 2)}`); + } + + const match = err.message.match(/Response: (.*)/s); + if (match) { + const responseData = JSON.parse(match[1]); + + // Check if this was actually a successful unpublish + if (!responseData.error) { + return color.green(`Successfully unpublished [${args.path}]`); + } + + // Check if the path was already unpublished + if (responseData.errorMsg) { + if (responseData.errorMsg.includes('not found') || responseData.errorMsg.includes('does not exist')) { + return color.dim(`Path [${args.path}] does not exist or is already unpublished`); + } + if (responseData.errorMsg.includes('already unpublished')) { + return color.dim(`Path [${args.path}] was already unpublished`); + } + } + } + } catch (parseError) { + // If we can't parse the response, continue with original error + } + + // For actual errors if (err.response?.status === 404) { - throw new Error(`Path [${args.path}] not found`); + return color.dim(`Path [${args.path}] does not exist or is already unpublished`); } throw new Error(`Failed to unpublish: ${err.message}`); diff --git a/tests/mocks/quant-client.mjs b/tests/mocks/quant-client.mjs index bccc0bd..591581b 100644 --- a/tests/mocks/quant-client.mjs +++ b/tests/mocks/quant-client.mjs @@ -130,6 +130,20 @@ export default function (_config) { } }); return { success: true, uuid: 'mock-uuid-123' }; + }, + + delete: async function(url) { + history.delete.push({ + url: '/delete', + headers: { + 'Quant-Url': url + } + }); + return { + meta: [{ + deleted: true + }] + }; } }; diff --git a/tests/unit/commands/delete.test.mjs b/tests/unit/commands/delete.test.mjs new file mode 100644 index 0000000..48196c5 --- /dev/null +++ b/tests/unit/commands/delete.test.mjs @@ -0,0 +1,164 @@ +import { expect } from 'chai'; +import sinon from 'sinon'; +import _fs from 'fs'; +import _path from 'path'; +import mockClient from '../../mocks/quant-client.mjs'; + +const deleteCommand = (await import('../../../src/commands/delete.js')).default; +const config = (await import('../../../src/config.js')).default; + +describe('Delete Command', () => { + let mockConfig; + let mockClientInstance; + + beforeEach(() => { + // Reset config state + config.set({}); + + // Create mock config + mockConfig = { + set: sinon.stub(), + get: (key) => ({ + endpoint: 'mock://api.quantcdn.io/v1', + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + })[key], + fromArgs: sinon.stub().resolves(true), + save: sinon.stub() + }; + + // Create mock client instance + mockClientInstance = mockClient(mockConfig); + + // Stub console methods + sinon.stub(console, 'log'); + sinon.stub(console, 'error'); + }); + + afterEach(() => { + sinon.restore(); + }); + + describe('handler', () => { + it('should delete a path with force flag', async () => { + const context = { + config: mockConfig, + client: () => mockClientInstance + }; + + const args = { + path: '/about', + force: true, + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + }; + + const result = await deleteCommand.handler.call(context, args); + expect(result).to.include('Successfully removed [/about]'); + expect(mockClientInstance._history.delete.length).to.equal(1); + const [call] = mockClientInstance._history.delete; + expect(call.headers['Quant-Url']).to.equal('/about'); + }); + + it('should handle missing args', async () => { + const context = { + config: mockConfig, + client: () => mockClientInstance, + promptArgs: async () => null + }; + + try { + await deleteCommand.handler.call(context, null); + expect.fail('Should have thrown error'); + } catch (err) { + expect(err.message).to.equal('Operation cancelled'); + } + }); + + it('should handle config fromArgs failure', async () => { + const exit = process.exit; + process.exit = (_code) => { + process.exit = exit; + throw new Error('Process exited with code 1'); + }; + + const context = { + config: { + ...mockConfig, + fromArgs: async () => false + } + }; + + const args = { + path: '/about', + force: true, + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + }; + + try { + await deleteCommand.handler.call(context, args); + expect.fail('Process exited with code 1'); + } catch (err) { + expect(err.message).to.equal('Process exited with code 1'); + } finally { + process.exit = exit; + } + }); + + it('should handle already deleted paths', async () => { + const errorClientInstance = mockClient(mockConfig); + errorClientInstance.delete = async () => ({ + meta: [{ + deleted_timestamp: '2024-01-01' + }] + }); + + const context = { + config: mockConfig, + client: () => errorClientInstance + }; + + const args = { + path: '/already-deleted', + force: true, + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + }; + + const result = await deleteCommand.handler.call(context, args); + expect(result).to.include('was already deleted'); + }); + + it('should handle general errors', async () => { + const errorClientInstance = mockClient(mockConfig); + errorClientInstance.delete = async () => { + throw new Error('Failed to delete'); + }; + + const context = { + config: mockConfig, + client: () => errorClientInstance + }; + + const args = { + path: '/about', + force: true, + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + }; + + try { + await deleteCommand.handler.call(context, args); + expect.fail('Should have thrown error'); + } catch (err) { + expect(err.message).to.include('Cannot delete path'); + } + }); + }); +}); \ No newline at end of file diff --git a/tests/unit/commands/unpublish.test.mjs b/tests/unit/commands/unpublish.test.mjs index 7202e08..bc24ee4 100644 --- a/tests/unit/commands/unpublish.test.mjs +++ b/tests/unit/commands/unpublish.test.mjs @@ -3,6 +3,7 @@ import sinon from 'sinon'; import _fs from 'fs'; import _path from 'path'; import mockClient from '../../mocks/quant-client.mjs'; +import stripAnsi from 'strip-ansi'; const unpublish = (await import('../../../src/commands/unpublish.js')).default; const config = (await import('../../../src/config.js')).default; @@ -55,7 +56,7 @@ describe('Unpublish Command', () => { }; const result = await unpublish.handler.call(context, args); - expect(result).to.equal('Successfully unpublished [/about]'); + expect(stripAnsi(result)).to.equal('Successfully unpublished [/about]'); expect(mockClientInstance._history.post.length).to.equal(1); const [call] = mockClientInstance._history.post; expect(call.headers['Quant-Url']).to.equal('/about'); @@ -107,12 +108,17 @@ describe('Unpublish Command', () => { } }); - it('should handle 404 errors', async () => { + it('should handle already unpublished paths', async () => { const errorClientInstance = mockClient(mockConfig); errorClientInstance.unpublish = async () => { - const error = new Error('Not Found'); - error.response = { status: 404 }; - throw error; + throw { + response: { + status: 404, + data: { + errorMsg: 'not found' + } + } + }; }; const context = { @@ -121,18 +127,14 @@ describe('Unpublish Command', () => { }; const args = { - path: '/nonexistent', + path: '/already-unpublished', clientid: 'test-client', project: 'test-project', token: 'test-token' }; - try { - await unpublish.handler.call(context, args); - expect.fail('Should have thrown error'); - } catch (err) { - expect(err.message).to.equal('Path [/nonexistent] not found'); - } + const result = await unpublish.handler.call(context, args); + expect(stripAnsi(result)).to.equal('Path [/already-unpublished] does not exist or is already unpublished'); }); it('should handle general errors', async () => { From aa4bfe915c63629c1ef772099913ff3991c9857f Mon Sep 17 00:00:00 2001 From: Stuart Rowlands Date: Mon, 25 Nov 2024 17:42:23 +1000 Subject: [PATCH 31/41] Updated README. Fixed linting. --- README.md | 32 ++++++++++++++++++++++++++++---- cli.js | 4 ++-- 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 19ce406..a20511d 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ quant [options] ### Content Management - `quant deploy [dir]` - Deploy the output of a static generator ```bash - quant deploy [dir] [--attachments] [--skip-unpublish] [--chunk-size=10] [--force] + quant deploy [dir] [--attachments] [--skip-unpublish] [--skip-unpublish-regex=pattern] [--enable-index-html] [--chunk-size=10] [--force] ``` - `quant file ` - Deploy a single asset @@ -47,7 +47,7 @@ quant [options] - `quant page ` - Make a local page asset available ```bash - quant page path/to/page.html /about-us + quant page path/to/page.html /about-us [--enable-index-html] ``` ### Publishing Controls @@ -58,7 +58,7 @@ quant [options] - `quant unpublish ` - Unpublish an asset ```bash - quant unpublish /about-us [--force] + quant unpublish /about-us ``` - `quant delete ` - Delete a deployed path @@ -81,6 +81,25 @@ quant [options] quant redirect /old-page /new-page [--status=301] ``` +### Edge Functions +- `quant function [uuid]` - Deploy an edge function + ```bash + quant function handler.js "My edge function" # Deploy new function + quant function handler.js "Updated function" 019361ae-2516-788a-8f50-e803ff561c34 # Update existing + ``` + +- `quant filter [uuid]` - Deploy an edge filter function + ```bash + quant filter filter.js "My edge filter" # Deploy new filter + quant filter filter.js "Updated filter" 019361ae-2516-788a-8f50-e803ff561c34 # Update existing + ``` + +- `quant auth [uuid]` - Deploy an edge auth function + ```bash + quant auth auth.js "My auth function" # Deploy new auth function + quant auth auth.js "Updated auth" 019361ae-2516-788a-8f50-e803ff561c34 # Update existing + ``` + ### Search - `quant search ` - Perform search index operations ```bash @@ -148,7 +167,7 @@ These options can be used with any command: --clientid, -c Project customer id for QuantCDN --project, -p Project name for QuantCDN --token, -t Project token for QuantCDN ---endpoint, -e API endpoint for QuantCDN (default: "https://api.quantcdn.io") +--endpoint, -e API endpoint for QuantCDN (default: "https://api.quantcdn.io/v1") ``` ## Configuration @@ -187,6 +206,11 @@ quant purge "/*" # Purge all content quant purge --cache-keys="key1 key2" # Purge specific cache keys quant purge /about --soft-purge # Soft purge a path +# Deploy edge functions +quant function handler.js "My edge function" # Deploy a new function +quant auth auth.js "My auth function" # Deploy an auth function +quant filter filter.js "My edge filter" # Deploy a filter function + # Check deployment status quant scan --diff-only ``` diff --git a/cli.js b/cli.js index 18b4a13..21aa4a2 100755 --- a/cli.js +++ b/cli.js @@ -1,6 +1,6 @@ #!/usr/bin/env node -const { intro, outro, select, confirm, isCancel, spinner } = require('@clack/prompts'); +const { intro, outro, select, confirm, isCancel } = require('@clack/prompts'); const color = require('picocolors'); const { getCommandOptions, getCommand, loadCommands } = require('./src/commandLoader'); const config = require('./src/config'); @@ -124,7 +124,7 @@ function cliMode() { // Add all commands to yargs const commands = loadCommands(); - Object.entries(commands).forEach(([name, command]) => { + Object.entries(commands).forEach(([_name, command]) => { yargsInstance = yargsInstance.command({ command: command.command, describe: command.describe, From cbfe71fdeccf45ce42be979f8a88b1144f90cfe9 Mon Sep 17 00:00:00 2001 From: Stuart Rowlands Date: Mon, 25 Nov 2024 19:55:09 +1000 Subject: [PATCH 32/41] Fixed init. --- src/commands/init.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/commands/init.js b/src/commands/init.js index 764e408..24eac92 100644 --- a/src/commands/init.js +++ b/src/commands/init.js @@ -1,5 +1,6 @@ -const { text } = require('@clack/prompts'); +const { text, password, isCancel } = require('@clack/prompts'); const config = require('../config'); +const client = require('../quant-client'); const command = { command: 'init', @@ -27,6 +28,12 @@ const command = { alias: 't', describe: 'Project token for QuantCDN', type: 'string' + }) + .option('endpoint', { + alias: 'e', + describe: 'QuantCDN API endpoint', + type: 'string', + default: 'https://api.quantcdn.io/v1' }); }, @@ -70,7 +77,7 @@ const command = { if (isCancel(dir)) return null; return { - endpoint: endpoint || 'https://api.quantcdn.io', + endpoint: 'https://api.quantcdn.io', clientid, project, token, From f8ffafd1396a0114abde2424c13890ea505d6312 Mon Sep 17 00:00:00 2001 From: Stuart Rowlands Date: Mon, 25 Nov 2024 20:12:52 +1000 Subject: [PATCH 33/41] Keep v1 on end of API saved to config. Fixed init. --- src/commands/init.js | 4 ++-- src/config.js | 4 ---- tests/unit/config.test.mjs | 12 ------------ 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/src/commands/init.js b/src/commands/init.js index 24eac92..f9c6477 100644 --- a/src/commands/init.js +++ b/src/commands/init.js @@ -77,7 +77,7 @@ const command = { if (isCancel(dir)) return null; return { - endpoint: 'https://api.quantcdn.io', + endpoint: 'https://api.quantcdn.io/v1', clientid, project, token, @@ -100,7 +100,7 @@ const command = { } const config_args = { - endpoint: args.endpoint || 'https://api.quantcdn.io', + endpoint: args.endpoint || 'https://api.quantcdn.io/v1', clientid: args.clientid, project: args.project, token: args.token, diff --git a/src/config.js b/src/config.js index 4c171a8..26f83ff 100644 --- a/src/config.js +++ b/src/config.js @@ -109,11 +109,7 @@ function save() { fs.mkdirSync(configDir, {recursive: true}); } - // Remove /v1 from endpoint when saving to config file const saveConfig = {...config}; - if (saveConfig.endpoint && saveConfig.endpoint.endsWith('/v1')) { - saveConfig.endpoint = saveConfig.endpoint.slice(0, -3); - } // Save to both global and local config fs.writeFileSync( diff --git a/tests/unit/config.test.mjs b/tests/unit/config.test.mjs index 5a0c408..b85badf 100644 --- a/tests/unit/config.test.mjs +++ b/tests/unit/config.test.mjs @@ -157,17 +157,5 @@ describe('Config', () => { expect(savedConfig.token).to.equal('test-token'); }); - it('should remove /v1 from endpoint when saving', () => { - const writeStub = sinon.stub(fs, 'writeFileSync'); - - config.set({ - endpoint: 'https://api.quantcdn.io/v1' - }); - - config.save(); - - const savedConfig = JSON.parse(writeStub.firstCall.args[1]); - expect(savedConfig.endpoint).to.equal('https://api.quantcdn.io'); - }); }); }); \ No newline at end of file From 658e82bb33e7ddec09f0065bfe324e64cbc0c2c2 Mon Sep 17 00:00:00 2001 From: Stuart Rowlands Date: Mon, 25 Nov 2024 21:00:55 +1000 Subject: [PATCH 34/41] Fixed scan comparison for unpublishing assets --- src/commands/scan.js | 55 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 52 insertions(+), 3 deletions(-) diff --git a/src/commands/scan.js b/src/commands/scan.js index 299a94b..2292cfd 100644 --- a/src/commands/scan.js +++ b/src/commands/scan.js @@ -27,6 +27,11 @@ const command = { type: 'boolean', default: false }) + .option('skip-unpublish', { + describe: 'Skip the unpublish process', + type: 'boolean', + default: false + }) .option('skip-unpublish-regex', { describe: 'Skip the unpublish process for specific regex', type: 'string' @@ -81,8 +86,9 @@ const command = { const p = path.resolve(process.cwd(), buildDir); console.log('Fetching metadata from Quant...'); + let metadata; try { - await quant.meta(true); + metadata = await quant.meta(true); console.log('Metadata fetched successfully'); } catch (err) { throw new Error('Failed to fetch metadata from Quant'); @@ -161,8 +167,7 @@ const command = { process.stdout.write(`${spinChar} ${progress} Checking batch of files...`); try { - const response = await quant.batchMeta(batchPaths); - + const response = await quant.batchMeta(batchPaths); // Process each file in the batch for (let j = 0; j < batch.length; j++) { const file = batch[j]; @@ -206,6 +211,43 @@ const command = { } } + + // Find paths to unpublish from initial metadata + const processedUrls = new Set(); // Track what we've already processed + const skippedByRegex = new Set(); // Track files skipped by regex + + if (!args['skip-unpublish'] && metadata && metadata.records) { + const skipPattern = args['skip-unpublish-regex'] ? new RegExp(args['skip-unpublish-regex']) : null; + + metadata.records.forEach(record => { + if (!record.url || processedUrls.has(record.url)) return; + + // Skip redirects + if (record.type === 'redirect') { + return; + } + + // Skip if matches the skip pattern + if (skipPattern && skipPattern.test(record.url)) { + skippedByRegex.add(record.url); + return; + } + + // Check if file exists locally + const localFile = files.find(file => { + const filepath = path.relative(p, file); + const localPath = normalizePath(filepath); + const recordPath = record.url.toLowerCase(); + return localPath === recordPath || localPath === recordPath.replace(/^\//, ''); + }); + + if (!localFile) { + results.toUnpublish.push(record.url); + processedUrls.add(record.url); + } + }); + } + // Clear the last progress line clearLine(); process.stdout.write('\n'); @@ -234,6 +276,10 @@ const command = { output += color.magenta('\nTo be unpublished:') + `\n${results.toUnpublish.join('\n')}\n`; } + if (skippedByRegex.size > 0) { + output += color.blue('\nSkipped by regex:') + `\n${Array.from(skippedByRegex).join('\n')}\n`; + } + if (output === '\nScan Results:\n') { output += 'No changes found'; } @@ -245,6 +291,9 @@ const command = { output += `Different: ${results.different.length}\n`; output += `Not found: ${results.notFound.length}\n`; output += `To be unpublished: ${results.toUnpublish.length}\n`; + if (skippedByRegex.size > 0) { + output += `Skipped by regex: ${skippedByRegex.size}\n`; + } return output; } From 7ebf9fca9bb64f4677c94e67a71a10299f2a0462 Mon Sep 17 00:00:00 2001 From: Stuart Rowlands Date: Mon, 25 Nov 2024 21:09:36 +1000 Subject: [PATCH 35/41] Fixed prompt for redirect --- src/commands/redirect.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/commands/redirect.js b/src/commands/redirect.js index c373278..1141297 100644 --- a/src/commands/redirect.js +++ b/src/commands/redirect.js @@ -4,7 +4,7 @@ * @usage * quant redirect [status] */ -const { text, isCancel } = require('@clack/prompts'); +const { text, select, isCancel } = require('@clack/prompts'); const config = require('../config'); const client = require('../quant-client'); const isMD5Match = require('../helper/is-md5-match'); From 8ba99841b253789402993e5a9edb8515c27534c8 Mon Sep 17 00:00:00 2001 From: Stuart Rowlands Date: Tue, 26 Nov 2024 06:25:35 +1000 Subject: [PATCH 36/41] Fixed args for token/client/project. Updated test. --- cli.js | 12 ++++++---- src/config.js | 10 ++++----- tests/unit/config.test.mjs | 46 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 9 deletions(-) diff --git a/cli.js b/cli.js index 21aa4a2..346be06 100755 --- a/cli.js +++ b/cli.js @@ -8,7 +8,11 @@ const yargs = require('yargs'); async function showActiveConfig() { // Try to load config first - await config.fromArgs({ _: [''] }, true); + const args = process.argv.slice(2); + const yargsInstance = yargs(args); + const argv = await yargsInstance.parse(); + + await config.fromArgs(argv, true); const endpoint = config.get('endpoint'); const clientId = config.get('clientid'); @@ -17,9 +21,9 @@ async function showActiveConfig() { console.log(color.dim('─────────────────────────────────────')); console.log(color.dim('Active configuration:')); - console.log(color.dim(`Organization: ${clientId}`)); - console.log(color.dim(`Project: ${project}`)); - if (endpoint !== defaultEndpoint) { + console.log(color.dim(`Organization: ${clientId || 'Not set'}`)); + console.log(color.dim(`Project: ${project || 'Not set'}`)); + if (endpoint && endpoint !== defaultEndpoint) { console.log(color.dim(`Endpoint: ${endpoint}`)); } console.log(color.dim('─────────────────────────────────────')); diff --git a/src/config.js b/src/config.js index 26f83ff..01a08b3 100644 --- a/src/config.js +++ b/src/config.js @@ -44,12 +44,12 @@ async function fromArgs(args = {}, silent = false) { ) }; - // Only merge specific CLI args we care about + // Handle CLI args and their aliases if (args.dir) config.dir = args.dir; - if (args.endpoint) config.endpoint = args.endpoint; - if (args.clientid) config.clientid = args.clientid; - if (args.project) config.project = args.project; - if (args.token) config.token = args.token; + if (args.endpoint || args.e) config.endpoint = args.endpoint || args.e; + if (args.clientid || args.c) config.clientid = args.clientid || args.c; + if (args.project || args.p) config.project = args.project || args.p; + if (args.token || args.t) config.token = args.token || args.t; // Handle enable-index-html setting if (args['enable-index-html'] !== undefined) { diff --git a/tests/unit/config.test.mjs b/tests/unit/config.test.mjs index b85badf..13bbdf9 100644 --- a/tests/unit/config.test.mjs +++ b/tests/unit/config.test.mjs @@ -136,6 +136,52 @@ describe('Config', () => { expect(err.message).to.include('Cannot change this setting'); } }); + + it('should accept short form CLI arguments', async () => { + const args = { + c: 'test-client', + p: 'test-project', + t: 'test-token', + e: 'http://custom.api/v1' + }; + + await config.fromArgs(args, true); + + expect(config.get('clientid')).to.equal('test-client'); + expect(config.get('project')).to.equal('test-project'); + expect(config.get('token')).to.equal('test-token'); + expect(config.get('endpoint')).to.equal('http://custom.api/v1'); + }); + + it('should accept long form CLI arguments', async () => { + const args = { + clientid: 'test-client', + project: 'test-project', + token: 'test-token', + endpoint: 'http://custom.api/v1' + }; + + await config.fromArgs(args, true); + + expect(config.get('clientid')).to.equal('test-client'); + expect(config.get('project')).to.equal('test-project'); + expect(config.get('token')).to.equal('test-token'); + expect(config.get('endpoint')).to.equal('http://custom.api/v1'); + }); + + it('should prioritize long form over short form arguments', async () => { + const args = { + clientid: 'long-client', + c: 'short-client', + project: 'long-project', + p: 'short-project' + }; + + await config.fromArgs(args, true); + + expect(config.get('clientid')).to.equal('long-client'); + expect(config.get('project')).to.equal('long-project'); + }); }); describe('save', () => { From fdf046d4beb5184cc0ca96300ff95410174555af Mon Sep 17 00:00:00 2001 From: Stuart Rowlands Date: Tue, 26 Nov 2024 06:35:41 +1000 Subject: [PATCH 37/41] Added support for --revision-log in args. Cleaned up deploy options. --- src/commands/deploy.js | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/src/commands/deploy.js b/src/commands/deploy.js index cc54379..af94dc9 100644 --- a/src/commands/deploy.js +++ b/src/commands/deploy.js @@ -16,42 +16,43 @@ const command = { builder: (yargs) => { return yargs .positional('dir', { - describe: 'Location of build artifacts', + describe: 'Directory containing static assets', type: 'string' }) .option('attachments', { - alias: 'a', + describe: 'Deploy attachments', type: 'boolean', - description: 'Find attachments', - default: false + default: false, + hidden: true }) .option('skip-unpublish', { - alias: 'u', + describe: 'Skip the unpublish process', type: 'boolean', - description: 'Skip the automatic unpublish process', default: false }) .option('skip-unpublish-regex', { - type: 'string', - description: 'Skip unpublishing paths that match this regex pattern' + describe: 'Skip the unpublish process for specific regex', + type: 'string' }) .option('enable-index-html', { - alias: 'h', + describe: 'Keep index.html in URLs', type: 'boolean', - description: 'Push index.html files with page assets', default: false }) .option('chunk-size', { - alias: 'cs', + describe: 'Number of files to process at once', type: 'number', - description: 'Control the chunk-size for concurrency', default: 10 }) .option('force', { - alias: 'f', + describe: 'Force deployment even if files exist', type: 'boolean', - description: 'Force deployment and update revision log', default: false + }) + .option('revision-log', { + describe: 'Path to revision log file', + type: 'string', + hidden: true }); }, @@ -144,9 +145,10 @@ const command = { } const projectName = config.get('project'); - const revisionLogPath = path.resolve(process.cwd(), `quant-revision-log_${projectName}`); + const revisionLogPath = args['revision-log'] || path.resolve(process.cwd(), `quant-revision-log_${projectName}`); revisions.enabled(true); revisions.load(revisionLogPath); + console.log(color.dim(`Using revision log: ${revisionLogPath}`)); let files; try { From bff817f8f670303ad3b4c01d959ea1ce65f60881 Mon Sep 17 00:00:00 2001 From: Stuart Rowlands Date: Tue, 26 Nov 2024 07:53:08 +1000 Subject: [PATCH 38/41] Added back skip-purge command to args --- src/commands/deploy.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/commands/deploy.js b/src/commands/deploy.js index af94dc9..b91a566 100644 --- a/src/commands/deploy.js +++ b/src/commands/deploy.js @@ -34,6 +34,11 @@ const command = { describe: 'Skip the unpublish process for specific regex', type: 'string' }) + .option('skip-purge', { + describe: 'Skip the automatic cache purge process', + type: 'boolean', + default: false + }) .option('enable-index-html', { describe: 'Keep index.html in URLs', type: 'boolean', From 5ce1fd00376b59d6b4d2015fe9ec7b1ad10a8717 Mon Sep 17 00:00:00 2001 From: Stuart Rowlands Date: Tue, 26 Nov 2024 08:14:18 +1000 Subject: [PATCH 39/41] Fix --enable-index-html=false, add test. --- cli.js | 2 +- src/config.js | 13 ++++++++----- tests/unit/config.test.mjs | 16 +++++++++++++++- 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/cli.js b/cli.js index 346be06..1576c51 100755 --- a/cli.js +++ b/cli.js @@ -134,8 +134,8 @@ function cliMode() { describe: command.describe, builder: command.builder, handler: async (argv) => { - await showActiveConfig(); try { + await showActiveConfig(); const result = await command.handler(argv); if (result) { console.log(result); diff --git a/src/config.js b/src/config.js index 01a08b3..2e7b934 100644 --- a/src/config.js +++ b/src/config.js @@ -53,18 +53,21 @@ async function fromArgs(args = {}, silent = false) { // Handle enable-index-html setting if (args['enable-index-html'] !== undefined) { + const enableIndexHtml = args['enable-index-html'] === true || args['enable-index-html'] === ''; + // If setting exists in config, ensure it matches if (config.enableIndexHtml !== undefined && - config.enableIndexHtml !== args['enable-index-html']) { + config.enableIndexHtml !== enableIndexHtml) { + const currentSetting = config.enableIndexHtml ? 'enabled' : 'disabled'; + const requestedSetting = enableIndexHtml ? 'enable' : 'disable'; throw new Error( - 'Project was previously deployed with ' + - (config.enableIndexHtml ? '--enable-index-html' : 'no --enable-index-html') + - '. Cannot change this setting after initial deployment.' + `Cannot ${requestedSetting} index.html URLs - this project was deployed with index.html URLs ${currentSetting}` ); } + // Store the setting if it's the first time if (config.enableIndexHtml === undefined) { - config.enableIndexHtml = args['enable-index-html']; + config.enableIndexHtml = enableIndexHtml; save(); } } diff --git a/tests/unit/config.test.mjs b/tests/unit/config.test.mjs index 13bbdf9..98c4226 100644 --- a/tests/unit/config.test.mjs +++ b/tests/unit/config.test.mjs @@ -133,7 +133,21 @@ describe('Config', () => { await config.fromArgs({ 'enable-index-html': false }, true); expect.fail('Should have thrown error'); } catch (err) { - expect(err.message).to.include('Cannot change this setting'); + expect(err.message).to.equal('Cannot disable index.html URLs - this project was deployed with index.html URLs enabled'); + } + }); + + it('should handle enableIndexHtml false setting', async () => { + // First deployment sets the setting to false + await config.fromArgs({ 'enable-index-html': false }, true); + expect(config.get('enableIndexHtml')).to.be.false; + + // Try to enable it later + try { + await config.fromArgs({ 'enable-index-html': true }, true); + expect.fail('Should have thrown error'); + } catch (err) { + expect(err.message).to.equal('Cannot enable index.html URLs - this project was deployed with index.html URLs disabled'); } }); From a9082df861d8207214b4cc4002ca2fadf8a31434 Mon Sep 17 00:00:00 2001 From: Stuart Rowlands Date: Tue, 26 Nov 2024 10:43:30 +1000 Subject: [PATCH 40/41] Added new bulk functions deploy --- package.json | 1 + src/commandLoader.js | 2 + src/commands/deploy.js | 3 +- src/commands/functions.js | 95 ++++++++++++ tests/mocks/quant-client.mjs | 48 ++++++ tests/unit/commands/functions.test.mjs | 203 +++++++++++++++++++++++++ 6 files changed, 351 insertions(+), 1 deletion(-) create mode 100644 src/commands/functions.js create mode 100644 tests/unit/commands/functions.test.mjs diff --git a/package.json b/package.json index 48bc33d..c9cb643 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "test:purge": "mocha 'tests/unit/commands/purge.test.mjs'", "test:unpublish": "mocha 'tests/unit/commands/unpublish.test.mjs'", "test:delete": "mocha 'tests/unit/commands/delete.test.mjs'", + "test:functions": "mocha 'tests/unit/commands/functions.test.mjs'", "lint:cli": "eslint --config .eslintrc.js cli.js", "lint:src": "eslint --config .eslintrc.js src", "lint:tests": "eslint --config tests/.eslintrc.js tests", diff --git a/src/commandLoader.js b/src/commandLoader.js index 2f5bc46..4904f05 100644 --- a/src/commandLoader.js +++ b/src/commandLoader.js @@ -14,6 +14,7 @@ function loadCommands() { 'function': require('./commands/function'), 'filter': require('./commands/function_filter'), 'auth': require('./commands/function_auth'), + 'functions': require('./commands/functions'), // Destructive operations 'unpublish': require('./commands/unpublish'), @@ -46,6 +47,7 @@ function getCommandOptions() { { value: 'function', label: 'Deploy an edge function' }, { value: 'filter', label: 'Deploy an edge filter' }, { value: 'auth', label: 'Deploy an edge auth function' }, + { value: 'functions', label: 'Deploy multiple edge functions from JSON' }, // Visual separator { value: 'separator2', label: '───────────────────────', disabled: true }, diff --git a/src/commands/deploy.js b/src/commands/deploy.js index b91a566..242786b 100644 --- a/src/commands/deploy.js +++ b/src/commands/deploy.js @@ -267,7 +267,8 @@ const command = { continue; } - if (item.type && item.type === 'redirect') { + // Skip redirects and functions + if (item.type && (item.type === 'redirect' || item.type === 'edge_function' || item.type === 'edge_auth' || item.type === 'edge_filter')) { continue; } diff --git a/src/commands/functions.js b/src/commands/functions.js new file mode 100644 index 0000000..b3351d5 --- /dev/null +++ b/src/commands/functions.js @@ -0,0 +1,95 @@ +/** + * Deploy edge functions from a JSON file. + * + * @usage + * quant functions + */ +const fs = require('fs'); +const config = require('../config'); +const client = require('../quant-client'); +const color = require('picocolors'); + +const command = { + command: 'functions ', + describe: 'Deploy edge functions from a JSON configuration file', + + builder: (yargs) => { + return yargs + .positional('file', { + describe: 'Path to JSON configuration file', + type: 'string', + demandOption: true + }) + .example('quant functions functions.json', 'Deploy functions from config file'); + }, + + async handler(args) { + if (!args) { + throw new Error('Operation cancelled'); + } + + const context = { + config: this.config || config, + client: this.client || (() => client(config)) + }; + + if (!await context.config.fromArgs(args)) { + process.exit(1); + } + + const quant = context.client(context.config); + + // Read and parse the JSON file + let functions; + try { + const content = fs.readFileSync(args.file, 'utf8'); + functions = JSON.parse(content); + } catch (err) { + throw new Error(`Failed to read functions file: ${err.message}`); + } + + // Process each function + for (const func of functions) { + const { type, path, description, uuid } = func; + + // Validate required fields + if (!type || !path || !description) { + throw new Error('Each function must have type, path, and description'); + } + + // Validate file exists + if (!fs.existsSync(path)) { + throw new Error(`Function file not found: ${path}`); + } + + try { + switch (type.toLowerCase()) { + case 'auth': + await quant.edgeAuth(path, description, uuid); + console.log(color.green(`Deployed auth function: ${path}`)); + break; + + case 'filter': + await quant.edgeFilter(path, description, uuid); + console.log(color.green(`Deployed filter function: ${path}`)); + break; + + case 'edge': + case 'function': + await quant.edgeFunction(path, description, uuid); + console.log(color.green(`Deployed edge function: ${path}`)); + break; + + default: + throw new Error(`Invalid function type: ${type}`); + } + } catch (err) { + throw new Error(`Failed to deploy ${type} function ${path}: ${err.message}`); + } + } + + return color.green('All functions deployed successfully'); + } +}; + +module.exports = command; \ No newline at end of file diff --git a/tests/mocks/quant-client.mjs b/tests/mocks/quant-client.mjs index 591581b..a595bf7 100644 --- a/tests/mocks/quant-client.mjs +++ b/tests/mocks/quant-client.mjs @@ -144,6 +144,54 @@ export default function (_config) { deleted: true }] }; + }, + + edgeFunction: async function(file, description, uuid = null) { + history.post.push({ + url: '/functions', + headers: { + 'Content-Type': 'application/json' + }, + data: { + content: file, + desc: description, + uuid: uuid, + published: true + } + }); + return { success: true, uuid: uuid || 'new-uuid' }; + }, + + edgeFilter: async function(file, description, uuid = null) { + history.post.push({ + url: '/functions/filter', + headers: { + 'Content-Type': 'application/json' + }, + data: { + content: file, + desc: description, + uuid: uuid, + published: true + } + }); + return { success: true, uuid: uuid || 'new-uuid' }; + }, + + edgeAuth: async function(file, description, uuid = null) { + history.post.push({ + url: '/functions/auth', + headers: { + 'Content-Type': 'application/json' + }, + data: { + content: file, + desc: description, + uuid: uuid, + published: true + } + }); + return { success: true, uuid: uuid || 'new-uuid' }; } }; diff --git a/tests/unit/commands/functions.test.mjs b/tests/unit/commands/functions.test.mjs new file mode 100644 index 0000000..118399c --- /dev/null +++ b/tests/unit/commands/functions.test.mjs @@ -0,0 +1,203 @@ +import { expect } from 'chai'; +import sinon from 'sinon'; +import _fs from 'fs'; +import _path from 'path'; +import mockClient from '../../mocks/quant-client.mjs'; + +const functions = (await import('../../../src/commands/functions.js')).default; +const config = (await import('../../../src/config.js')).default; + +describe('Functions Command', () => { + let mockConfig; + let mockClientInstance; + let readFileSync; + + beforeEach(() => { + // Reset config state + config.set({}); + + // Create mock config + mockConfig = { + set: sinon.stub(), + get: (key) => ({ + endpoint: 'mock://api.quantcdn.io/v1', + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + })[key], + fromArgs: sinon.stub().resolves(true), + save: sinon.stub() + }; + + // Create mock client instance + mockClientInstance = mockClient(mockConfig); + + // Mock fs.readFileSync + readFileSync = sinon.stub(_fs, 'readFileSync'); + sinon.stub(_fs, 'existsSync').returns(true); + + // Stub console methods + sinon.stub(console, 'log'); + sinon.stub(console, 'error'); + }); + + afterEach(() => { + sinon.restore(); + }); + + describe('handler', () => { + it('should deploy auth functions', async () => { + const mockJson = [{ + type: 'auth', + path: './auth.js', + description: 'Test auth function', + uuid: 'test-uuid' + }]; + + readFileSync.returns(JSON.stringify(mockJson)); + + const context = { + config: mockConfig, + client: () => mockClientInstance + }; + + const args = { + file: 'functions.json', + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + }; + + const result = await functions.handler.call(context, args); + expect(result).to.include('All functions deployed successfully'); + expect(mockClientInstance._history.post.length).to.equal(1); + }); + + it('should deploy filter functions', async () => { + const mockJson = [{ + type: 'filter', + path: './filter.js', + description: 'Test filter function' + }]; + + readFileSync.returns(JSON.stringify(mockJson)); + + const context = { + config: mockConfig, + client: () => mockClientInstance + }; + + const args = { + file: 'functions.json', + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + }; + + const result = await functions.handler.call(context, args); + expect(result).to.include('All functions deployed successfully'); + expect(mockClientInstance._history.post.length).to.equal(1); + }); + + it('should deploy edge functions', async () => { + const mockJson = [{ + type: 'edge', + path: './edge.js', + description: 'Test edge function' + }]; + + readFileSync.returns(JSON.stringify(mockJson)); + + const context = { + config: mockConfig, + client: () => mockClientInstance + }; + + const args = { + file: 'functions.json', + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + }; + + const result = await functions.handler.call(context, args); + expect(result).to.include('All functions deployed successfully'); + expect(mockClientInstance._history.post.length).to.equal(1); + }); + + it('should handle missing file', async () => { + readFileSync.throws(new Error('ENOENT: no such file or directory')); + + const context = { + config: mockConfig, + client: () => mockClientInstance + }; + + const args = { + file: 'nonexistent.json', + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + }; + + try { + await functions.handler.call(context, args); + expect.fail('Should have thrown error'); + } catch (err) { + expect(err.message).to.include('Failed to read functions file'); + } + }); + + it('should handle invalid JSON', async () => { + readFileSync.returns('invalid json'); + + const context = { + config: mockConfig, + client: () => mockClientInstance + }; + + const args = { + file: 'functions.json', + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + }; + + try { + await functions.handler.call(context, args); + expect.fail('Should have thrown error'); + } catch (err) { + expect(err.message).to.include('Failed to read functions file'); + } + }); + + it('should handle invalid function type', async () => { + const mockJson = [{ + type: 'invalid', + path: './invalid.js', + description: 'Invalid function' + }]; + + readFileSync.returns(JSON.stringify(mockJson)); + + const context = { + config: mockConfig, + client: () => mockClientInstance + }; + + const args = { + file: 'functions.json', + clientid: 'test-client', + project: 'test-project', + token: 'test-token' + }; + + try { + await functions.handler.call(context, args); + expect.fail('Should have thrown error'); + } catch (err) { + expect(err.message).to.include('Invalid function type'); + } + }); + }); +}); \ No newline at end of file From 7d6689a71f1b8078c5712010aa127d88392a5bb0 Mon Sep 17 00:00:00 2001 From: Stuart Rowlands Date: Tue, 26 Nov 2024 11:26:43 +1000 Subject: [PATCH 41/41] Use the md5-match helper for edge functions --- src/commands/functions.js | 39 +++++++++++++++++++++----- tests/unit/commands/functions.test.mjs | 6 ++-- 2 files changed, 35 insertions(+), 10 deletions(-) diff --git a/src/commands/functions.js b/src/commands/functions.js index b3351d5..02485ba 100644 --- a/src/commands/functions.js +++ b/src/commands/functions.js @@ -8,6 +8,7 @@ const fs = require('fs'); const config = require('../config'); const client = require('../quant-client'); const color = require('picocolors'); +const isMD5Match = require('../helper/is-md5-match'); const command = { command: 'functions ', @@ -65,19 +66,43 @@ const command = { try { switch (type.toLowerCase()) { case 'auth': - await quant.edgeAuth(path, description, uuid); - console.log(color.green(`Deployed auth function: ${path}`)); + try { + await quant.edgeAuth(path, description, uuid); + console.log(color.green(`Deployed auth function: ${path}`)); + } catch (err) { + if (isMD5Match(err)) { + console.log(color.dim(`Skipped auth function: ${path} (content unchanged)`)); + } else { + throw err; + } + } break; case 'filter': - await quant.edgeFilter(path, description, uuid); - console.log(color.green(`Deployed filter function: ${path}`)); + try { + await quant.edgeFilter(path, description, uuid); + console.log(color.green(`Deployed filter function: ${path}`)); + } catch (err) { + if (isMD5Match(err)) { + console.log(color.dim(`Skipped filter function: ${path} (content unchanged)`)); + } else { + throw err; + } + } break; case 'edge': case 'function': - await quant.edgeFunction(path, description, uuid); - console.log(color.green(`Deployed edge function: ${path}`)); + try { + await quant.edgeFunction(path, description, uuid); + console.log(color.green(`Deployed edge function: ${path}`)); + } catch (err) { + if (isMD5Match(err)) { + console.log(color.dim(`Skipped edge function: ${path} (content unchanged)`)); + } else { + throw err; + } + } break; default: @@ -88,7 +113,7 @@ const command = { } } - return color.green('All functions deployed successfully'); + return color.green('All functions processed successfully'); } }; diff --git a/tests/unit/commands/functions.test.mjs b/tests/unit/commands/functions.test.mjs index 118399c..91561e3 100644 --- a/tests/unit/commands/functions.test.mjs +++ b/tests/unit/commands/functions.test.mjs @@ -69,7 +69,7 @@ describe('Functions Command', () => { }; const result = await functions.handler.call(context, args); - expect(result).to.include('All functions deployed successfully'); + expect(result).to.include('All functions processed successfully'); expect(mockClientInstance._history.post.length).to.equal(1); }); @@ -95,7 +95,7 @@ describe('Functions Command', () => { }; const result = await functions.handler.call(context, args); - expect(result).to.include('All functions deployed successfully'); + expect(result).to.include('All functions processed successfully'); expect(mockClientInstance._history.post.length).to.equal(1); }); @@ -121,7 +121,7 @@ describe('Functions Command', () => { }; const result = await functions.handler.call(context, args); - expect(result).to.include('All functions deployed successfully'); + expect(result).to.include('All functions processed successfully'); expect(mockClientInstance._history.post.length).to.equal(1); });