@redocly/openapi-core 1.0.0-beta.108 → 1.0.0-beta.109

package/lib/utils.d.ts

@@ -14,7 +14,7 @@ export declare function pushStack<T, P extends Stack<T> = Stack<T>>(head: P, val
 export declare function popStack<T, P extends Stack<T>>(head: P): StackFrame<T> | null;
 export declare type BundleOutputFormat = 'json' | 'yml' | 'yaml';
 export declare function loadYaml<T>(filename: string): Promise<T>;
-export declare function notUndefined<T>(x: T | undefined): x is T;
+export declare function isDefined<T>(x: T | undefined): x is T;
 export declare function isPlainObject(value: any): value is object;
 export declare function isEmptyObject(value: any): value is object;
 export declare function isEmptyArray(value: any): boolean;
@@ -41,8 +41,8 @@ export declare function assignExisting<T>(target: Record<string, T>, obj: Record
 export declare function getMatchingStatusCodeRange(code: number | string): string;
 export declare function isCustomRuleId(id: string): boolean;
 export declare function doesYamlFileExist(filePath: string): boolean;
-export declare function showWarningForDeprecatedField(deprecatedField: string, updatedField: string): void;
-export declare function showErrorForDeprecatedField(deprecatedField: string, updatedField: string): void;
+export declare function showWarningForDeprecatedField(deprecatedField: string, updatedField?: string): void;
+export declare function showErrorForDeprecatedField(deprecatedField: string, updatedField?: string): void;
 export declare type Falsy = undefined | null | false | '' | 0;
 export declare function isTruthy<Truthy>(value: Truthy | Falsy): value is Truthy;
 export declare function identity<T>(value: T): T;

package/lib/utils.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.identity = exports.isTruthy = exports.showErrorForDeprecatedField = exports.showWarningForDeprecatedField = exports.doesYamlFileExist = exports.isCustomRuleId = exports.getMatchingStatusCodeRange = exports.assignExisting = exports.isNotString = exports.isString = exports.isNotEmptyObject = exports.slash = exports.isPathParameter = exports.readFileAsStringSync = exports.isSingular = exports.validateMimeTypeOAS3 = exports.validateMimeType = exports.splitCamelCaseIntoWords = exports.omitObjectProps = exports.pickObjectProps = exports.readFileFromUrl = exports.isEmptyArray = exports.isEmptyObject = exports.isPlainObject = exports.notUndefined = exports.loadYaml = exports.popStack = exports.pushStack = exports.stringifyYaml = exports.parseYaml = void 0;
+exports.identity = exports.isTruthy = exports.showErrorForDeprecatedField = exports.showWarningForDeprecatedField = exports.doesYamlFileExist = exports.isCustomRuleId = exports.getMatchingStatusCodeRange = exports.assignExisting = exports.isNotString = exports.isString = exports.isNotEmptyObject = exports.slash = exports.isPathParameter = exports.readFileAsStringSync = exports.isSingular = exports.validateMimeTypeOAS3 = exports.validateMimeType = exports.splitCamelCaseIntoWords = exports.omitObjectProps = exports.pickObjectProps = exports.readFileFromUrl = exports.isEmptyArray = exports.isEmptyObject = exports.isPlainObject = exports.isDefined = exports.loadYaml = exports.popStack = exports.pushStack = exports.stringifyYaml = exports.parseYaml = void 0;
 const fs = require("fs");
 const path_1 = require("path");
 const minimatch = require("minimatch");
@@ -37,10 +37,10 @@ function loadYaml(filename) {
     });
 }
 exports.loadYaml = loadYaml;
