[validator] switch to deno

Author: feederbox826

.github/workflows/validate.yml

@@ -8,11 +8,10 @@ on:
 
 jobs:
   validate:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
+    - uses: actions/checkout@v6
+    - uses: denoland/setup-deno@v2
       with:
-        node-version: '20.x'
-    - run: cd ./validator && yarn install --frozen-lockfile
-    - run: node ./validate.js --ci
+        cache: true
+    - run: deno -R -E ./validate.js --ci

README.md

@@ -89,14 +89,14 @@ Contributions are always welcome! Use the [Scraping Configuration](https://githu
 
 The scrapers in this repository can be validated against a schema and checked for common errors.
 
-First, install the validator's dependencies - inside the [`./validator`](./validator) folder, run: `yarn`.
+To run the validator, use `deno run -R=scrapers -R="validator\scraper.schema.json" validate.js` in the root of the repository.  
+Specific scrapers can be checked using: `deno run -R=scrapers -R="validator\scraper.schema.json" scrapers/foo.yml scrapers/bar.yml`
 
-Then, to run the validator, use `node validate.js` in the root of the repository.  
-Specific scrapers can be checked using: `node validate.js scrapers/foo.yml scrapers/bar.yml`
+Deno asks for env and sys permissions, these seem to mostly be from [chalk](https://www.npmjs.com/package/chalk)
 
 #### Docker option
-Instead of NodeJS being installed, Docker can be used to run the validator
+Instead of Deno being installed, Docker can be used to run the validator
 
 ```bash
-docker run --rm -v .:/app node:alpine /bin/sh -c "cd /app/validator && yarn install --silent && cd .. && node validate.js --ci"
+docker run --rm -v .:/app denoland/deno:distroless run -R=/app/ -E /app/validate.js --ci
 ```

validate.js

@@ -1,3 +1 @@
-#!/usr/bin/env node
-'use strict';
-require('./validator/index.js')();
+import "./validator/index.mjs"

validator/index.js validator/index.mjsvalidator/index.js renamed to validator/index.mjs

@@ -1,26 +1,12 @@
-#!/usr/bin/env node
-'use strict';
-
-const fs = require('fs');
-const path = require('path');
-
-const safeRequire = (name) => {
-  try {
-    return require(name);
-  } catch (error) {
-    if (error && error.code === 'MODULE_NOT_FOUND') {
-      console.log(`Error: Cannot find module '${name}', have you installed the dependencies?`);
-      process.exit(1);
-    }
-    throw error;
-  }
-};
+import fs from 'node:fs';
+import path from 'node:path';
+
+import Ajv from "npm:ajv@8"
 
-const Ajv = safeRequire('ajv').default;
-const betterAjvErrors = safeRequire('better-ajv-errors').default;
-const chalk = safeRequire('chalk');
-const YAML = safeRequire('yaml');
-const addFormats = safeRequire('ajv-formats');
+import betterAjvErrors from 'npm:better-ajv-errors@2';
+import chalk from 'npm:chalk@5';
+import { parse } from 'npm:yaml@2';
+import addFormats from "npm:ajv-formats@3"
 
 // https://www.peterbe.com/plog/nodejs-fs-walk-or-glob-or-fast-glob
 function walk(directory, ext, filepaths = []) {
@@ -46,7 +32,7 @@ class Validator {
     this.sortedURLs = flags.includes('-s');
     this.verbose = flags.includes('-v');
 
-    const schemaPath = path.resolve(__dirname, './scraper.schema.json');
+    const schemaPath = path.resolve(import.meta.dirname, './scraper.schema.json');
     this.schema = JSON.parse(fs.readFileSync(schemaPath, 'utf8'));
     this.ajv = new Ajv({
       // allErrors: true,
@@ -63,7 +49,7 @@ class Validator {
     if (files && Array.isArray(files) && files.length > 0) {
       scrapers = files.map(file => path.resolve(file));
     } else {
-      const scrapersDir = path.resolve(__dirname, '../scrapers');
+      const scrapersDir = path.resolve(import.meta.dirname, '../scrapers');
       scrapers = walk(scrapersDir, '.yml');
     }
 
@@ -81,7 +67,7 @@ class Validator {
       let contents, data;
       try {
         contents = fs.readFileSync(file, 'utf8');
-        data = YAML.parse(contents, yamlLoadOptions);
+        data = parse(contents, yamlLoadOptions);
       } catch (error) {
         console.error(`${chalk.red(chalk.bold('ERROR'))} in: ${relPath}:`);
         error.stack = null;
@@ -337,7 +323,7 @@ class Validator {
   }
 }
 
-function main(flags, files) {
+export function main(flags, files) {
   const args = process.argv.slice(2)
   flags = (flags === undefined) ? args.filter(arg => arg.startsWith('-')) : flags;
   files = (files === undefined) ? args.filter(arg => !arg.startsWith('-')) : files;
@@ -347,10 +333,6 @@ function main(flags, files) {
     process.exit(result ? 0 : 1);
   }
 }
+export default main
 
-if (require.main === module) {
-  main();
-}
-
-module.exports = main;
-module.exports.Validator = Validator;
+main()

validator/package.json

@@ -252,8 +252,14 @@
                     }
                   },
                   "oneOf": [
-                    { "required": ["ValueRandom"] },
-                    { "required": ["Value"] }
+                    {
+                      "required": ["ValueRandom"],
+                      "properties": { "ValueRandom": { "type": "integer", "minimum": 1 } }
+                    },
+                    {
+                      "required": ["Value"],
+                      "properties": { "Value": { "type": "string" } }
+                    }
                   ]
                 }
               }
@@ -348,15 +354,27 @@
                 "action": { "enum": ["scrapeXPath", "scrapeJson"] }
               }
             },
-            "then": { "required": ["scraper"] }
+            "then": {
+              "required": ["scraper"],
+              "properties": { "scraper": { "type": "string" } }
+            }
           },
           {
             "if": {
               "properties": {
                 "action": { "const": "script" }
               }
             },
-            "then": { "required": ["script"] }
+            "then": {
+              "required": ["script"],
+              "properties": {
+                "script": {
+                  "type": "array",
+                  "minItems": 1,
+                  "items": { "type": "string" }
+                }
+              }
+            }
           }
         ]
       }
@@ -411,15 +429,30 @@
               "action": { "enum": ["scrapeXPath", "scrapeJson"] }
             }
           },
-          "then": { "required": ["scraper", "queryURL"] }
+          "then": {
+            "required": ["scraper", "queryURL"],
+            "properties": {
+              "scraper": { "type": "string" },
+              "queryURL": { "type": "string" }
+            }
+          }
         },
         {
           "if": {
             "properties": {
               "action": { "const": "script" }
             }
           },
-          "then": { "required": ["script"] }
+          "then": {
+            "required": ["script"],
+            "properties": {
+              "script": {
+                "type": "array",
+                "minItems": 1,
+                "items": { "type": "string" }
+              }
+            }
+          }
         }
       ]
     },