@redocly/openapi-core 1.0.0-beta.112 → 1.0.0-beta.113

package/lib/config/config-resolvers.js

@@ -33,22 +33,19 @@ const config_1 = require("./config");
 const logger_1 = require("../logger");
 const asserts_1 = require("../rules/common/assertions/asserts");
 function resolveConfig(rawConfig, configPath) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
         if ((_b = (_a = rawConfig.styleguide) === null || _a === void 0 ? void 0 : _a.extends) === null || _b === void 0 ? void 0 : _b.some(utils_3.isNotString)) {
             throw new Error(`Error configuration format not detected in extends value must contain strings`);
         }
         const resolver = new resolve_1.BaseResolver(utils_2.getResolveConfig(rawConfig.resolve));
-        const configExtends = (_d = (_c = rawConfig === null || rawConfig === void 0 ? void 0 : rawConfig.styleguide) === null || _c === void 0 ? void 0 : _c.extends) !== null && _d !== void 0 ? _d : ['recommended'];
-        const recommendedFallback = !((_e = rawConfig === null || rawConfig === void 0 ? void 0 : rawConfig.styleguide) === null || _e === void 0 ? void 0 : _e.extends);
-        const styleguideConfig = Object.assign(Object.assign({}, rawConfig === null || rawConfig === void 0 ? void 0 : rawConfig.styleguide), { extends: configExtends, recommendedFallback });
         const apis = yield resolveApis({
-            rawConfig: Object.assign(Object.assign({}, rawConfig), { styleguide: styleguideConfig }),
+            rawConfig,
             configPath,
             resolver,
         });
         const styleguide = yield resolveStyleguideConfig({
-            styleguideConfig,
+            styleguideConfig: rawConfig.styleguide,
             configPath,
             resolver,
         });

package/lib/config/config.d.ts

@@ -1,7 +1,7 @@
 import { NormalizedProblem } from '../walk';
 import { OasVersion, OasMajorVersion, Oas2RuleSet, Oas3RuleSet } from '../oas-types';
 import type { NodeType } from '../types';