-function notUndefined(x) {
+function isDefined(x) {
     return x !== undefined;
 }
-exports.notUndefined = notUndefined;
+exports.isDefined = isDefined;
 function isPlainObject(value) {
     return value !== null && typeof value === 'object' && !Array.isArray(value);
 }
@@ -190,11 +190,11 @@ function doesYamlFileExist(filePath) {
 }
 exports.doesYamlFileExist = doesYamlFileExist;
 function showWarningForDeprecatedField(deprecatedField, updatedField) {
-    logger_1.logger.warn(`The ${logger_1.colorize.red(deprecatedField)} field is deprecated. Use ${logger_1.colorize.green(updatedField)} instead. Read more about this change: https://redocly.com/docs/api-registry/guides/migration-guide-config-file/#changed-properties\n`);
+    logger_1.logger.warn(`The '${logger_1.colorize.red(deprecatedField)}' field is deprecated. ${updatedField ? `Use ${logger_1.colorize.green(updatedField)} instead. ` : ''}Read more about this change: https://redocly.com/docs/api-registry/guides/migration-guide-config-file/#changed-properties\n`);
 }
 exports.showWarningForDeprecatedField = showWarningForDeprecatedField;
 function showErrorForDeprecatedField(deprecatedField, updatedField) {
-    throw new Error(`Do not use '${deprecatedField}' field. Use '${updatedField}' instead.\n`);
+    throw new Error(`Do not use '${deprecatedField}' field. ${updatedField ? `Use '${updatedField}' instead. ` : ''}\n`);
 }
 exports.showErrorForDeprecatedField = showErrorForDeprecatedField;
 function isTruthy(value) {

package/lib/visitors.d.ts

@@ -1,9 +1,9 @@
 import type { Oas3Definition, Oas3ExternalDocs, Oas3Info, Oas3Contact, Oas3Components, Oas3License, Oas3Schema, Oas3Header, Oas3Parameter, Oas3Operation, Oas3PathItem, Oas3ServerVariable, Oas3Server, Oas3MediaType, Oas3Response, Oas3Example, Oas3RequestBody, Oas3Tag, OasRef, Oas3SecurityScheme, Oas3SecurityRequirement, Oas3Encoding, Oas3Link, Oas3Xml, Oas3Discriminator, Oas3Callback } from './typings/openapi';
-import { Oas2Definition, Oas2Tag, Oas2ExternalDocs, Oas2SecurityRequirement, Oas2Info, Oas2Contact, Oas2License, Oas2PathItem, Oas2Operation, Oas2Header, Oas2Response, Oas2Schema, Oas2Xml, Oas2Parameter, Oas2SecurityScheme } from './typings/swagger';
-import { NormalizedNodeType } from './types';
-import { Stack } from './utils';
-import { UserContext, ResolveResult, ProblemSeverity } from './walk';
-import { Location } from './ref-utils';
+import type { Oas2Definition, Oas2Tag, Oas2ExternalDocs, Oas2SecurityRequirement, Oas2Info, Oas2Contact, Oas2License, Oas2PathItem, Oas2Operation, Oas2Header, Oas2Response, Oas2Schema, Oas2Xml, Oas2Parameter, Oas2SecurityScheme } from './typings/swagger';
+import type { NormalizedNodeType } from './types';
+import type { Stack } from './utils';
+import type { UserContext, ResolveResult, ProblemSeverity } from './walk';
+import type { Location } from './ref-utils';
 export declare type VisitFunction<T> = (node: T, ctx: UserContext & {
     ignoreNextVisitorsOnNode: () => void;
 }, parents?: any, context?: any) => void;
@@ -61,7 +61,7 @@ export declare type BaseVisitor = {
     } | VisitRefFunction;
 };
 declare type Oas3FlatVisitor = {
-    DefinitionRoot?: VisitFunctionOrObject<Oas3Definition>;
+    Root?: VisitFunctionOrObject<Oas3Definition>;
     Tag?: VisitFunctionOrObject<Oas3Tag>;
     ExternalDocs?: VisitFunctionOrObject<Oas3ExternalDocs>;
     Server?: VisitFunctionOrObject<Oas3Server>;
@@ -70,13 +70,13 @@ declare type Oas3FlatVisitor = {
     Info?: VisitFunctionOrObject<Oas3Info>;
     Contact?: VisitFunctionOrObject<Oas3Contact>;
     License?: VisitFunctionOrObject<Oas3License>;
-    PathMap?: VisitFunctionOrObject<Record<string, Oas3PathItem>>;
+    PathsMap?: VisitFunctionOrObject<Record<string, Oas3PathItem>>;
     PathItem?: VisitFunctionOrObject<Oas3PathItem>;
     Callback?: VisitFunctionOrObject<Record<string, Oas3PathItem>>;
     Parameter?: VisitFunctionOrObject<Oas3Parameter>;
     Operation?: VisitFunctionOrObject<Oas3Operation>;
     RequestBody?: VisitFunctionOrObject<Oas3RequestBody>;
-    MediaTypeMap?: VisitFunctionOrObject<Record<string, Oas3MediaType>>;
+    MediaTypesMap?: VisitFunctionOrObject<Record<string, Oas3MediaType>>;
     MediaType?: VisitFunctionOrObject<Oas3MediaType>;
     Example?: VisitFunctionOrObject<Oas3Example>;
     Encoding?: VisitFunctionOrObject<Oas3Encoding>;
@@ -107,14 +107,14 @@ declare type Oas3FlatVisitor = {
     SecurityScheme?: VisitFunctionOrObject<Oas3SecurityScheme>;
 };
 declare type Oas2FlatVisitor = {
-    DefinitionRoot?: VisitFunctionOrObject<Oas2Definition>;
+    Root?: VisitFunctionOrObject<Oas2Definition>;
     Tag?: VisitFunctionOrObject<Oas2Tag>;
     ExternalDocs?: VisitFunctionOrObject<Oas2ExternalDocs>;
     SecurityRequirement?: VisitFunctionOrObject<Oas2SecurityRequirement>;
     Info?: VisitFunctionOrObject<Oas2Info>;
     Contact?: VisitFunctionOrObject<Oas2Contact>;
     License?: VisitFunctionOrObject<Oas2License>;
-    PathMap?: VisitFunctionOrObject<Record<string, Oas2PathItem>>;
+    PathsMap?: VisitFunctionOrObject<Record<string, Oas2PathItem>>;
     PathItem?: VisitFunctionOrObject<Oas2PathItem>;
     Parameter?: VisitFunctionOrObject<any>;
     Operation?: VisitFunctionOrObject<Oas2Operation>;
@@ -140,7 +140,7 @@ export declare type Oas3Visitor = BaseVisitor & Oas3NestedVisitor & Record<strin
 export declare type Oas2Visitor = BaseVisitor & Oas2NestedVisitor & Record<string, VisitFunction<any> | NestedVisitObject<any, Oas2NestedVisitor>>;
 export declare type Oas3TransformVisitor = BaseVisitor & Oas3FlatVisitor & Record<string, VisitFunction<any> | VisitObject<any>>;
 export declare type Oas2TransformVisitor = BaseVisitor & Oas2FlatVisitor & Record<string, VisitFunction<any> | VisitObject<any>>;
-export declare type NestedVisitor<T> = Exclude<T, 'any' | 'ref' | 'DefinitionRoot'>;
+export declare type NestedVisitor<T> = Exclude<T, 'any' | 'ref' | 'Root'>;
 export declare type NormalizedOasVisitors<T extends BaseVisitor> = {
     [V in keyof T]-?: {
         enter: Array<NormalizeVisitor<T[V]>>;

package/lib/visitors.js

@@ -1,6 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeVisitors = void 0;
+const legacyTypesMap = {
+    Root: 'DefinitionRoot',
+    ServerVariablesMap: 'ServerVariableMap',
+    PathsMap: 'PathMap',
+    CallbacksMap: 'CallbackMap',
+    MediaTypesMap: 'MediaTypeMap',
+    ExamplesMap: 'ExampleMap',
+    EncodingsMap: 'EncodingMap',
+    HeadersMap: 'HeaderMap',
+    LinksMap: 'LinkMap',
+};
 function normalizeVisitors(visitorsConfig, types) {
     const normalizedVisitors = {};
     normalizedVisitors.any = {
@@ -89,7 +100,8 @@ function normalizeVisitors(visitorsConfig, types) {
             }
         }
         for (const typeName of visitorKeys) {
-            const typeVisitor = visitor[typeName];
+            const typeVisitor = (visitor[typeName] ||
+                visitor[legacyTypesMap[typeName]]);
             const normalizedTypeVisitor = normalizedVisitors[typeName];
             if (!typeVisitor)
                 continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redocly/openapi-core",
-  "version": "1.0.0-beta.108",
+  "version": "1.0.0-beta.109",
   "description": "",
   "main": "lib/index.js",
   "engines": {

package/src/__tests__/__snapshots__/bundle.test.ts.snap

@@ -47,7 +47,7 @@ rootType:
           description:
             type: string
           variables:
-            name: ServerVariableMap
+            name: ServerVariablesMap
             properties: {}
         required:
           - url
@@ -94,7 +94,7 @@ rootType:
       name: ExternalDocs
     paths:
       properties: {}
-      name: PathMap
+      name: PathsMap
     components:
       properties:
         parameters:
@@ -132,7 +132,7 @@ rootType:
     - openapi
     - paths
     - info
-  name: DefinitionRoot
+  name: Root
 refTypes: {}
 visitorsData:
   registry-dependencies:

package/src/__tests__/fixtures/extension.js

@@ -9,10 +9,10 @@ function oas3_0(types) {
         parameters: listOf('Parameter'),
       },
     },
-    DefinitionRoot: {
-      ...types.DefinitionRoot,
+    Root: {
+      ...types.Root,
       properties: {
-        ...types.DefinitionRoot.properties,
+        ...types.Root.properties,
         'x-webhooks': 'XWebHooks',
       },
     },

package/src/__tests__/format.test.ts

@@ -0,0 +1,76 @@
+import { outdent } from 'outdent';
+
+import { formatProblems, getTotals } from '../format/format';
+
+describe('format', () => {
+  function replaceColors(log: string) {
+    return log
+      .replace(/\x1b\[33m(.*?)\x1b\[39m/g, '<o>$1</o>') // orange
+      .replace(/\x1b\[31m(.*?)\x1b\[39m/g, '<r>$1</r>'); // red
+  }
+
+  const problems = [
+    {
+      ruleId: 'spec',
+      location: [],
+      severity: 'error' as const,
+      message: 'message',
+      suggest: [],
+    },
+    {
+      ruleId: 'spec',
+      location: [],
+      severity: 'error' as const,
+      message: 'message 2',
+      suggest: [],
+    },
+    {
+      ruleId: 'other-rule',
+      location: [],
+      severity: 'warn' as const,
+      message: 'message',
+      suggest: [],
+    },
+  ];
+
+  let output = '';
+  beforeEach(() => {
+    output = '';
+    jest.spyOn(process.stderr, 'write').mockImplementation((str: string | Uint8Array) => {
+      output += str;
+      return true;
+    });
+  });
+
+  it('should correctly format summary output', () => {
+    formatProblems(problems, {
+      format: 'summary',
+      version: '1.0.0',
+      totals: getTotals(problems),
+      color: false,
+    });
+
+    expect(output).toMatchInlineSnapshot(`
+      "error   spec: 2
+      warning other-rule: 1
+
+      "
+    `);
+  });
+
+  it('should correctly format summary output in color mode', () => {
+    formatProblems(problems, {
+      format: 'summary',
+      version: '1.0.0',
+      totals: getTotals(problems),
+      color: true,
+    });
+
+    expect(replaceColors(output)).toMatchInlineSnapshot(`
+      "<r>error  </r> spec: 2
+      <o>warning</o> other-rule: 1
+
+      "
+    `);
+  });
+});

package/src/__tests__/lint.test.ts

@@ -12,16 +12,16 @@ describe('lint', () => {
     const results = await lintFromString({
       absoluteRef: '/test/spec.yaml',
       source: outdent`
-      openapi: 3.0.0
-      info:
-        title: Test API
-        version: "1.0"
-        description: Test
-        license: Fail
+        openapi: 3.0.0
+        info:
+          title: Test API
+          version: "1.0"
+          description: Test
+          license: Fail
 
-      servers:
-        - url: http://example.com
-      paths: {}
+        servers:
+          - url: http://example.com
+        paths: {}
     `,
       config: await loadConfig(),
     });
@@ -29,6 +29,7 @@ describe('lint', () => {
     expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`
       Array [
         Object {
+          "from": undefined,
           "location": Array [
             Object {
               "pointer": "#/info/license",
@@ -48,8 +49,7 @@ describe('lint', () => {
   it('lintConfig should work', async () => {
     const document = parseYamlToDocument(
       outdent`
-      apis: error string
-      styleguide:
+        apis: error string
         plugins:
           - './local-plugin.js'
         extends:
@@ -60,16 +60,16 @@ describe('lint', () => {
           no-invalid-media-type-examples: error
           path-http-verbs-order: error
           boolean-parameter-prefixes: off
-      features.openapi:
-        showConsole: true
-        layout:
-          scope: section
-        routingStrategy: browser
-        theme:
-          rightPanel:
-            backgroundColor: '#263238'
-          links:
-            color: '#6CC496'
+        features.openapi:
+          showConsole: true
+          layout:
+            scope: section
+          routingStrategy: browser
+          theme:
+            rightPanel:
+              backgroundColor: '#263238'
+            links:
+              color: '#6CC496'
       `,
       ''
     );
@@ -78,6 +78,7 @@ describe('lint', () => {
     expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`
       Array [
         Object {
+          "from": undefined,
           "location": Array [
             Object {
               "pointer": "#/apis",
@@ -91,6 +92,7 @@ describe('lint', () => {
           "suggest": Array [],
         },
         Object {
+          "from": undefined,
           "location": Array [
             Object {
               "pointer": "#/features.openapi/layout",
@@ -110,10 +112,9 @@ describe('lint', () => {
   it('lintConfig should detect wrong fields and suggest correct ones', async () => {
     const document = parseYamlToDocument(
       outdent`
-      api: 
-        name@version:
-          root: ./file.yaml
-      syleguide:
+        api:
+          name@version:
+            root: ./file.yaml
         rules:
           operation-2xx-response: warn
       `,
@@ -124,6 +125,7 @@ describe('lint', () => {
     expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`
       Array [
         Object {
+          "from": undefined,
           "location": Array [
             Object {
               "pointer": "#/api",
@@ -138,21 +140,6 @@ describe('lint', () => {
             "apis",
           ],
         },
-        Object {
-          "location": Array [
-            Object {
-              "pointer": "#/syleguide",
-              "reportOnKey": true,
-              "source": "",
-            },
-          ],
-          "message": "Property \`syleguide\` is not expected here.",
-          "ruleId": "configuration spec",
-          "severity": "error",
-          "suggest": Array [
-            "styleguide",
-          ],
-        },
       ]
     `);
   });
@@ -160,13 +147,13 @@ describe('lint', () => {
   it('lintConfig should work with legacy fields', async () => {
     const document = parseYamlToDocument(
       outdent`
-      apiDefinitions: 
-        entry: ./file.yaml
-      lint:
+        apis: 
+          entry: 
+            root: ./file.yaml
         rules:
           operation-2xx-response: warn
-      referenceDocs:
-        showConsole: true
+        referenceDocs:
+          showConsole: true
       `,
       ''
     );
@@ -175,16 +162,16 @@ describe('lint', () => {
     expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`Array []`);
   });
 
-  it("'plugins' shouldn't be allowed in 'apis' -> 'styleguide' field", async () => {
+  it("'plugins' shouldn't be allowed in 'apis'", async () => {
     const document = parseYamlToDocument(
       outdent`
-      apis: 
-        styleguide: 
-          plugins: 
+        apis:
+          main:
+            root: ./main.yaml
+            plugins:
             - './local-plugin.js'
-      styleguide:
         plugins:
-          - './local-plugin.js'
+        - './local-plugin.js'
       `,
       ''
     );
@@ -193,22 +180,10 @@ describe('lint', () => {
     expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`
       Array [
         Object {
+          "from": undefined,
           "location": Array [
             Object {
-              "pointer": "#/apis/styleguide",
-              "reportOnKey": true,
-              "source": "",
-            },
-          ],
-          "message": "The field \`root\` must be present on this level.",
-          "ruleId": "configuration spec",
-          "severity": "error",
-          "suggest": Array [],
-        },
-        Object {
-          "location": Array [
-            Object {
-              "pointer": "#/apis/styleguide/plugins",
+              "pointer": "#/apis/main/plugins",
               "reportOnKey": true,
               "source": "",
             },
@@ -225,31 +200,31 @@ describe('lint', () => {
   it("'const' can have any type", async () => {
     const document = parseYamlToDocument(
       outdent`
-      openapi: "3.1.0"
-      info:
-        version: 1.0.0
-        title: Swagger Petstore
-        description: Information about Petstore
-        license:
-          name: MIT
-          url: https://opensource.org/licenses/MIT
-      servers:
-        - url: http://petstore.swagger.io/v1
-      paths:
-        /pets:
-          get:
-            summary: List all pets
-            operationId: listPets
-            tags:
-              - pets
-            responses:
-              200:
-                description: An paged array of pets
-                content:
-                  application/json:
-                    schema:
-                      type: string
-                      const: ABC
+        openapi: "3.1.0"
+        info:
+          version: 1.0.0
+          title: Swagger Petstore
+          description: Information about Petstore
+          license:
+            name: MIT
+            url: https://opensource.org/licenses/MIT
+        servers:
+          - url: http://petstore.swagger.io/v1
+        paths:
+          /pets:
+            get:
+              summary: List all pets
+              operationId: listPets
+              tags:
+                - pets
+              responses:
+                200:
+                  description: An paged array of pets
+                  content:
+                    application/json:
+                      schema:
+                        type: string
+                        const: ABC
         `,
       'foobar.yaml'
     );
@@ -266,8 +241,8 @@ describe('lint', () => {
   it('detect OpenAPI should throw an error when version is not string', () => {
     const testDocument = parseYamlToDocument(
       outdent`
-      openapi: 3.0
-    `,
+        openapi: 3.0
+      `,
       ''
     );
     expect(() => detectOpenAPI(testDocument.parsed)).toThrow(
@@ -278,28 +253,28 @@ describe('lint', () => {
   it("spec rule shouldn't throw an error for named callback", async () => {
     const document = parseYamlToDocument(
       outdent`
-      openapi: 3.1.0
-      info:
-        title: Callback test
-        version: 'alpha'
-      components:
-        callbacks:
-          resultCallback:
-            '{$url}':
-              post:
-                requestBody:
-                  description: Callback payload
-                  content:
-                    'application/json':
-                      schema:
-                        type: object
-                        properties:
-                          test:
-                            type: string
-                responses:
-                  '200':
-                    description: callback successfully processed
-    `,
+        openapi: 3.1.0
+        info:
+          title: Callback test
+          version: 'alpha'
+        components:
+          callbacks:
+            resultCallback:
+              '{$url}':
+                post:
+                  requestBody:
+                    description: Callback payload
+                    content:
+                      'application/json':
+                        schema:
+                          type: object
+                          properties:
+                            test:
+                              type: string
+                  responses:
+                    '200':
+                      description: callback successfully processed
+      `,
       'foobar.yaml'
     );
 
@@ -316,23 +291,23 @@ describe('lint', () => {
     const absoluteRef = path.join(__dirname, 'fixtures/openapi.yaml');
     const document = parseYamlToDocument(
       outdent`
-      openapi: 3.0.0
-      info:
-        version: 1.0.0
-        title: Example OpenAPI 3 definition.
-        description: Information about API
-        license:
-          name: MIT
-          url: 'https://opensource.org/licenses/MIT'
-      servers:
-        - url: 'https://redocly.com/v1'
-      paths:
-        '/pets/{petId}':
-          post:
-            responses:
-              '201':
-                summary: Exist 
-                description: example description
+        openapi: 3.0.0
+        info:
+          version: 1.0.0
+          title: Example OpenAPI 3 definition.
+          description: Information about API
+          license:
+            name: MIT
+            url: 'https://opensource.org/licenses/MIT'
+        servers:
+          - url: 'https://redocly.com/v1'
+        paths:
+          '/pets/{petId}':
+            post:
+              responses:
+                '201':
+                  summary: Exist
+                  description: example description
       `,
       absoluteRef
     );

package/src/__tests__/resolve-http.test.ts

@@ -43,7 +43,7 @@ describe('Resolve http-headers', () => {
           ],
         },
       }),
-      rootType: normalizeTypes(Oas3Types).DefinitionRoot,
+      rootType: normalizeTypes(Oas3Types).Root,
     });
 
     expect(fetchMock).toBeCalledTimes(3);