@jarenjs/contract 0.49.2 → 0.66.1

package/src/cli.js

@@ -20,6 +20,7 @@ import * as path from 'node:path';
 import { compileContract } from './compile.js';
 import { ContractCompileError, ContractHostError } from './errors.js';
 import { diffContracts } from './diff.js';
+import { loadDocument } from '@jarenjs/json/node';
 import { publicProjection } from './public.js';
 import { toOpenApi } from './project/openapi.js';
 
@@ -84,7 +85,11 @@ function parseArgs(argv) {
       case '--contract': options.contract = argv[++i] ?? null; break;
       case '--from': options.from = argv[++i] ?? null; break;
       case '--to': options.to = argv[++i] ?? null; break;
-      case '--fail-on': options.failOn = argv[++i] ?? null; break;
+      case '--fail-on':
+        if (argv[i + 1] === undefined || argv[i + 1].startsWith('-'))
+          throw new Error('--fail-on needs at least one change class');
+        options.failOn = argv[++i];
+        break;
       case '--out': options.out = argv[++i] ?? null; break;
       case '--check': options.check = true; break;
       case '--lenient': options.lenient = true; break;
@@ -147,16 +152,22 @@ function fail(message, usage = false) {
 const DIFF_CLASSES = ['breaking', 'additive', 'neutral', 'unknown'];
 
 /**
- * Read a contract document, exit 2 on an unreadable file.
+ * Read a contract document — a `.json` file, or a pure module whose
+ * `default` (or `contract`) export is the document or a pen builder
+ * that emits one — through the suite's one loader (`@jarenjs/json/node`,
+ * shared with `jaren-db`): the module is evaluated twice and refused
+ * when the two emissions differ. Exit 2 on every refusal, naming the
+ * flag and the file.
  * @param {string} file
- * @param {string} flag
+ * @param {string} what - `contract`, or the diff flag (`--from`, `--to`)
+ * @returns {Promise<any>}
  */
-function readDocument(file, flag) {
+async function readDocument(file, what) {
   try {
-    return JSON.parse(fs.readFileSync(file, 'utf8'));
+    return await loadDocument(file, { what, exportName: 'contract' });
   }
   catch (error) {
-    fail(`cannot read ${flag} '${file}': ${/** @type {Error} */ (error).message}`);
+    fail(/** @type {Error} */ (error).message);
     return null; // unreachable — fail() exits
   }
 }
@@ -166,18 +177,19 @@ function readDocument(file, flag) {
  * `--fail-on` exit 1 when a named class is non-empty.
  * @param {ReturnType<typeof parseArgs>} options
  */
-function runDiff(options) {
+async function runDiff(options) {
   if (options.from === null || options.to === null) return fail('diff needs --from <file> and --to <file>', true);
   /** @type {string[]} */
   let failOn = [];
   if (options.failOn !== null) {
     failOn = options.failOn.split(',').map((s) => s.trim()).filter((s) => s.length > 0);
+    if (failOn.length === 0) return fail('--fail-on needs at least one change class', true);
     for (const name of failOn) {
       if (!DIFF_CLASSES.includes(name)) return fail(`--fail-on '${name}' is not a change class (${DIFF_CLASSES.join(', ')})`, true);
     }
   }
-  const from = readDocument(options.from, '--from');
-  const to = readDocument(options.to, '--to');
+  const from = await readDocument(options.from, '--from');
+  const to = await readDocument(options.to, '--to');
   let diff;
   try {
     diff = diffContracts(from, to);
@@ -214,13 +226,7 @@ async function main() {
   if (options.contract === null) return fail('--contract <file> is required', true);
   if (options.check && options.out === null) return fail('--check needs --out', true);
 
-  let doc;
-  try {
-    doc = JSON.parse(fs.readFileSync(options.contract, 'utf8'));
-  }
-  catch (error) {
-    return fail(`cannot read contract '${options.contract}': ${/** @type {Error} */ (error).message}`);
-  }
+  const doc = await readDocument(options.contract, 'contract');
   let rendered;
   try {
     const contract = compileContract(doc);