better handling in the validation logic
This commit is contained in:
parent
dfe63f4542
commit
7edfb9d762
@ -97,7 +97,7 @@ function validateCollectionItems(items) {
|
|||||||
if (!["prompt", "instruction", "chat-mode"].includes(item.kind)) {
|
if (!["prompt", "instruction", "chat-mode"].includes(item.kind)) {
|
||||||
return `Item ${i + 1} kind must be one of: prompt, instruction, chat-mode`;
|
return `Item ${i + 1} kind must be one of: prompt, instruction, chat-mode`;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Validate file path exists
|
// Validate file path exists
|
||||||
const filePath = path.join(__dirname, item.path);
|
const filePath = path.join(__dirname, item.path);
|
||||||
if (!fs.existsSync(filePath)) {
|
if (!fs.existsSync(filePath)) {
|
||||||
@ -123,11 +123,39 @@ function validateCollectionDisplay(display) {
|
|||||||
return "Display must be an object";
|
return "Display must be an object";
|
||||||
}
|
}
|
||||||
if (display) {
|
if (display) {
|
||||||
if (display.ordering && !["manual", "alpha"].includes(display.ordering)) {
|
// Normalize ordering and show_badge in case the YAML parser left inline comments
|
||||||
return "Display ordering must be 'manual' or 'alpha'";
|
const normalize = (val) => {
|
||||||
|
if (typeof val !== 'string') return val;
|
||||||
|
// Strip any inline comment starting with '#'
|
||||||
|
const hashIndex = val.indexOf('#');
|
||||||
|
if (hashIndex !== -1) {
|
||||||
|
val = val.substring(0, hashIndex).trim();
|
||||||
|
}
|
||||||
|
// Also strip surrounding quotes if present
|
||||||
|
if ((val.startsWith("\"") && val.endsWith("\"")) || (val.startsWith("'") && val.endsWith("'"))) {
|
||||||
|
val = val.substring(1, val.length - 1);
|
||||||
|
}
|
||||||
|
return val.trim();
|
||||||
|
};
|
||||||
|
|
||||||
|
if (display.ordering) {
|
||||||
|
const normalizedOrdering = normalize(display.ordering);
|
||||||
|
if (!["manual", "alpha"].includes(normalizedOrdering)) {
|
||||||
|
return "Display ordering must be 'manual' or 'alpha'";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (display.show_badge && typeof display.show_badge !== "boolean") {
|
|
||||||
return "Display show_badge must be boolean";
|
if (display.show_badge !== undefined) {
|
||||||
|
const raw = display.show_badge;
|
||||||
|
const normalizedBadge = normalize(raw);
|
||||||
|
// Accept boolean or string boolean values
|
||||||
|
if (typeof normalizedBadge === 'string') {
|
||||||
|
if (!['true', 'false'].includes(normalizedBadge.toLowerCase())) {
|
||||||
|
return "Display show_badge must be boolean";
|
||||||
|
}
|
||||||
|
} else if (typeof normalizedBadge !== 'boolean') {
|
||||||
|
return "Display show_badge must be boolean";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
@ -160,7 +188,7 @@ function validateCollectionManifest(collection, filePath) {
|
|||||||
// Main validation function
|
// Main validation function
|
||||||
function validateCollections() {
|
function validateCollections() {
|
||||||
const collectionsDir = path.join(__dirname, "collections");
|
const collectionsDir = path.join(__dirname, "collections");
|
||||||
|
|
||||||
if (!fs.existsSync(collectionsDir)) {
|
if (!fs.existsSync(collectionsDir)) {
|
||||||
console.log("No collections directory found - validation skipped");
|
console.log("No collections directory found - validation skipped");
|
||||||
return true;
|
return true;
|
||||||
@ -183,7 +211,7 @@ function validateCollections() {
|
|||||||
for (const file of collectionFiles) {
|
for (const file of collectionFiles) {
|
||||||
const filePath = path.join(collectionsDir, file);
|
const filePath = path.join(collectionsDir, file);
|
||||||
console.log(`\nValidating ${file}...`);
|
console.log(`\nValidating ${file}...`);
|
||||||
|
|
||||||
const collection = parseCollectionYaml(filePath);
|
const collection = parseCollectionYaml(filePath);
|
||||||
if (!collection) {
|
if (!collection) {
|
||||||
console.error(`❌ Failed to parse ${file}`);
|
console.error(`❌ Failed to parse ${file}`);
|
||||||
@ -193,7 +221,7 @@ function validateCollections() {
|
|||||||
|
|
||||||
// Validate the collection structure
|
// Validate the collection structure
|
||||||
const errors = validateCollectionManifest(collection, filePath);
|
const errors = validateCollectionManifest(collection, filePath);
|
||||||
|
|
||||||
if (errors.length > 0) {
|
if (errors.length > 0) {
|
||||||
console.error(`❌ Validation errors in ${file}:`);
|
console.error(`❌ Validation errors in ${file}:`);
|
||||||
errors.forEach(error => console.error(` - ${error}`));
|
errors.forEach(error => console.error(` - ${error}`));
|
||||||
@ -231,4 +259,4 @@ try {
|
|||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error(`Error during validation: ${error.message}`);
|
console.error(`Error during validation: ${error.message}`);
|
||||||
process.exit(1);
|
process.exit(1);
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user