@xyd-js/openapi 0.1.0-xyd.1 → 0.1.0-xyd.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xyd-js/openapi",
-  "version": "0.1.0-xyd.1",
+  "version": "0.1.0-xyd.2",
   "description": "",
   "main": "./dist/index.js",
   "type": "module",
@@ -11,11 +11,12 @@
     "oas": "^25.0.3",
     "openapi-sampler": "^1.5.1",
     "openapi-types": "^12.1.3",
-    "@xyd-js/uniform": "0.1.0-xyd.3"
+    "@xyd-js/uniform": "0.1.0-xyd.6"
   },
   "devDependencies": {
     "@types/js-yaml": "^4.0.9",
-    "tsup": "^8.3.0"
+    "tsup": "^8.3.0",
+    "rimraf": "^3.0.2"
   },
   "scripts": {
     "clean": "rimraf build",

package/src/paths.ts

@@ -11,14 +11,14 @@ import {
 
 // oapPathToReference converts an OpenAPI path to a uniform Reference
 export function oapPathToReference(
-    httpMethod: "get" | "put" | "post" | "delete", // TODO: ts type
+    httpMethod: "get" | "put" | "post" | "delete" | "patch", // TODO: ts type
     path: string,
     oapPath: OpenAPIV3.PathItemObject,
 ): Reference | null {
     const mType = httpMethodToUniformMethod(httpMethod)
 
     if (!mType) {
-        console.error(`Unsupported method: ${httpMethod}`)
+        console.error(`Unsupported method v222: ${httpMethod}`)
         return null
     }
 
@@ -42,7 +42,7 @@ export function oapPathToReference(
         context: {
             method: httpMethod,
 
-            path
+            path: `${encodeURIComponent(path)}`,
         },
 
         examples: {
@@ -59,10 +59,9 @@ export function oapPathToReference(
         Object.entries(paramtersMap).forEach(([key, definitionProperties]) => {
             let title: string
 
-            // TODO: add context to definition
             switch (key) {
                 case 'path':
-                    title = "Paths"
+                    title = "Path parameters"
                     break
                 case 'query':
                     title = "Query"

package/src/properties.ts

@@ -17,6 +17,12 @@ export function schemaObjectToDefinitionProperties(v: OpenAPIV3.SchemaObject): D
             }, [] as DefinitionProperty[])
         }
 
+        if (objProp.type === "array") {
+            const items = objProp.items as OpenAPIV3.SchemaObject
+
+            merged = schemaObjectToDefinitionProperties(items)
+        }
+
         return {
             name: name,
             type: objProp.type || "",

package/src/schema.ts

@@ -1,6 +1,7 @@
 import {OpenAPIV3} from "openapi-types";
 import Oas from "oas";
-import {Reference, ReferenceType} from "@xyd-js/uniform";
+
+import type {Reference, OpenAPIReferenceContext} from "@xyd-js/uniform";
 
 import {SUPPORTED_HTTP_METHODS} from "./const";
 import {oapPathToReference} from "./paths";
@@ -17,9 +18,9 @@ export function oapSchemaToReferences(
     const references: Reference[] = [];
     const oas = new Oas(schema as any);
 
-    Object.entries(schema.paths).forEach(([path, oapPath]) => {
-        let type: ReferenceType;
+    const server = schema.servers?.[0]?.url || ""
 
+    Object.entries(schema.paths).forEach(([path, oapPath]) => {
         SUPPORTED_HTTP_METHODS.forEach((eachMethod) => {
             const httpMethod = eachMethod.toLowerCase()
 
@@ -32,8 +33,10 @@ export function oapSchemaToReferences(
                     break
                 case 'delete':
                     break
+                case 'patch':
+                    break
                 default:
-                    console.error(`Unsupported method: ${httpMethod}`)
+                    console.error(`Unsupported method v111: ${httpMethod}`)
                     return
             }
 
@@ -44,6 +47,9 @@ export function oapSchemaToReferences(
             )
 
             if (reference) {
+                const ctx = reference.context as OpenAPIReferenceContext
+                ctx.path = `${encodeURIComponent(server)}${encodeURIComponent(path)}` // TODO: it should be inside `oapPathToReference` ?
+
                 const operation = oas.operation(path, httpMethod);
                 reference.examples.groups = oapExamples(oas, operation)
 

package/tsup.examples-config.ts

@@ -6,12 +6,12 @@ const isDebugMode = !!process.env.DEBUG
 
 export default defineConfig({
     entry: [
-        "./examples/webhooks/index.ts"
+        "./examples/semi/index.ts"
     ],
     format: ['esm', 'cjs'], // Output both ESM and CJS formats
     target: 'node16', // Ensure compatibility with Node.js 16
     dts: {
-        entry: "./examples/webhooks/index.ts",
+        entry: "./examples/semi/index.ts",
         resolve: true, // Resolve external types
     },
     splitting: false, // Disable code splitting