Skip to content

Commit

Permalink
refactor(samples): move example generation code to samples plugin (#8727
Browse files Browse the repository at this point in the history
)

Refs #8577
  • Loading branch information
char0n committed Jun 1, 2023
1 parent ac3b69f commit 027f53c
Show file tree
Hide file tree
Showing 15 changed files with 360 additions and 160 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* @prettier
*/
import { useFn } from "../hooks"
import { useFn } from "./hooks"

export const upperFirst = (value) => {
if (typeof value === "string") {
Expand Down
2 changes: 1 addition & 1 deletion src/core/plugins/json-schema-2020-12/hoc.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ import {
stringify,
stringifyConstraints,
getDependentRequired,
} from "./fn/index"
} from "./fn"

export const withJSONSchemaContext = (Component, overrides = {}) => {
const value = {
Expand Down
6 changes: 2 additions & 4 deletions src/core/plugins/json-schema-2020-12/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,14 @@ import KeywordWriteOnly from "./components/keywords/WriteOnly"
import Accordion from "./components/Accordion/Accordion"
import ExpandDeepButton from "./components/ExpandDeepButton/ExpandDeepButton"
import ChevronRightIcon from "./components/icons/ChevronRight"
import { upperFirst, hasKeyword, isExpandable } from "./fn/index"
import { upperFirst, hasKeyword, isExpandable } from "./fn"
import {
inferSchema,
sampleFromSchema,
sampleFromSchemaGeneric,
createXMLExample,
memoizedSampleFromSchema,
memoizedCreateXMLExample,
} from "./fn/samples"
} from "./samples-extensions/fn"
import { JSONSchemaDeepExpansionContext } from "./context"
import { useFn, useConfig, useComponent, useIsExpandedDeeply } from "./hooks"
import { withJSONSchemaContext } from "./hoc"
Expand Down Expand Up @@ -113,7 +112,6 @@ const JSONSchema202012Plugin = () => ({
useConfig,
useComponent,
useIsExpandedDeeply,
inferSchema,
sampleFromSchema,
sampleFromSchemaGeneric,
createXMLExample,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -709,16 +709,6 @@ export const sampleFromSchemaGeneric = (
return value
}

export const inferSchema = (thing) => {
if (thing.schema) thing = thing.schema

if (thing.properties) {
thing.type = "object"
}

return thing // Hopefully this will have something schema like in it... `type` for example
}

export const createXMLExample = (schema, config, o) => {
const json = sampleFromSchemaGeneric(schema, config, o, true)
if (!json) {
Expand Down
3 changes: 1 addition & 2 deletions src/core/plugins/oas31/fn.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ export const createOnlyOAS31ComponentWrapper =
/* eslint-enable react/jsx-filename-extension */

/** Utilize JSON Schema 2020-12 samples **/
export const wrapSampleFn =
const wrapSampleFn =
(fnName) =>
(getSystem) =>
(...args) => {
Expand All @@ -111,7 +111,6 @@ export const wrapSampleFn =
return fn[fnName](...args)
}

export const wrapInferSchema = wrapSampleFn("inferSchema")
export const wrapSampleFromSchema = wrapSampleFn("sampleFromSchema")
export const wrapSampleFromSchemaGeneric = wrapSampleFn(
"sampleFromSchemaGeneric"
Expand Down
2 changes: 0 additions & 2 deletions src/core/plugins/oas31/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import {
isOAS31 as isOAS31Fn,
createOnlyOAS31Selector as createOnlyOAS31SelectorFn,
createSystemSelector as createSystemSelectorFn,
wrapInferSchema,
wrapSampleFromSchema,
wrapSampleFromSchemaGeneric,
wrapCreateXMLExample,
Expand Down Expand Up @@ -90,7 +89,6 @@ const OAS31Plugin = ({ getSystem }) => {
}
// wraps schema generators and make them specific to OpenAPI version
if (typeof system.fn.inferSchema === "function") {
pluginFn.inferSchema = wrapInferSchema(getSystem)
pluginFn.sampleFromSchema = wrapSampleFromSchema(getSystem)
pluginFn.sampleFromSchemaGeneric = wrapSampleFromSchemaGeneric(getSystem)
pluginFn.createXMLExample = wrapCreateXMLExample(getSystem)
Expand Down
32 changes: 32 additions & 0 deletions src/core/plugins/samples/fn/get-json-sample-schema.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/**
* @prettier
*/
import some from "lodash/some"

const shouldStringifyTypesConfig = [
{
when: /json/,
shouldStringifyTypes: ["string"],
},
]
const defaultStringifyTypes = ["object"]
const makeGetJsonSampleSchema =
(getSystem) => (schema, config, contentType, exampleOverride) => {
const { fn } = getSystem()
const res = fn.memoizedSampleFromSchema(schema, config, exampleOverride)
const resType = typeof res

const typesToStringify = shouldStringifyTypesConfig.reduce(
(types, nextConfig) =>
nextConfig.when.test(contentType)
? [...types, ...nextConfig.shouldStringifyTypes]
: types,
defaultStringifyTypes
)

return some(typesToStringify, (x) => x === resType)
? JSON.stringify(res, null, 2)
: res
}

export default makeGetJsonSampleSchema
30 changes: 30 additions & 0 deletions src/core/plugins/samples/fn/get-sample-schema.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
/**
* @prettier
*/
const makeGetSampleSchema =
(getSystem) =>
(schema, contentType = "", config = {}, exampleOverride = undefined) => {
const { fn } = getSystem()

if (typeof schema?.toJS === "function") {
schema = schema.toJS()
}
if (typeof exampleOverride?.toJS === "function") {
exampleOverride = exampleOverride.toJS()
}

if (/xml/.test(contentType)) {
return fn.getXmlSampleSchema(schema, config, exampleOverride)
}
if (/(yaml|yml)/.test(contentType)) {
return fn.getYamlSampleSchema(
schema,
config,
contentType,
exampleOverride
)
}
return fn.getJsonSampleSchema(schema, config, contentType, exampleOverride)
}

export default makeGetSampleSchema
31 changes: 31 additions & 0 deletions src/core/plugins/samples/fn/get-xml-sample-schema.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
/**
* @prettier
*/
const makeGetXmlSampleSchema =
(getSystem) => (schema, config, exampleOverride) => {
const { fn } = getSystem()

if (schema && !schema.xml) {
schema.xml = {}
}
if (schema && !schema.xml.name) {
if (
!schema.$$ref &&
(schema.type ||
schema.items ||
schema.properties ||
schema.additionalProperties)
) {
// eslint-disable-next-line quotes
return '<?xml version="1.0" encoding="UTF-8"?>\n<!-- XML example cannot be generated; root element name is undefined -->'
}
if (schema.$$ref) {
let match = schema.$$ref.match(/\S*\/(\S+)$/)
schema.xml.name = match[1]
}
}

return fn.memoizedCreateXMLExample(schema, config, exampleOverride)
}

export default makeGetXmlSampleSchema
34 changes: 34 additions & 0 deletions src/core/plugins/samples/fn/get-yaml-sample-schema.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/**
* @prettier
*/
import YAML, { JSON_SCHEMA } from "js-yaml"

const makeGetYamlSampleSchema =
(getSystem) => (schema, config, contentType, exampleOverride) => {
const { fn } = getSystem()
const jsonExample = fn.getJsonSampleSchema(
schema,
config,
contentType,
exampleOverride
)
let yamlString
try {
yamlString = YAML.dump(
YAML.load(jsonExample),
{
lineWidth: -1, // don't generate line folds
},
{ schema: JSON_SCHEMA }
)
if (yamlString[yamlString.length - 1] === "\n") {
yamlString = yamlString.slice(0, yamlString.length - 1)
}
} catch (e) {
console.error(e)
return "error: could not generate yaml example"
}
return yamlString.replace(/\t/g, " ")
}

export default makeGetYamlSampleSchema
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import RandExp from "randexp"
import isEmpty from "lodash/isEmpty"
import { objectify, isFunc, normalizeArray, deeplyStripKey } from "core/utils"

import memoizeN from "../../../helpers/memoizeN"
import memoizeN from "../../../../helpers/memoizeN"

const generateStringFromRegex = (pattern) => {
try {
Expand Down
35 changes: 31 additions & 4 deletions src/core/plugins/samples/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,32 @@
import * as fn from "./fn"
/**
* @prettier
*/
import {
sampleFromSchema,
inferSchema,
sampleFromSchemaGeneric,
createXMLExample,
memoizedCreateXMLExample,
memoizedSampleFromSchema,
} from "./fn/index"
import makeGetJsonSampleSchema from "./fn/get-json-sample-schema"
import makeGetYamlSampleSchema from "./fn/get-yaml-sample-schema"
import makeGetXmlSampleSchema from "./fn/get-xml-sample-schema"
import makeGetSampleSchema from "./fn/get-sample-schema"

export default function () {
return { fn }
}
const SamplesPlugin = ({ getSystem }) => ({
fn: {
inferSchema,
sampleFromSchema,
sampleFromSchemaGeneric,
createXMLExample,
memoizedSampleFromSchema,
memoizedCreateXMLExample,
getJsonSampleSchema: makeGetJsonSampleSchema(getSystem),
getYamlSampleSchema: makeGetYamlSampleSchema(getSystem),
getXmlSampleSchema: makeGetXmlSampleSchema(getSystem),
getSampleSchema: makeGetSampleSchema(getSystem),
},
})

export default SamplesPlugin
Loading

0 comments on commit 027f53c

Please sign in to comment.