Skip to content

Move validation code to configuration-types #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rycoll merged 4 commits into from
Jul 30, 2026
Merged

Move validation code to configuration-types #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a7d5283
Move validation code to configuration-types
rphillips-cc Jul 30, 2026
952cfb9
Merge branch 'main' into move-validation-to-types
rphillips-cc Jul 30, 2026
205d658
Lint fix
rphillips-cc Jul 30, 2026
1fde860
Fix tests
rphillips-cc Jul 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,11 @@
"@bomb.sh/tab": "0.0.15",
"@clack/prompts": "1.2.0",
"@cloudcannon/configuration-loader": "0.0.10",
"@cloudcannon/configuration-types": "0.0.58",
"@cloudcannon/configuration-types": "0.0.60",
"@cloudcannon/gadget": "0.0.33",
"@cloudcannon/sdk": "0.0.10",
"ajv": "8.20.0",
"chokidar": "^4.0.3",
"citty": "0.2.2",
"fastest-levenshtein": "1.0.16",
"ignore": "7.0.5",
"yaml": "2.8.3"
}
Expand Down
26 changes: 10 additions & 16 deletions src/configure/validate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ import {
readAndParseFile,
readAndParseStdin,
SETTINGS_PATH,
validateConfig,
validateRouting,
validateSettings,
} from './validator.ts';

const args = {
Expand Down Expand Up @@ -68,14 +65,14 @@ export const validateCommand = defineCommand({
process.exit(1);
}

const validator = ctx.args.configuration
? validateConfig
const name = ctx.args.configuration
? 'global'
: ctx.args['initial-site-settings']
? validateSettings
: validateRouting;
? 'settings'
: 'routing';

const parsed = await readAndParseStdin();
if (!parsed || !checkParsed('<stdin>', validator, parsed)) {
if (!parsed || !(await checkParsed('<stdin>', name, parsed))) {
process.exit(1);
}

Expand Down Expand Up @@ -104,27 +101,24 @@ export const validateCommand = defineCommand({
process.exit(1);
}

allValid = checkParsed(configDisplayName, validateConfig, parsedConfig) && allValid;
allValid = (await checkParsed(configDisplayName, 'global', parsedConfig)) && allValid;

const splitConfigFiles = await findSplitConfigFiles(configPath, parsedConfig, targetPath);
for (let i = 0; i < splitConfigFiles.length; i++) {
allValid =
(await checkFile(
splitConfigFiles[i].filePath,
splitConfigFiles[i].validate,
targetPath
)) && allValid;
(await checkFile(splitConfigFiles[i].filePath, splitConfigFiles[i].name, targetPath)) &&
allValid;
}
}

if (doSettings) {
const settingsPath = resolve(targetPath, SETTINGS_PATH);
allValid = (await checkFile(settingsPath, validateSettings, targetPath, none)) && allValid;
allValid = (await checkFile(settingsPath, 'settings', targetPath, none)) && allValid;
}

if (doRouting) {
const routingPath = resolve(targetPath, ROUTING_PATH);
allValid = (await checkFile(routingPath, validateRouting, targetPath, none)) && allValid;
allValid = (await checkFile(routingPath, 'routing', targetPath, none)) && allValid;
}

if (!allValid) {
Expand Down
Loading