-import type { DecoratorConfig, Plugin, PreprocessorConfig, Region, ResolveConfig, ResolvedApi, ResolvedConfig, ResolvedStyleguideConfig, RuleConfig } from './types';
+import type { DecoratorConfig, Plugin, PreprocessorConfig, Region, ResolveConfig, ResolvedApi, ResolvedConfig, ResolvedStyleguideConfig, RuleConfig, RuleSettings } from './types';
 export declare const IGNORE_FILE = ".redocly.lint-ignore.yaml";
 export declare const DEFAULT_REGION = "us";
 export declare const DOMAINS: {
@@ -29,15 +29,9 @@ export declare class StyleguideConfig {
     addIgnore(problem: NormalizedProblem): void;
     addProblemToIgnore(problem: NormalizedProblem): NormalizedProblem;
     extendTypes(types: Record<string, NodeType>, version: OasVersion): Record<string, NodeType>;
-    getRuleSettings(ruleId: string, oasVersion: OasVersion): {
-        severity: string;
-    };
-    getPreprocessorSettings(ruleId: string, oasVersion: OasVersion): {
-        severity: string;
-    };
-    getDecoratorSettings(ruleId: string, oasVersion: OasVersion): {
-        severity: string;
-    };
+    getRuleSettings(ruleId: string, oasVersion: OasVersion): RuleSettings;
+    getPreprocessorSettings(ruleId: string, oasVersion: OasVersion): RuleSettings;
+    getDecoratorSettings(ruleId: string, oasVersion: OasVersion): RuleSettings;
     getUnusedRules(): {
         rules: string[];
         preprocessors: string[];

package/lib/config/config.js

@@ -34,7 +34,7 @@ function getIgnoreFilePath(configFile) {
             : path.join(configFile, exports.IGNORE_FILE);
     }
     else {
-        return typeof process === 'undefined' ? undefined : path.join(process.cwd(), exports.IGNORE_FILE);
+        return env_1.isBrowser ? undefined : path.join(process.cwd(), exports.IGNORE_FILE);
     }
 }
 exports.DOMAINS = getDomains();

package/lib/config/load.js

@@ -18,7 +18,7 @@ const js_yaml_1 = require("../js-yaml");
 const config_1 = require("./config");
 const utils_2 = require("./utils");
 const config_resolvers_1 = require("./config-resolvers");
-function addConfigMetadata({ rawConfig, customExtends, configPath, tokens, }) {
+function addConfigMetadata({ rawConfig, customExtends, configPath, tokens, files, region, }) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
         if (customExtends !== undefined) {
@@ -26,8 +26,7 @@ function addConfigMetadata({ rawConfig, customExtends, configPath, tokens, }) {
             rawConfig.styleguide.extends = customExtends;
         }
         else if (utils_1.isEmptyObject(rawConfig)) {
-            // TODO: check if we can add recommended here. add message here?
-            // rawConfig.styleguide = { extends: ['recommended'], recommendedFallback: true };
+            rawConfig.styleguide = { extends: ['recommended'], recommendedFallback: true };
         }
         if (tokens === null || tokens === void 0 ? void 0 : tokens.length) {
             if (!rawConfig.resolve)
@@ -56,14 +55,13 @@ function addConfigMetadata({ rawConfig, customExtends, configPath, tokens, }) {
                     : []));
             }
         }
-        return config_resolvers_1.resolveConfig(rawConfig, configPath);
+        return config_resolvers_1.resolveConfig(Object.assign(Object.assign({}, rawConfig), { files: files !== null && files !== void 0 ? files : rawConfig.files, region: region !== null && region !== void 0 ? region : rawConfig.region }), configPath);
     });
 }
 function loadConfig(options = {}) {
     return __awaiter(this, void 0, void 0, function* () {
         const { configPath = findConfig(), customExtends, processRawConfig, files, region } = options;
-        const config = yield getConfig(configPath, processRawConfig);
-        const rawConfig = Object.assign(Object.assign({}, config), { files: files !== null && files !== void 0 ? files : config.files, region: region !== null && region !== void 0 ? region : config.region });
+        const rawConfig = yield getConfig(configPath, processRawConfig);
         const redoclyClient = new redocly_1.RedoclyClient();
         const tokens = yield redoclyClient.getTokens();
         return addConfigMetadata({
@@ -71,6 +69,8 @@ function loadConfig(options = {}) {
             customExtends,
             configPath,
             tokens,
+            files,
+            region,
         });
     });
 }

package/lib/config/rules.d.ts

@@ -1,7 +1,10 @@
 import { RuleSet, OasVersion } from '../oas-types';
 import { StyleguideConfig } from './config';
-export declare function initRules<T extends Function, P extends RuleSet<T>>(rules: P[], config: StyleguideConfig, type: 'rules' | 'preprocessors' | 'decorators', oasVersion: OasVersion): {
-    severity: string;
+import type { ProblemSeverity } from '../walk';
+declare type InitializedRule = {
+    severity: ProblemSeverity;
     ruleId: string;
     visitor: any;
-}[];
+};
+export declare function initRules<T extends Function, P extends RuleSet<T>>(rules: P[], config: StyleguideConfig, type: 'rules' | 'preprocessors' | 'decorators', oasVersion: OasVersion): InitializedRule[];
+export {};

package/lib/config/rules.js

@@ -14,16 +14,17 @@ function initRules(rules, config, type, oasVersion) {
         if (ruleSettings.severity === 'off') {
             return undefined;
         }
+        const severity = ruleSettings.severity;
         const visitors = rule(ruleSettings);
         if (Array.isArray(visitors)) {
             return visitors.map((visitor) => ({
-                severity: ruleSettings.severity,
+                severity,
                 ruleId,
                 visitor: visitor,
             }));
         }
         return {
-            severity: ruleSettings.severity,
+            severity,
             ruleId,
             visitor: visitors, // note: actually it is only one visitor object
         };

package/lib/config/types.d.ts

@@ -3,6 +3,9 @@ import type { Oas3PreprocessorsSet, OasMajorVersion, Oas3DecoratorsSet, Oas2Rule
 import type { NodeType } from '../types';
 import { Location } from '../ref-utils';
 export declare type RuleSeverity = ProblemSeverity | 'off';
+export declare type RuleSettings = {
+    severity: RuleSeverity;
+};
 export declare type PreprocessorSeverity = RuleSeverity | 'on';
 export declare type RuleConfig = RuleSeverity | ({
     severity?: ProblemSeverity;

package/lib/ref-utils.d.ts

@@ -23,3 +23,4 @@ export declare function pointerBaseName(pointer: string): string;
 export declare function refBaseName(ref: string): string;
 export declare function isAbsoluteUrl(ref: string): boolean;
 export declare function isMappingRef(mapping: string): boolean;
+export declare function isAnchor(ref: string): boolean;

package/lib/ref-utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isMappingRef = exports.isAbsoluteUrl = exports.refBaseName = exports.pointerBaseName = exports.parsePointer = exports.parseRef = exports.escapePointer = exports.unescapePointer = exports.Location = exports.isRef = exports.joinPointer = void 0;
+exports.isAnchor = exports.isMappingRef = exports.isAbsoluteUrl = exports.refBaseName = exports.pointerBaseName = exports.parsePointer = exports.parseRef = exports.escapePointer = exports.unescapePointer = exports.Location = exports.isRef = exports.joinPointer = void 0;
 const utils_1 = require("./utils");
 function joinPointer(base, key) {
     if (base === '')
@@ -74,3 +74,7 @@ function isMappingRef(mapping) {
         mapping.indexOf('/') > -1);
 }
 exports.isMappingRef = isMappingRef;
+function isAnchor(ref) {
+    return /^#[A-Za-z][A-Za-z0-9\-_:.]*$/.test(ref);
+}
+exports.isAnchor = isAnchor;

package/lib/resolve.js

@@ -186,6 +186,7 @@ function resolveDocument(opts) {
         return resolvedRefMap;
         function resolveRefsInParallel(rootNode, rootNodeDocument, rootNodePointer, type) {
             const rootNodeDocAbsoluteRef = rootNodeDocument.source.absoluteRef;
+            const anchorRefsMap = new Map();
             walk(rootNode, type, rootNodeDocAbsoluteRef + rootNodePointer);
             function walk(node, type, nodeAbsoluteRef) {
                 if (typeof node !== 'object' || node === null) {
@@ -196,6 +197,10 @@ function resolveDocument(opts) {
                     return;
                 }
                 seedNodes.add(nodeId);
+                const [_, anchor] = Object.entries(node).find(([key]) => key === '$anchor') || [];
+                if (anchor) {
+                    anchorRefsMap.set(`#${anchor}`, node);
+                }
                 if (Array.isArray(node)) {
                     const itemsType = type.items;
                     // we continue resolving unknown types, but stop early on known scalars
@@ -245,6 +250,20 @@ function resolveDocument(opts) {
                     if (hasRef(refStack.prev, ref)) {
                         throw new Error('Self-referencing circular pointer');
                     }
+                    if (ref_utils_1.isAnchor(ref.$ref)) {
+                        // Wait for all anchors in the document to be collected firstly.
+                        yield utils_1.nextTick();
+                        const resolvedRef = {
+                            resolved: true,
+                            isRemote: false,
+                            node: anchorRefsMap.get(ref.$ref),
+                            document,
+                            nodePointer: ref.$ref,
+                        };
+                        const refId = makeRefId(document.source.absoluteRef, ref.$ref);
+                        resolvedRefMap.set(refId, resolvedRef);
+                        return resolvedRef;
+                    }
                     const { uri, pointer } = ref_utils_1.parseRef(ref.$ref);
                     const isRemote = uri !== null;
                     let targetDoc;

package/lib/rules/common/spec.js

@@ -142,6 +142,12 @@ const OasSpec = () => {
                         });
                     }
                 }
+                if (propName === 'nullable' && !node.type) {
+                    report({
+                        message: 'The `type` field must be defined when the `nullable` field is used.',
+                        location: location.child([propName]),
+                    });
+                }
             }
         },
     };

package/lib/rules/utils.js

@@ -101,6 +101,9 @@ function validateExample(example, schema, dataLoc, { resolve, location, report }
         }
     }
     catch (e) {
+        if (e.message === 'discriminator: requires oneOf or anyOf composite keyword') {
+            return;
+        }
         report({
             message: `Example validation errored: ${e.message}.`,
             location: location.child('schema'),

package/lib/types/oas2.js

@@ -17,8 +17,8 @@ const Root = {
         parameters: 'NamedParameters',
         responses: 'NamedResponses',
         securityDefinitions: 'NamedSecuritySchemes',
-        security: _1.listOf('SecurityRequirement'),
-        tags: _1.listOf('Tag'),
+        security: 'SecurityRequirementList',
+        tags: 'TagList',
         externalDocs: 'ExternalDocs',
     },
     required: ['swagger', 'paths', 'info'],
@@ -55,7 +55,7 @@ const Paths = {
 const PathItem = {
     properties: {
         $ref: { type: 'string' },
-        parameters: _1.listOf('Parameter'),
+        parameters: 'ParameterList',
         get: 'Operation',
         put: 'Operation',
         post: 'Operation',
@@ -74,13 +74,13 @@ const Operation = {
         operationId: { type: 'string' },
         consumes: { type: 'array', items: { type: 'string' } },
         produces: { type: 'array', items: { type: 'string' } },
-        parameters: _1.listOf('Parameter'),
+        parameters: 'ParameterList',
         responses: 'Responses',
         schemes: { type: 'array', items: { type: 'string' } },
         deprecated: { type: 'boolean' },
-        security: _1.listOf('SecurityRequirement'),
-        'x-codeSamples': _1.listOf('XCodeSample'),
-        'x-code-samples': _1.listOf('XCodeSample'),
+        security: 'SecurityRequirementList',
+        'x-codeSamples': 'XCodeSampleList',
+        'x-code-samples': 'XCodeSampleList',
         'x-hideTryItPanel': { type: 'boolean' },
     },
     required: ['responses'],
@@ -354,8 +354,10 @@ const SecurityRequirement = {
 exports.Oas2Types = {
     Root,
     Tag,
+    TagList: _1.listOf('Tag'),
     ExternalDocs,
     SecurityRequirement,
+    SecurityRequirementList: _1.listOf('SecurityRequirement'),
     Info,
     Contact,
     License,
@@ -363,6 +365,7 @@ exports.Oas2Types = {
     PathItem,
     Parameter,
     ParameterItems,
+    ParameterList: _1.listOf('Parameter'),
     Operation,
     Examples,
     Header,
@@ -377,4 +380,5 @@ exports.Oas2Types = {
     NamedSecuritySchemes: _1.mapOf('SecurityScheme'),
     SecurityScheme,
     XCodeSample,
+    XCodeSampleList: _1.listOf('XCodeSample'),
 };

package/lib/types/oas3.js

@@ -8,9 +8,9 @@ const Root = {
     properties: {
         openapi: null,
         info: 'Info',
-        servers: _1.listOf('Server'),
-        security: _1.listOf('SecurityRequirement'),
-        tags: _1.listOf('Tag'),
+        servers: 'ServerList',
+        security: 'SecurityRequirementList',
+        tags: 'TagList',
         externalDocs: 'ExternalDocs',
         paths: 'Paths',
         components: 'Components',
@@ -92,8 +92,8 @@ const WebhooksMap = {
 const PathItem = {
     properties: {
         $ref: { type: 'string' },
-        servers: _1.listOf('Server'),
-        parameters: _1.listOf('Parameter'),
+        servers: 'ServerList',
+        parameters: 'ParameterList',
         summary: { type: 'string' },
         description: { type: 'string' },
         get: 'Operation',
@@ -137,15 +137,15 @@ const Operation = {
         description: { type: 'string' },
         externalDocs: 'ExternalDocs',
         operationId: { type: 'string' },
-        parameters: _1.listOf('Parameter'),
-        security: _1.listOf('SecurityRequirement'),
-        servers: _1.listOf('Server'),
+        parameters: 'ParameterList',
+        security: 'SecurityRequirementList',
+        servers: 'ServerList',
         requestBody: 'RequestBody',
         responses: 'Responses',
         deprecated: { type: 'boolean' },
         callbacks: 'CallbacksMap',
-        'x-codeSamples': _1.listOf('XCodeSample'),
-        'x-code-samples': _1.listOf('XCodeSample'),
+        'x-codeSamples': 'XCodeSampleList',
+        'x-code-samples': 'XCodeSampleList',
         'x-hideTryItPanel': { type: 'boolean' },
     },
     required: ['responses'],
@@ -430,17 +430,21 @@ const SecurityScheme = {
 exports.Oas3Types = {
     Root,
     Tag,
+    TagList: _1.listOf('Tag'),
     ExternalDocs,
     Server,
+    ServerList: _1.listOf('Server'),
     ServerVariable,
     ServerVariablesMap: _1.mapOf('ServerVariable'),
     SecurityRequirement,
+    SecurityRequirementList: _1.listOf('SecurityRequirement'),
     Info,
     Contact,
     License,
     Paths,
     PathItem,
     Parameter,
+    ParameterList: _1.listOf('Parameter'),
     Operation,
     Callback: _1.mapOf('PathItem'),
     CallbacksMap: _1.mapOf('Callback'),
@@ -479,5 +483,6 @@ exports.Oas3Types = {
     OAuth2Flows,
     SecurityScheme,
     XCodeSample,
+    XCodeSampleList: _1.listOf('XCodeSample'),
     WebhooksMap,
 };

package/lib/types/oas3_1.js

@@ -78,6 +78,7 @@ const Operation = {
 const Schema = {
     properties: {
         $id: { type: 'string' },
+        $anchor: { type: 'string' },
         id: { type: 'string' },
         $schema: { type: 'string' },
         definitions: 'NamedSchemas',

package/lib/types/redocly-yaml.js

@@ -59,17 +59,21 @@ const builtInRulesList = [
 const nodeTypesList = [
     'Root',
     'Tag',
+    'TagList',
     'ExternalDocs',
     'Server',
+    'ServerList',
     'ServerVariable',
     'ServerVariablesMap',
     'SecurityRequirement',
+    'SecurityRequirementList',
     'Info',
     'Contact',
     'License',
     'Paths',
     'PathItem',
     'Parameter',
+    'ParameterList',
     'Operation',
     'Callback',
     'CallbacksMap',
@@ -108,6 +112,7 @@ const nodeTypesList = [
     'OAuth2Flows',
     'SecurityScheme',
     'XCodeSample',
+    'XCodeSampleList',
     'WebhooksMap',
 ];
 const ConfigStyleguide = {

package/lib/utils.d.ts

@@ -48,3 +48,4 @@ export declare function isTruthy<Truthy>(value: Truthy | Falsy): value is Truthy
 export declare function identity<T>(value: T): T;
 export declare function keysOf<T>(obj: T): (keyof T)[];
 export declare function pickDefined<T extends Record<string, unknown>>(obj?: T): Record<string, unknown> | undefined;
+export declare function nextTick(): void;

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.pickDefined = exports.keysOf = 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;
+exports.nextTick = exports.pickDefined = exports.keysOf = 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");
@@ -223,3 +223,9 @@ function pickDefined(obj) {
     return res;
 }
 exports.pickDefined = pickDefined;
+function nextTick() {
+    new Promise((resolve) => {
+        setTimeout(resolve);
+    });
+}
+exports.nextTick = nextTick;

package/package.json

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

package/src/__tests__/bundle.test.ts

@@ -187,4 +187,50 @@ describe('bundle', () => {
     expect(problems).toHaveLength(0);
     expect(parsedMeta).toMatchSnapshot();
   });
+
+  it('should bundle refs using $anchors', async () => {
+    const testDocument = parseYamlToDocument(
+      outdent`
+        openapi: 3.1.0
+        components:
+          schemas:
+            User:
+              type: object
+              properties:
+                profile:
+                  $ref: '#user-profile'
+            UserProfile:
+              $anchor: user-profile
+              type: string
+      `,
+      ''
+    );
+
+    const config = await makeConfig({});
+
+    const {
+      bundle: { parsed },
+      problems,
+    } = await bundleDocument({
+      document: testDocument,
+      config: config,
+      externalRefResolver: new BaseResolver(),
+    });
+
+    expect(problems).toHaveLength(0);
+    expect(parsed).toMatchInlineSnapshot(`
+      openapi: 3.1.0
+      components:
+        schemas:
+          User:
+            type: object
+            properties:
+              profile:
+                $ref: '#user-profile'
+          UserProfile:
+            $anchor: user-profile
+            type: string
+
+    `);
+  });
 });

package/src/benchmark/benches/rebilly.yaml

@@ -4238,10 +4238,11 @@ components:
               type: integer
               readOnly: true
             dueReminderTime:
-              description: Time past due reminder event will be triggered
+              description: Date and time at which a past due reminder event is triggered.
               nullable: true
-              allOf:
-                - $ref: '#/components/schemas/ServerTimestamp'
+              type: string
+              format: date-time
+              readOnly: true
             dueReminderNumber:
               description: Number of past due reminder events triggered
               type: integer
@@ -9524,10 +9525,11 @@ components:
           allOf:
             - $ref: '#/components/schemas/ServerTimestamp'
         expirationReminderTime:
-          description: Time expiration reminder event will be triggered
+          description: Date and time at which an expiration reminder event is triggered.
           nullable: true
-          allOf:
-            - $ref: '#/components/schemas/ServerTimestamp'
+          type: string
+          format: date-time
+          readOnly: true
         expirationReminderNumber:
           description: Number of expiration reminder events triggered
           type: integer
@@ -10226,9 +10228,10 @@ components:
               readOnly: true
             reviewTime:
               description: Date and time of manual review.
+              type: string
               nullable: true
-              allOf:
-                - $ref: '#/components/schemas/ServerTimestamp'
+              format: date-time
+              readOnly: true
             documentMatches:
               $ref: '#/components/schemas/KycDocumentMatches'
             _links:
@@ -10587,19 +10590,22 @@ components:
         deliveryAddress:
           description: Delivery address
           nullable: true
+          type: object
           allOf:
             - $ref: '#/components/schemas/ContactObject'
         billingAddress:
           description: Billing address
           nullable: true
+          type: object
           allOf:
             - $ref: '#/components/schemas/ContactObject'
         riskMetadata:
           nullable: true
+          type: object
           example: null
-          description: >-
-            Risk metadata. If null, the value would coalesce to the risk
-            metadata captured when creating the payment token.
+          description: |-
+            Risk metadata.
+            If null, the value would coalesce to the risk metadata captured when creating the payment token.
           allOf:
             - $ref: '#/components/schemas/RiskMetadata'
         activationTime:
@@ -10842,18 +10848,16 @@ components:
                   type: string
                   format: date-time
             invoiceTimeShift:
-              description: >
-                You can shift issue time and due time of invoices for this
-                subscription.
+              description: |-
+                You can shift issue time and due time of invoices for this subscription.
 
-                This setting overrides plan settings. To use plan settings, set
-                `null`.
-
-                To use multiple plans in one subscription they all must have the
-                same billing period,
+                This setting overrides plan settings.
+                To use plan settings, set `null`.
 
+                To use multiple plans in one subscription they all must have the same billing period,
                 this property allows to subscribe to different plans.
               nullable: true
+              type: object
               example: null
               allOf:
                 - $ref: '#/components/schemas/InvoiceTimeShift'
@@ -10898,19 +10902,21 @@ components:
               type: integer
               readOnly: true
             renewalReminderTime:
-              description: Time renewal reminder event will be triggered
+              description: Time renewal reminder event will be triggered.
               nullable: true
-              allOf:
-                - $ref: '#/components/schemas/ServerTimestamp'
+              type: string
+              format: date-time
+              readOnly: true
             renewalReminderNumber:
               description: Number of renewal reminder events triggered
               type: integer
               readOnly: true
             trialReminderTime:
-              description: Time renewal reminder event will be triggered
+              description: Time renewal reminder event will be triggered.
               nullable: true
-              allOf:
-                - $ref: '#/components/schemas/ServerTimestamp'
+              type: string
+              format: date-time
+              readOnly: true
             trialReminderNumber:
               description: Number of renewal reminder events triggered
               type: integer
@@ -11807,10 +11813,12 @@ components:
         paymentInstrument:
           $ref: '#/components/schemas/PaymentInstrument'
         billingAddress:
-          description: >-
-            Billing Address. If not supplied, we use the billing address
-            associated with the payment instrument, and then customer.
+          description: |-
+            Billing address.
+            If not supplied, the billing address associated
+            with the payment instrument is used, and then customer.
           nullable: true
+          type: object
           allOf:
             - $ref: '#/components/schemas/ContactObject'
         requestId: