docusaurus-theme-openapi-docs 0.0.0-1110 → 0.0.0-1151

package/lib/index.js

@@ -38,6 +38,7 @@ function docusaurusThemeOpenAPI() {
                     resolve: {
                         fallback: {
                             buffer: require.resolve("buffer/"),
+                            path: require.resolve("path-browserify"),
                         },
                     },
                     plugins: [
@@ -67,6 +68,7 @@ function docusaurusThemeOpenAPI() {
                 resolve: {
                     fallback: {
                         buffer: require.resolve("buffer/"),
+                        path: require.resolve("path-browserify"),
                     },
                 },
                 plugins: [

package/lib/theme/ApiExplorer/Accept/index.js

@@ -27,8 +27,9 @@ function Accept() {
   }
   return react_1.default.createElement(
     FormItem_1.default,
-    { label: "Accept" },
+    null,
     react_1.default.createElement(FormSelect_1.default, {
+      label: "Accept",
       value: value,
       options: options,
       onChange: (e) => dispatch((0, slice_1.setAccept)(e.target.value)),

package/lib/theme/ApiExplorer/Authorization/index.js

@@ -39,13 +39,12 @@ function Authorization() {
     optionKeys.length > 1 &&
       react_1.default.createElement(
         FormItem_1.default,
-        {
+        null,
+        react_1.default.createElement(FormSelect_1.default, {
           label: (0, Translate_1.translate)({
             id: translationIds_1.OPENAPI_AUTH.SECURITY_SCHEME,
             message: "Security Scheme",
           }),
-        },
-        react_1.default.createElement(FormSelect_1.default, {
           options: optionKeys,
           value: selected,
           onChange: (e) => {
@@ -57,14 +56,12 @@ function Authorization() {
       if (a.type === "http" && a.scheme === "bearer") {
         return react_1.default.createElement(
           FormItem_1.default,
-          {
+          { key: a.key + "-bearer" },
+          react_1.default.createElement(FormTextInput_1.default, {
             label: (0, Translate_1.translate)({
               id: translationIds_1.OPENAPI_AUTH.BEARER_TOKEN,
               message: "Bearer Token",
             }),
-            key: a.key + "-bearer",
-          },
-          react_1.default.createElement(FormTextInput_1.default, {
             placeholder: (0, Translate_1.translate)({
               id: translationIds_1.OPENAPI_AUTH.BEARER_TOKEN,
               message: "Bearer Token",
@@ -87,14 +84,12 @@ function Authorization() {
       if (a.type === "oauth2") {
         return react_1.default.createElement(
           FormItem_1.default,
-          {
+          { key: a.key + "-oauth2" },
+          react_1.default.createElement(FormTextInput_1.default, {
             label: (0, Translate_1.translate)({
               id: translationIds_1.OPENAPI_AUTH.BEARER_TOKEN,
               message: "Bearer Token",
             }),
-            key: a.key + "-oauth2",
-          },
-          react_1.default.createElement(FormTextInput_1.default, {
             placeholder: (0, Translate_1.translate)({
               id: translationIds_1.OPENAPI_AUTH.BEARER_TOKEN,
               message: "Bearer Token",
@@ -120,13 +115,12 @@ function Authorization() {
           { key: a.key + "-basic" },
           react_1.default.createElement(
             FormItem_1.default,
-            {
+            null,
+            react_1.default.createElement(FormTextInput_1.default, {
               label: (0, Translate_1.translate)({
                 id: translationIds_1.OPENAPI_AUTH.USERNAME,
                 message: "Username",
               }),
-            },
-            react_1.default.createElement(FormTextInput_1.default, {
               placeholder: (0, Translate_1.translate)({
                 id: translationIds_1.OPENAPI_AUTH.USERNAME,
                 message: "Username",
@@ -146,13 +140,12 @@ function Authorization() {
           ),
           react_1.default.createElement(
             FormItem_1.default,
-            {
+            null,
+            react_1.default.createElement(FormTextInput_1.default, {
               label: (0, Translate_1.translate)({
                 id: translationIds_1.OPENAPI_AUTH.PASSWORD,
                 message: "Password",
               }),
-            },
-            react_1.default.createElement(FormTextInput_1.default, {
               placeholder: (0, Translate_1.translate)({
                 id: translationIds_1.OPENAPI_AUTH.PASSWORD,
                 message: "Password",
@@ -176,8 +169,9 @@ function Authorization() {
       if (a.type === "apiKey") {
         return react_1.default.createElement(
           FormItem_1.default,
-          { label: `${a.key}`, key: a.key + "-apikey" },
+          { key: a.key + "-apikey" },
           react_1.default.createElement(FormTextInput_1.default, {
+            label: `${a.key}`,
             placeholder: `${a.key}`,
             password: true,
             value: data[a.key].apiKey ?? "",

package/lib/theme/ApiExplorer/Body/FormBodyItem/index.d.ts

@@ -4,6 +4,8 @@ interface FormBodyItemProps {
     schemaObject: SchemaObject;
     id: string;
     schema: SchemaObject;
+    label?: string;
+    required?: boolean;
 }
-export default function FormBodyItem({ schemaObject, id, schema, }: FormBodyItemProps): React.JSX.Element;
+export default function FormBodyItem({ schemaObject, id, schema, label, required, }: FormBodyItemProps): React.JSX.Element;
 export {};

package/lib/theme/ApiExplorer/Body/FormBodyItem/index.js

@@ -16,6 +16,7 @@ const react_1 = __importDefault(require("react"));
 const FormFileUpload_1 = __importDefault(
   require("@theme/ApiExplorer/FormFileUpload")
 );
+const FormLabel_1 = __importDefault(require("@theme/ApiExplorer/FormLabel"));
 const FormSelect_1 = __importDefault(require("@theme/ApiExplorer/FormSelect"));
 const FormTextInput_1 = __importDefault(
   require("@theme/ApiExplorer/FormTextInput")
@@ -26,36 +27,54 @@ const FileArrayFormBodyItem_1 = __importDefault(
   require("../FileArrayFormBodyItem")
 );
 const slice_1 = require("../slice");
-function FormBodyItem({ schemaObject, id, schema }) {
+function FormBodyItem({ schemaObject, id, schema, label, required }) {
   const dispatch = (0, hooks_1.useTypedDispatch)();
   if (
     schemaObject.type === "array" &&
     schemaObject.items?.format === "binary"
   ) {
-    return react_1.default.createElement(FileArrayFormBodyItem_1.default, {
-      id: id,
-      description: schemaObject.description,
-    });
+    return react_1.default.createElement(
+      react_1.default.Fragment,
+      null,
+      label &&
+        react_1.default.createElement(FormLabel_1.default, {
+          label: label,
+          required: required,
+        }),
+      react_1.default.createElement(FileArrayFormBodyItem_1.default, {
+        id: id,
+        description: schemaObject.description,
+      })
+    );
   }
   if (schemaObject.format === "binary") {
-    return react_1.default.createElement(FormFileUpload_1.default, {
-      placeholder: schemaObject.description || id,
-      onChange: (file) => {
-        if (file === undefined) {
-          dispatch((0, slice_1.clearFormBodyKey)(id));
-          return;
-        }
-        dispatch(
-          (0, slice_1.setFileFormBody)({
-            key: id,
-            value: {
-              src: `/path/to/${file.name}`,
-              content: file,
-            },
-          })
-        );
-      },
-    });
+    return react_1.default.createElement(
+      react_1.default.Fragment,
+      null,
+      label &&
+        react_1.default.createElement(FormLabel_1.default, {
+          label: label,
+          required: required,
+        }),
+      react_1.default.createElement(FormFileUpload_1.default, {
+        placeholder: schemaObject.description || id,
+        onChange: (file) => {
+          if (file === undefined) {
+            dispatch((0, slice_1.clearFormBodyKey)(id));
+            return;
+          }
+          dispatch(
+            (0, slice_1.setFileFormBody)({
+              key: id,
+              value: {
+                src: `/path/to/${file.name}`,
+                content: file,
+              },
+            })
+          );
+        },
+      })
+    );
   }
   if (
     schemaObject.type === "object" &&
@@ -67,12 +86,21 @@ function FormBodyItem({ schemaObject, id, schema }) {
       2
     );
     return react_1.default.createElement(
-      LiveEditor_1.default,
-      {
-        action: (code) =>
-          dispatch((0, slice_1.setStringFormBody)({ key: id, value: code })),
-      },
-      objectExample
+      react_1.default.Fragment,
+      null,
+      label &&
+        react_1.default.createElement(FormLabel_1.default, {
+          label: label,
+          required: required,
+        }),
+      react_1.default.createElement(
+        LiveEditor_1.default,
+        {
+          action: (code) =>
+            dispatch((0, slice_1.setStringFormBody)({ key: id, value: code })),
+        },
+        objectExample
+      )
     );
   }
   if (
@@ -80,6 +108,8 @@ function FormBodyItem({ schemaObject, id, schema }) {
     schemaObject.enum.every((value) => typeof value === "string")
   ) {
     return react_1.default.createElement(FormSelect_1.default, {
+      label: label,
+      required: required,
       options: ["---", ...schemaObject.enum],
       onChange: (e) => {
         const val = e.target.value;
@@ -98,6 +128,8 @@ function FormBodyItem({ schemaObject, id, schema }) {
   }
   // TODO: support all the other types.
   return react_1.default.createElement(FormTextInput_1.default, {
+    label: label,
+    required: required,
     paramName: id,
     isRequired: Array.isArray(schema.required) && schema.required.includes(id),
     placeholder: schemaObject.description || id,

package/lib/theme/ApiExplorer/Body/index.js

@@ -368,16 +368,14 @@ function Body({
       Object.entries(schema.properties ?? {}).map(([key, val]) => {
         return react_1.default.createElement(
           FormItem_1.default,
-          {
-            key: key,
-            label: key,
-            required:
-              Array.isArray(schema.required) && schema.required.includes(key),
-          },
+          { key: key },
           react_1.default.createElement(FormBodyItem_1.default, {
             schemaObject: val,
             id: key,
             schema: schema,
+            label: key,
+            required:
+              Array.isArray(schema.required) && schema.required.includes(key),
           })
         );
       })