fix(core): invalid then produced by Rule#toJSON (#2496)

stoplightio · Jul 7, 2023 · db91553 · db91553
1 parent ed6e1dc
commit db91553
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -145,7 +145,7 @@ commands:
     steps:
       - checkout
       - cached-dependencies
-      - run: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
+      - run: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> .npmrc
       - build
 
 jobs:

diff --git a/packages/core/src/ruleset/__tests__/ruleset.test.ts b/packages/core/src/ruleset/__tests__/ruleset.test.ts
@@ -617,8 +617,11 @@ describe('Ruleset', () => {
             severity: DiagnosticSeverity.Warning,
             then: [
               {
+                field: 'name',
                 function: 'pattern',
-                functionOptions: 'Object{}',
+                functionOptions: {
+                  match: 'Stoplight',
+                },
               },
             ],
           },
@@ -637,8 +640,11 @@ describe('Ruleset', () => {
             severity: DiagnosticSeverity.Error,
             then: [
               {
+                field: 'description',
                 function: 'pattern',
-                functionOptions: 'Object{}',
+                functionOptions: {
+                  match: 'Stoplight',
+                },
               },
             ],
           },
@@ -657,8 +663,11 @@ describe('Ruleset', () => {
             severity: DiagnosticSeverity.Warning,
             then: [
               {
+                field: 'title',
                 function: 'pattern',
-                functionOptions: 'Object{}',
+                functionOptions: {
+                  match: 'Stoplight',
+                },
               },
             ],
           },

diff --git a/packages/core/src/ruleset/index.ts b/packages/core/src/ruleset/index.ts
@@ -4,4 +4,5 @@ export { createRulesetFunction, SchemaDefinition as RulesetFunctionSchemaDefinit
 export { Format } from './format';
 export { RulesetDefinition, RuleDefinition, ParserOptions, HumanReadableDiagnosticSeverity } from './types';
 export { Ruleset, StringifiedRuleset } from './ruleset';
+export { Formats } from './formats';
 export { Rule, StringifiedRule } from './rule';
diff --git a/packages/core/src/ruleset/rule.ts b/packages/core/src/ruleset/rule.ts
@@ -2,7 +2,6 @@ import { isString } from 'lodash';
 import { DiagnosticSeverity, JsonPath, Optional } from '@stoplight/types';
 import { dirname, relative } from '@stoplight/path';
 import { pathToPointer } from '@stoplight/json';
-import { printValue } from '@stoplight/spectral-runtime';
 
 import { DEFAULT_SEVERITY_LEVEL, getDiagnosticSeverity } from './utils/severity';
 import { Ruleset } from './ruleset';
@@ -29,7 +28,7 @@ export interface IRule {
 
 type RuleJson = Omit<IRule, 'then'> & {
   name: string;
-  then: (Pick<IRuleThen, 'field'> & { function: string; functionOptions?: string })[];
+  then: (Omit<IRuleThen, 'function'> & { function: string })[];
   owner: number;
 };
 
@@ -185,9 +184,8 @@ export class Rule implements IRule {
       resolved: this.resolved,
       formats: this.formats,
       then: this.then.map(then => ({
-        ...then.function,
+        ...then,
         function: then.function.name,
-        ...('functionOptions' in then ? { functionOptions: printValue(then.functionOptions) } : null),
       })),
       given: Array.isArray(this.definition.given) ? this.definition.given : [this.definition.given],
       owner: this.owner.id,