fix(ls): oas31 lint and completion rules for

swagger-api · Oct 5, 2022 · 766f74a · 766f74a
1 parent e4a91d7
commit 766f74a
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 22 deletions.
diff --git a/packages/apidom-ls/src/config/codes.ts b/packages/apidom-ls/src/config/codes.ts
@@ -697,7 +697,7 @@ enum ApilintCodes {
 
   OPENAPI3_1_OPEN_API = 7010000,
   OPENAPI3_1_OPEN_API_FIELD_WEBHOOKS_TYPE = 7010100,
-  OPENAPI3_1_OPEN_API_FIELD_JSON_SCHEMA_DIALECT_TYPE = 7010200,
+  OPENAPI3_1_OPEN_API_FIELD_JSON_SCHEMA_FORMAT_URI = 7010200,
   OPENAPI3_1_OPEN_API_FIELD_INFO_TYPE = 7010300,
   OPENAPI3_1_OPEN_API_FIELD_INFO_TYPE_REQUIRED,
 

diff --git a/packages/apidom-ls/src/config/openapi/openapi3_1/completion.ts b/packages/apidom-ls/src/config/openapi/openapi3_1/completion.ts
@@ -126,7 +126,7 @@ const completion: ApidomCompletionItem[] = [
     label: 'jsonSchemaDialect',
     insertText: 'jsonSchemaDialect',
     kind: 14,
-    format: CompletionFormat.OBJECT,
+    format: CompletionFormat.UNQUOTED,
     type: CompletionType.PROPERTY,
     insertTextFormat: 2,
     documentation: {

diff --git a/packages/apidom-ls/src/config/openapi/openapi3_1/lint/index.ts b/packages/apidom-ls/src/config/openapi/openapi3_1/lint/index.ts
@@ -1,8 +1,8 @@
 import allowedFieldsLint from './allowed-fields';
 import infoRequiredLint from './info--required';
-import jsonSchemaDialectTypeLint from './jsonSchemaDialect--type';
+import jsonSchemaDialectFormatURILint from './jsonSchemaDialect--format-uri';
 import webhooksLint from './webhooks--type';
 
-const lints = [allowedFieldsLint, infoRequiredLint, jsonSchemaDialectTypeLint, webhooksLint];
+const lints = [allowedFieldsLint, infoRequiredLint, jsonSchemaDialectFormatURILint, webhooksLint];
 
 export default lints;
diff --git a/packages/apidom-ls/src/config/openapi/openapi3_1/lint/jsonSchemaDialect--format-uri.ts b/packages/apidom-ls/src/config/openapi/openapi3_1/lint/jsonSchemaDialect--format-uri.ts
@@ -0,0 +1,15 @@
+import ApilintCodes from '../../../codes';
+import { LinterMeta } from '../../../../apidom-language-types';
+
+const jsonSchemaDialectFormatURILint: LinterMeta = {
+  code: ApilintCodes.OPENAPI3_1_OPEN_API_FIELD_JSON_SCHEMA_FORMAT_URI,
+  source: 'apilint',
+  message: "'jsonSchemaDialect' value MUST be in the form of a URI.",
+  severity: 1,
+  linterFunction: 'apilintValidURI',
+  marker: 'value',
+  target: 'jsonSchemaDialect',
+  data: {},
+};
+
+export default jsonSchemaDialectFormatURILint;
diff --git a/packages/apidom-ls/src/config/openapi/openapi3_1/lint/jsonSchemaDialect--type.ts b/packages/apidom-ls/src/config/openapi/openapi3_1/lint/jsonSchemaDialect--type.ts
diff --git a/packages/apidom-ls/src/config/openapi/openapi3_1/meta.ts b/packages/apidom-ls/src/config/openapi/openapi3_1/meta.ts
@@ -1,12 +1,12 @@
+import lint from './lint';
 import completion from './completion';
 import documentation from './documentation';
-import lint from './lint';
 import { FormatMeta } from '../../../apidom-language-types';
 
 const meta: FormatMeta = {
+  lint,
   completion,
   documentation,
-  lint,
 };
 
 export default meta;