zudoku 0.0.0-f06d326 → 0.0.0-f0b4321

package/dist/lib/hooks/useHotkey.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useHotkey.js","sourceRoot":"","sources":["../../../src/lib/hooks/useHotkey.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C,MAAM,MAAM,GAAG;IACb,KAAK,EAAE;QACL,GAAG,EAAE,KAAK;QACV,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,MAAM;QACZ,KAAK,EAAE,GAAG;QACV,MAAM,EAAE,KAAK;KACd;IACD,KAAK,EAAE;QACL,GAAG,EAAE,GAAG;QACR,IAAI,EAAE,GAAG;QACT,IAAI,EAAE,MAAM;QACZ,KAAK,EAAE,GAAG;QACV,MAAM,EAAE,GAAG;KACZ;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,MAAc,EAAE,QAAoB,EAAE,EAAE;IAChE,MAAM,eAAe,GAAG,MAAM,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACxD,MAAM,IAAI,GAAG,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC9C,MAAM,KAAK,GAAG,eAAe,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAChD,MAAM,GAAG,GACP,eAAe,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,eAAe,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACxE,MAAM,IAAI,GAAG,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAE9C,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;IAEpC,MAAM,WAAW,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;IAErC,SAAS,CAAC,GAAG,EAAE;QACb,WAAW,CAAC,OAAO,GAAG,QAAQ,CAAC;IACjC,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEf,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,OAAO,GAAG,CAAC,KAAoB,EAAE,EAAE;YACvC,IACE,CAAC,KAAK,CAAC,IAAI,KAAK,MAAM,GAAG,EAAE,WAAW,EAAE,EAAE;gBACxC,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,GAAG,EAAE,WAAW,EAAE,CAAC;gBAClD,KAAK,CAAC,OAAO,KAAK,IAAI;gBACtB,KAAK,CAAC,QAAQ,KAAK,KAAK;gBACxB,KAAK,CAAC,MAAM,KAAK,GAAG;gBACpB,KAAK,CAAC,OAAO,KAAK,IAAI,EACtB,CAAC;gBACD,KAAK,CAAC,cAAc,EAAE,CAAC;gBACvB,WAAW,CAAC,OAAO,EAAE,CAAC;YACxB,CAAC;QACH,CAAC,CAAC;QAEF,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC5C,OAAO,GAAG,EAAE;YACV,MAAM,CAAC,mBAAmB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACjD,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;IAElC,OAAO;QACL,OAAO,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,OAAO,EAAE;QACpC,KAAK,EAAE,eAAe,CAAC,GAAG,CAAC,CAAC,GAAW,EAAE,EAAE,CACzC,GAAG,KAAK,MAAM;YACd,GAAG,KAAK,MAAM;YACd,GAAG,KAAK,KAAK;YACb,GAAG,KAAK,OAAO;YACf,GAAG,KAAK,QAAQ;YACd,CAAC,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC;YAClD,CAAC,CAAC,GAAG,CACR;KACF,CAAC;AACJ,CAAC,CAAC"}

package/dist/lib/oas/graphql/circular.js

@@ -1,32 +1,37 @@
 import { GraphQLJSON } from "graphql-type-json";
 import { GraphQLScalarType } from "graphql/index.js";
 export const CIRCULAR_REF = "$[Circular Reference]";
-const handleCircularRefs = (obj, visited = new Map(), path = []) => {
-    if (obj === CIRCULAR_REF)
-        return CIRCULAR_REF;
+const OPENAPI_PROPS = new Set([
+    "properties",
+    "items",
+    "additionalProperties",
+    "allOf",
+    "anyOf",
+    "oneOf",
+]);
+const handleCircularRefs = (
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+obj, visited = new WeakSet(), refs = new WeakMap(), path = []) => {
     if (obj === null || typeof obj !== "object")
         return obj;
-    const currentPath = path.join(".");
-    if (obj.type === "object" && obj.properties) {
-        const schemaKey = Object.keys(obj.properties).sort().join("-");
-        if (visited.has(schemaKey)) {
-            const prevPaths = visited.get(schemaKey);
-            if (prevPaths.some((prev) => currentPath.startsWith(prev))) {
-                return CIRCULAR_REF;
-            }
-            visited.set(schemaKey, [...prevPaths, currentPath]);
-        }
-        else {
-            visited.set(schemaKey, [currentPath]);
-        }
+    if (visited.has(obj)) {
+        const cached = refs.get(obj);
+        if (cached)
+            return cached;
+        const circularProp = path.find((p) => !OPENAPI_PROPS.has(p)) || path[0];
+        return [CIRCULAR_REF, circularProp].filter(Boolean).join(":");
     }
+    visited.add(obj);
     if (Array.isArray(obj)) {
-        return obj.map((item, index) => handleCircularRefs(item, visited, [...path, `${index}`]));
+        const result = obj.map((item, index) => handleCircularRefs(item, visited, refs, [...path, index.toString()]));
+        refs.set(obj, result);
+        return result;
     }
     const result = {};
     for (const [key, value] of Object.entries(obj)) {
-        result[key] = handleCircularRefs(value, visited, [...path, key]);
+        result[key] = handleCircularRefs(value, visited, refs, [...path, key]);
     }
+    refs.set(obj, result);
     return result;
 };
 export const GraphQLJSONSchema = new GraphQLScalarType({

package/dist/lib/oas/graphql/circular.js.map

@@ -1 +1 @@
-{"version":3,"file":"circular.js","sourceRoot":"","sources":["../../../../src/lib/oas/graphql/circular.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAGrD,MAAM,CAAC,MAAM,YAAY,GAAG,uBAAuB,CAAC;AAEpD,MAAM,kBAAkB,GAAG,CACzB,GAAQ,EACR,UAAU,IAAI,GAAG,EAAoB,EACrC,OAAiB,EAAE,EACd,EAAE;IACP,IAAI,GAAG,KAAK,YAAY;QAAE,OAAO,YAAY,CAAC;IAC9C,IAAI,GAAG,KAAK,IAAI,IAAI,OAAO,GAAG,KAAK,QAAQ;QAAE,OAAO,GAAG,CAAC;IAExD,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAEnC,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC;QAC5C,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAE/D,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;YAC3B,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAE,CAAC;YAC1C,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;gBAC3D,OAAO,YAAY,CAAC;YACtB,CAAC;YACD,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,GAAG,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC;QACtD,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;QACxC,CAAC;IACH,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QACvB,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAC7B,kBAAkB,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC,CACzD,CAAC;IACJ,CAAC;IAED,MAAM,MAAM,GAAc,EAAE,CAAC;IAC7B,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QAC/C,MAAM,CAAC,GAAG,CAAC,GAAG,kBAAkB,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;IACnE,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,iBAAiB,CAAC;IACrD,GAAG,WAAW;IACd,IAAI,EAAE,YAAY;IAClB,WAAW,EAAE,6DAA6D;IAC1E,SAAS,EAAE,CAAC,KAAc,EAAE,EAAE,CAC5B,WAAW,CAAC,SAAS,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;CACnD,CAAC,CAAC"}
+{"version":3,"file":"circular.js","sourceRoot":"","sources":["../../../../src/lib/oas/graphql/circular.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAGrD,MAAM,CAAC,MAAM,YAAY,GAAG,uBAAuB,CAAC;AAEpD,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC;IAC5B,YAAY;IACZ,OAAO;IACP,sBAAsB;IACtB,OAAO;IACP,OAAO;IACP,OAAO;CACR,CAAC,CAAC;AAEH,MAAM,kBAAkB,GAAG;AACzB,8DAA8D;AAC9D,GAAQ,EACR,OAAO,GAAG,IAAI,OAAO,EAAE,EACvB,IAAI,GAAG,IAAI,OAAO,EAAE,EACpB,OAAiB,EAAE,EAEd,EAAE;IACP,IAAI,GAAG,KAAK,IAAI,IAAI,OAAO,GAAG,KAAK,QAAQ;QAAE,OAAO,GAAG,CAAC;IAExD,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;QACrB,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC7B,IAAI,MAAM;YAAE,OAAO,MAAM,CAAC;QAC1B,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC;QAExE,OAAO,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAChE,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAEjB,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QACvB,MAAM,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CACrC,kBAAkB,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CACrE,CAAC;QACF,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QACtB,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,MAAM,MAAM,GAAc,EAAE,CAAC;IAC7B,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QAC/C,MAAM,CAAC,GAAG,CAAC,GAAG,kBAAkB,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;IACzE,CAAC;IACD,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACtB,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,iBAAiB,CAAC;IACrD,GAAG,WAAW;IACd,IAAI,EAAE,YAAY;IAClB,WAAW,EAAE,6DAA6D;IAC1E,SAAS,EAAE,CAAC,KAAc,EAAE,EAAE,CAC5B,WAAW,CAAC,SAAS,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;CACnD,CAAC,CAAC"}

package/dist/lib/oas/parser/index.d.ts

@@ -19,6 +19,9 @@ export type ServerObject = DeepOmitReference<OpenAPIV3_1.ServerObject>;
 export declare const HttpMethods: OpenAPIV3.HttpMethods[];
 /**
  * Validates, dereferences and upgrades the OpenAPI schema (to v3.1) if necessary.
+ *
+ * This only happens for URL schemas (or in standalone mode).
+ * File schemas are pre-processed by the SchemaManager
  */
 export declare const validate: (schemaInput: unknown) => Promise<OpenAPIDocument>;
 export {};

package/dist/lib/oas/parser/index.js

@@ -1,3 +1,4 @@
+import { merge as mergeAllOf } from "allof-merge";
 import { GraphQLError } from "graphql/error/index.js";
 import { OpenAPIV3 } from "openapi-types";
 import { dereference } from "./dereference/index.js";
@@ -57,6 +58,9 @@ const parseSchemaInput = async (schemaInput) => {
 };
 /**
  * Validates, dereferences and upgrades the OpenAPI schema (to v3.1) if necessary.
+ *
+ * This only happens for URL schemas (or in standalone mode).
+ * File schemas are pre-processed by the SchemaManager
  */
 export const validate = async (schemaInput) => {
     const schema = await parseSchemaInput(schemaInput);
@@ -64,6 +68,8 @@ export const validate = async (schemaInput) => {
         throw new GraphQLError("OpenAPI version is not defined");
     }
     const dereferenced = await dereference(schema);
-    return upgradeSchema(dereferenced);
+    const upgraded = upgradeSchema(dereferenced);
+    const merged = mergeAllOf(upgraded);
+    return merged;
 };
 //# sourceMappingURL=index.js.map

package/dist/lib/oas/parser/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/oas/parser/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAoB,MAAM,eAAe,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAmB,MAAM,wBAAwB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAyBnD,MAAM,CAAC,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;AAEhE,MAAM,gBAAgB,GAAG,KAAK,EAC5B,WAAoB,EACwB,EAAE;IAC9C,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;QACpC,IAAI,WAAW,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YACvC,IAAI,CAAC;gBACH,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YACjC,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,IAAI,YAAY,CAAC,qBAAqB,EAAE;oBAC5C,aAAa,EAAE,GAAG;iBACnB,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QACD,IAAI,WAAW,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAChC,IAAI,QAAQ,CAAC;YACb,IAAI,CAAC;gBACH,QAAQ,GAAG,MAAM,KAAK,CAAC,WAAW,EAAE;oBAClC,KAAK,EAAE,aAAa;iBACrB,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,IAAI,YAAY,CAAC,wBAAwB,EAAE;oBAC/C,aAAa,EAAE,GAAG;iBACnB,CAAC,CAAC;YACL,CAAC;YAED,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;gBACjB,MAAM,IAAI,YAAY,CACpB,2BAA2B,QAAQ,CAAC,UAAU,EAAE,CACjD,CAAC;YACJ,CAAC;YAED,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YAEzC,IAAI,CAAC;gBACH,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;oBACtC,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAe,CAAC;gBAC9C,CAAC;qBAAM,CAAC;oBACN,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC;oBAClC,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAe,CAAC;gBAC9C,CAAC;YACH,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,IAAI,YAAY,CAAC,wBAAwB,EAAE;oBAC/C,aAAa,EAAE,GAAG;iBACnB,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC;QAClC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAEvC,IAAI,OAAO,MAAM,KAAK,QAAQ;YAAE,OAAO,MAAM,CAAC;IAChD,CAAC;IAED,IAAI,OAAO,WAAW,KAAK,QAAQ;QAAE,OAAO,WAAyB,CAAC;IAEtE,MAAM,IAAI,YAAY,CAAC,4BAA4B,GAAG,WAAW,CAAC,CAAC;AACrE,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,KAAK,EAAE,WAAoB,EAAE,EAAE;IACrD,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,WAAW,CAAC,CAAC;IAEnD,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QACpB,MAAM,IAAI,YAAY,CAAC,gCAAgC,CAAC,CAAC;IAC3D,CAAC;IAED,MAAM,YAAY,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC,CAAC;IAE/C,OAAO,aAAa,CAAC,YAAY,CAAC,CAAC;AACrC,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/oas/parser/index.ts"],"names":[],"mappings":"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"}

package/dist/lib/oas/parser/upgrade/index.d.ts

@@ -7,3 +7,4 @@ import type { OpenAPIDocument } from "../index.js";
  * https://www.openapis.org/blog/2021/02/16/migrating-from-openapi-3-0-to-3-1-0
  */
 export declare const upgradeSchema: (schema: RecordAny) => OpenAPIDocument;
+export declare function isSchemaPath(path: string[]): boolean;

package/dist/lib/oas/parser/upgrade/index.js

@@ -8,10 +8,10 @@ import { traverse } from "../../../util/traverse.js";
  */
 export const upgradeSchema = (schema) => {
     if (schema.openapi?.startsWith("3.0")) {
-        schema.openapi = "3.1.0";
+        schema.openapi = "3.1.1";
     }
     schema = traverse(schema, (sub) => {
-        if (sub.type !== "undefined" && sub.nullable === true) {
+        if (typeof sub.type !== "undefined" && sub.nullable === true) {
             sub.type = ["null", sub.type];
             delete sub.nullable;
         }
@@ -34,41 +34,60 @@ export const upgradeSchema = (schema) => {
         }
         return sub;
     });
-    schema = traverse(schema, (sub) => {
-        // may be null or undefined
-        if (sub.example) {
-            const isExampleObject = typeof sub.example === "object" &&
-                (sub.example.summary !== undefined ||
-                    sub.example.description !== undefined ||
-                    sub.example.value !== undefined ||
-                    sub.example.externalValue !== undefined);
-            const exampleValue = isExampleObject
-                ? sub.example
-                : { value: sub.example };
-            if (!sub.examples) {
-                sub.examples = { default: exampleValue };
+    schema = traverse(schema, (sub, path) => {
+        if (sub.example !== undefined) {
+            // Arrays in schemas
+            if (isSchemaPath(path ?? [])) {
+                sub.examples = [sub.example];
             }
             else {
+                // Objects everywhere else
                 sub.examples = {
-                    default: exampleValue,
-                    ...sub.examples,
+                    default: {
+                        value: sub.example,
+                    },
                 };
             }
             delete sub.example;
         }
         return sub;
     });
-    schema = traverse(schema, (sub) => {
-        if (sub.type === "object" && sub.properties !== undefined) {
-            for (const [, value] of Object.entries(sub.properties)) {
-                const v = (value ?? {});
-                if (v.type === "string" && v.format === "binary") {
-                    v.contentEncoding = "application/octet-stream";
-                    delete v.format;
+    // Multipart file uploads with a binary file
+    schema = traverse(schema, (schema, path) => {
+        if (schema.type === "object" && schema.properties !== undefined) {
+            // Check if this is a multipart request body schema
+            const parentPath = path?.slice(0, -1);
+            const isMultipart = parentPath?.some((segment, index) => {
+                return (segment === "content" && path?.[index + 1] === "multipart/form-data");
+            });
+            if (isMultipart) {
+                // Types
+                const entries = Object.entries(schema.properties);
+                for (const [, value] of entries) {
+                    if (typeof value === "object" &&
+                        value.type === "string" &&
+                        value.format === "binary") {
+                        value.contentMediaType = "application/octet-stream";
+                        delete value.format;
+                    }
                 }
             }
         }
-        return sub;
+        return schema;
+    });
+    // Uploading a binary file in a POST request
+    schema = traverse(schema, (schema, path) => {
+        if (path?.includes("content") &&
+            path.includes("application/octet-stream")) {
+            return {};
+        }
+        if (schema.type === "string" && schema.format === "binary") {
+            return {
+                type: "string",
+                contentMediaType: "application/octet-stream",
+            };
+        }
+        return schema;
     });
     schema = traverse(schema, (sub) => {
         if (sub.type === "string" && sub.format === "binary") {
@@ -76,6 +95,7 @@ export const upgradeSchema = (schema) => {
         }
         return sub;
     });
+    // Uploading an image with base64 encoding
     schema = traverse(schema, (sub) => {
         if (sub.type === "string" && sub.format === "base64") {
             return {
@@ -85,6 +105,38 @@ export const upgradeSchema = (schema) => {
         }
         return sub;
     });
+    schema = traverse(schema, (schema, path) => {
+        if (schema.type === "string" && schema.format === "byte") {
+            const parentPath = path?.slice(0, -1);
+            const contentMediaType = parentPath?.find((_, index) => path?.[index - 1] === "content");
+            return {
+                type: "string",
+                contentEncoding: "base64",
+                contentMediaType,
+            };
+        }
+        return schema;
+    });
     return schema;
 };
+export function isSchemaPath(path) {
+    const schemaLocations = [
+        ["components", "schemas"],
+        "properties",
+        "items",
+        "allOf",
+        "anyOf",
+        "oneOf",
+        "not",
+        "additionalProperties",
+    ];
+    return (schemaLocations.some((location) => {
+        if (Array.isArray(location)) {
+            return location.every((segment, index) => path[index] === segment);
+        }
+        return path.includes(location);
+    }) ||
+        path.includes("schema") ||
+        path.some((segment) => segment.endsWith("Schema")));
+}
 //# sourceMappingURL=index.js.map

package/dist/lib/oas/parser/upgrade/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/lib/oas/parser/upgrade/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/lib/oas/parser/upgrade/index.ts"],"names":[],"mappings":"AAAA,uDAAuD;AACvD,OAAO,EAAkB,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAErE;;;;;GAKG;AAEH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,MAAiB,EAAmB,EAAE;IAClE,IAAI,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;QACtC,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAED,MAAM,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE;QAChC,IAAI,OAAO,GAAG,CAAC,IAAI,KAAK,WAAW,IAAI,GAAG,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;YAC7D,GAAG,CAAC,IAAI,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;YAC9B,OAAO,GAAG,CAAC,QAAQ,CAAC;QACtB,CAAC;QAED,OAAO,GAAG,CAAC;IACb,CAAC,CAAC,CAAC;IAEH,MAAM,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE;QAChC,IAAI,GAAG,CAAC,gBAAgB,KAAK,IAAI,EAAE,CAAC;YAClC,GAAG,CAAC,gBAAgB,GAAG,GAAG,CAAC,OAAO,CAAC;YACnC,OAAO,GAAG,CAAC,OAAO,CAAC;QACrB,CAAC;aAAM,IAAI,GAAG,CAAC,gBAAgB,KAAK,KAAK,EAAE,CAAC;YAC1C,OAAO,GAAG,CAAC,gBAAgB,CAAC;QAC9B,CAAC;QAED,IAAI,GAAG,CAAC,gBAAgB,KAAK,IAAI,EAAE,CAAC;YAClC,GAAG,CAAC,gBAAgB,GAAG,GAAG,CAAC,OAAO,CAAC;YACnC,OAAO,GAAG,CAAC,OAAO,CAAC;QACrB,CAAC;aAAM,IAAI,GAAG,CAAC,gBAAgB,KAAK,KAAK,EAAE,CAAC;YAC1C,OAAO,GAAG,CAAC,gBAAgB,CAAC;QAC9B,CAAC;QAED,OAAO,GAAG,CAAC;IACb,CAAC,CAAC,CAAC;IAEH,MAAM,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;QACtC,IAAI,GAAG,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YAC9B,oBAAoB;YACpB,IAAI,YAAY,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,CAAC;gBAC7B,GAAG,CAAC,QAAQ,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC/B,CAAC;iBAAM,CAAC;gBACN,0BAA0B;gBAC1B,GAAG,CAAC,QAAQ,GAAG;oBACb,OAAO,EAAE;wBACP,KAAK,EAAE,GAAG,CAAC,OAAO;qBACnB;iBACF,CAAC;YACJ,CAAC;YACD,OAAO,GAAG,CAAC,OAAO,CAAC;QACrB,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC,CAAC,CAAC;IAEH,4CAA4C;IAC5C,MAAM,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;QACzC,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,IAAI,MAAM,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;YAChE,mDAAmD;YACnD,MAAM,UAAU,GAAG,IAAI,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YACtC,MAAM,WAAW,GAAG,UAAU,EAAE,IAAI,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;gBACtD,OAAO,CACL,OAAO,KAAK,SAAS,IAAI,IAAI,EAAE,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,qBAAqB,CACrE,CAAC;YACJ,CAAC,CAAC,CAAC;YAEH,IAAI,WAAW,EAAE,CAAC;gBAChB,QAAQ;gBACR,MAAM,OAAO,GAAoB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;gBAEnE,KAAK,MAAM,CAAC,EAAE,KAAK,CAAC,IAAI,OAAO,EAAE,CAAC;oBAChC,IACE,OAAO,KAAK,KAAK,QAAQ;wBACzB,KAAK,CAAC,IAAI,KAAK,QAAQ;wBACvB,KAAK,CAAC,MAAM,KAAK,QAAQ,EACzB,CAAC;wBACD,KAAK,CAAC,gBAAgB,GAAG,0BAA0B,CAAC;wBACpD,OAAO,KAAK,CAAC,MAAM,CAAC;oBACtB,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC,CAAC;IAEH,4CAA4C;IAC5C,MAAM,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;QACzC,IACE,IAAI,EAAE,QAAQ,CAAC,SAAS,CAAC;YACzB,IAAI,CAAC,QAAQ,CAAC,0BAA0B,CAAC,EACzC,CAAC;YACD,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,IAAI,MAAM,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC3D,OAAO;gBACL,IAAI,EAAE,QAAQ;gBACd,gBAAgB,EAAE,0BAA0B;aAC7C,CAAC;QACJ,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC,CAAC;IAEH,MAAM,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE;QAChC,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,IAAI,GAAG,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YACrD,OAAO,SAAgB,CAAC;QAC1B,CAAC;QAED,OAAO,GAAG,CAAC;IACb,CAAC,CAAC,CAAC;IAEH,0CAA0C;IAC1C,MAAM,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE;QAChC,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,IAAI,GAAG,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YACrD,OAAO;gBACL,IAAI,EAAE,QAAQ;gBACd,eAAe,EAAE,QAAQ;aAC1B,CAAC;QACJ,CAAC;QAED,OAAO,GAAG,CAAC;IACb,CAAC,CAAC,CAAC;IAEH,MAAM,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;QACzC,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,IAAI,MAAM,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;YACzD,MAAM,UAAU,GAAG,IAAI,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YACtC,MAAM,gBAAgB,GAAG,UAAU,EAAE,IAAI,CACvC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,SAAS,CAC9C,CAAC;YAEF,OAAO;gBACL,IAAI,EAAE,QAAQ;gBACd,eAAe,EAAE,QAAQ;gBACzB,gBAAgB;aACjB,CAAC;QACJ,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC,CAAC;IAEH,OAAO,MAAyB,CAAC;AACnC,CAAC,CAAC;AAEF,MAAM,UAAU,YAAY,CAAC,IAAc;IACzC,MAAM,eAAe,GAAG;QACtB,CAAC,YAAY,EAAE,SAAS,CAAC;QACzB,YAAY;QACZ,OAAO;QACP,OAAO;QACP,OAAO;QACP,OAAO;QACP,KAAK;QACL,sBAAsB;KACvB,CAAC;IAEF,OAAO,CACL,eAAe,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;QAChC,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC5B,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,OAAO,CAAC,CAAC;QACrE,CAAC;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACjC,CAAC,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;QACvB,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CACnD,CAAC;AACJ,CAAC"}

package/dist/lib/plugins/api-catalog/Catalog.d.ts

@@ -1,4 +1,4 @@
 import { type ApiCatalogPluginOptions } from "./index.js";
-export declare const Catalog: ({ items, filterCatalogItems, label, categoryLabel, }: Omit<ApiCatalogPluginOptions, "navigationId"> & {
+export declare const Catalog: ({ items, filterCatalogItems, label, categoryLabel, }: Omit<ApiCatalogPluginOptions, "path"> & {
     categoryLabel?: string;
 }) => import("react/jsx-runtime").JSX.Element;

package/dist/lib/plugins/api-catalog/Catalog.js

@@ -18,7 +18,7 @@ export const Catalog = ({ items, filterCatalogItems = (items) => items, label =
     });
     // Only index the overview page, ignore the rest
     const dataSet = activeCategory ? { "data-pagefind-ignore": "all" } : {};
-    return (_jsxs("section", { className: "pt-[--padding-content-top] pb-[--padding-content-bottom]", ...dataSet, children: [_jsx(Helmet, { children: _jsxs("title", { children: [categoryLabel ? `${categoryLabel} - ` : "", label] }) }), _jsxs("div", { className: "grid gap-4", children: [_jsxs(Heading, { level: 2, children: [label, categoryLabel && ` - ${categoryLabel}`] }), _jsx("div", { className: "grid grid-cols-2 gap-4", children: catalogItems.data
+    return (_jsxs("section", { className: "pt-(--padding-content-top)", ...dataSet, children: [_jsx(Helmet, { children: _jsxs("title", { children: [categoryLabel ? `${categoryLabel} - ` : "", label] }) }), _jsxs("div", { className: "grid gap-4", children: [_jsxs(Heading, { level: 2, children: [label, categoryLabel && ` - ${categoryLabel}`] }), _jsx("div", { className: "grid grid-cols-2 gap-4", children: catalogItems.data
                             .filter((api) => !activeCategory ||
                             api.categories.find((c) => c.tags.find((t) => getKey(c.label, t) === activeCategory)))
                             .map((api) => (_jsx(Link, { to: joinUrl(api.path), className: "no-underline hover:!text-foreground", children: _jsxs("div", { className: "border h-full rounded-lg p-4 flex flex-col gap-2 cursor-pointer hover:bg-border/20 font-normal", children: [_jsx("span", { className: "font-semibold", children: api.label }), _jsx(Markdown, { className: "text-sm whitespace-pre-wrap mb-6 line-clamp-2", content: api.description })] }) }, api.path))) })] })] }));

package/dist/lib/plugins/api-catalog/Catalog.js.map

@@ -1 +1 @@
-{"version":3,"file":"Catalog.js","sourceRoot":"","sources":["../../../../src/lib/plugins/api-catalog/Catalog.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAgC,MAAM,EAAE,MAAM,YAAY,CAAC;AAElE,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,EACtB,KAAK,EACL,kBAAkB,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,EACrC,KAAK,GAAG,aAAa,EACrB,aAAa,GAGd,EAAE,EAAE;IACH,MAAM,IAAI,GAAG,YAAY,EAAE,CAAC;IAC5B,MAAM,KAAK,GAAG,QAAQ,CAAC,EAAE,IAAI,EAAE,oBAAoB,EAAE,CAAC,CAAC;IACvD,MAAM,cAAc,GAAG,KAAK,EAAE,MAAM,CAAC,QAAQ,CAAC;IAE9C,MAAM,YAAY,GAAG,gBAAgB,CAAC;QACpC,OAAO,EAAE,GAAG,EAAE,CAAC,kBAAkB,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC;QAClD,QAAQ,EAAE,CAAC,cAAc,EAAE,IAAI,CAAC;KACjC,CAAC,CAAC;IAEH,gDAAgD;IAChD,MAAM,OAAO,GAAG,cAAc,CAAC,CAAC,CAAC,EAAE,sBAAsB,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAExE,OAAO,CACL,mBACE,SAAS,EAAC,0DAA0D,KAChE,OAAO,aAEX,KAAC,MAAM,cACL,4BACG,aAAa,CAAC,CAAC,CAAC,GAAG,aAAa,KAAK,CAAC,CAAC,CAAC,EAAE,EAC1C,KAAK,IACA,GACD,EACT,eAAK,SAAS,EAAC,YAAY,aACzB,MAAC,OAAO,IAAC,KAAK,EAAE,CAAC,aACd,KAAK,EACL,aAAa,IAAI,MAAM,aAAa,EAAE,IAC/B,EAEV,cAAK,SAAS,EAAC,wBAAwB,YACpC,YAAY,CAAC,IAAI;6BACf,MAAM,CACL,CAAC,GAAG,EAAE,EAAE,CACN,CAAC,cAAc;4BACf,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CACxB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,cAAc,CAAC,CAC1D,CACJ;6BACA,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CACZ,KAAC,IAAI,IACH,EAAE,EAAE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EACrB,SAAS,EAAC,qCAAqC,YAG/C,eAAK,SAAS,EAAC,gGAAgG,aAC7G,eAAM,SAAS,EAAC,eAAe,YAAE,GAAG,CAAC,KAAK,GAAQ,EAClD,KAAC,QAAQ,IACP,SAAS,EAAC,+CAA+C,EACzD,OAAO,EAAE,GAAG,CAAC,WAAW,GACxB,IACE,IARD,GAAG,CAAC,IAAI,CASR,CACR,CAAC,GACA,IACF,IACE,CACX,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"Catalog.js","sourceRoot":"","sources":["../../../../src/lib/plugins/api-catalog/Catalog.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAgC,MAAM,EAAE,MAAM,YAAY,CAAC;AAElE,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,EACtB,KAAK,EACL,kBAAkB,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,EACrC,KAAK,GAAG,aAAa,EACrB,aAAa,GAGd,EAAE,EAAE;IACH,MAAM,IAAI,GAAG,YAAY,EAAE,CAAC;IAC5B,MAAM,KAAK,GAAG,QAAQ,CAAC,EAAE,IAAI,EAAE,oBAAoB,EAAE,CAAC,CAAC;IACvD,MAAM,cAAc,GAAG,KAAK,EAAE,MAAM,CAAC,QAAQ,CAAC;IAE9C,MAAM,YAAY,GAAG,gBAAgB,CAAC;QACpC,OAAO,EAAE,GAAG,EAAE,CAAC,kBAAkB,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC;QAClD,QAAQ,EAAE,CAAC,cAAc,EAAE,IAAI,CAAC;KACjC,CAAC,CAAC;IAEH,gDAAgD;IAChD,MAAM,OAAO,GAAG,cAAc,CAAC,CAAC,CAAC,EAAE,sBAAsB,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAExE,OAAO,CACL,mBAAS,SAAS,EAAC,4BAA4B,KAAK,OAAO,aACzD,KAAC,MAAM,cACL,4BACG,aAAa,CAAC,CAAC,CAAC,GAAG,aAAa,KAAK,CAAC,CAAC,CAAC,EAAE,EAC1C,KAAK,IACA,GACD,EACT,eAAK,SAAS,EAAC,YAAY,aACzB,MAAC,OAAO,IAAC,KAAK,EAAE,CAAC,aACd,KAAK,EACL,aAAa,IAAI,MAAM,aAAa,EAAE,IAC/B,EAEV,cAAK,SAAS,EAAC,wBAAwB,YACpC,YAAY,CAAC,IAAI;6BACf,MAAM,CACL,CAAC,GAAG,EAAE,EAAE,CACN,CAAC,cAAc;4BACf,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CACxB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,cAAc,CAAC,CAC1D,CACJ;6BACA,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CACZ,KAAC,IAAI,IACH,EAAE,EAAE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EACrB,SAAS,EAAC,qCAAqC,YAG/C,eAAK,SAAS,EAAC,gGAAgG,aAC7G,eAAM,SAAS,EAAC,eAAe,YAAE,GAAG,CAAC,KAAK,GAAQ,EAClD,KAAC,QAAQ,IACP,SAAS,EAAC,+CAA+C,EACzD,OAAO,EAAE,GAAG,CAAC,WAAW,GACxB,IACE,IARD,GAAG,CAAC,IAAI,CASR,CACR,CAAC,GACA,IACF,IACE,CACX,CAAC;AACJ,CAAC,CAAC"}

package/dist/lib/plugins/api-catalog/index.d.ts

@@ -12,20 +12,20 @@ export type CatalogCategory = {
     tags: string[];
 };
 export type ApiCatalogPluginOptions = {
-    navigationId: string;
+    path: string;
     label: string;
     categories?: CatalogCategory[];
     items: ApiCatalogItem[];
-    filterCatalogItems?: filterCatalogItems;
+    filterCatalogItems?: FilterCatalogItemsFn;
 };
 export type CatalogContext<ProviderData = unknown> = {
     auth: AuthState<ProviderData>;
 };
-export type filterCatalogItems<ProviderData = unknown> = (items: ApiCatalogItem[], { auth }: CatalogContext<ProviderData>) => ApiCatalogItem[];
-export declare const apiCatalogPlugin: ({ navigationId, items, label, categories, filterCatalogItems, }: {
-    navigationId: string;
+export type FilterCatalogItemsFn<ProviderData = unknown> = (items: ApiCatalogItem[], { auth }: CatalogContext<ProviderData>) => ApiCatalogItem[];
+export declare const apiCatalogPlugin: ({ path, items, label, categories, filterCatalogItems, }: {
+    path: string;
     label: string;
     categories?: CatalogCategory[];
     items: ApiCatalogItem[];
-    filterCatalogItems?: filterCatalogItems;
+    filterCatalogItems?: FilterCatalogItemsFn;
 }) => ZudokuPlugin;

package/dist/lib/plugins/api-catalog/index.js

@@ -4,41 +4,43 @@ import { matchPath } from "react-router";
 import { joinUrl } from "../../util/joinUrl.js";
 import { Catalog } from "./Catalog.js";
 export const getKey = (category, tag) => slugify(`${category}-${tag}`);
-export const apiCatalogPlugin = ({ navigationId, items, label, categories = [], filterCatalogItems, }) => {
+export const apiCatalogPlugin = ({ path, items, label, categories = [], filterCatalogItems, }) => {
+    const paths = Object.fromEntries(categories.flatMap((category) => [undefined, ...category.tags].map((tag) => [
+        joinUrl(path, tag ? getKey(category.label, tag) : undefined),
+        tag,
+    ])));
     return {
-        getSidebar: async function Sidebar(path) {
-            if (!matchPath({ path: joinUrl(navigationId), end: false }, path)) {
+        getNavigation: async (currentPath) => {
+            const matches = Object.keys(paths).some((path) => matchPath(path, currentPath));
+            if (!matches) {
                 return [];
             }
-            const sidebar = categories.map((category) => ({
+            const navigation = categories.map((category) => ({
                 type: "category",
                 label: category.label,
                 collapsible: false,
-                items: category.tags.map((tag) => {
-                    const tagPath = getKey(category.label, tag);
-                    return {
-                        type: "doc",
-                        id: joinUrl(navigationId, tagPath),
-                        label: tag,
-                        badge: {
-                            label: String(items.filter((api) => api.categories.find((c) => c.tags.includes(tag))).length),
-                            color: "outline",
-                        },
-                    };
-                }),
+                items: category.tags.map((tag) => ({
+                    type: "link",
+                    to: joinUrl(path, getKey(category.label, tag)),
+                    label: tag,
+                    badge: {
+                        label: String(items.filter((api) => api.categories.find((c) => c.tags.includes(tag))).length),
+                        color: "outline",
+                    },
+                })),
             }));
-            sidebar.unshift({
-                type: "doc",
-                id: joinUrl(navigationId),
+            navigation.unshift({
+                type: "link",
+                to: joinUrl(path),
                 label: "Overview",
                 badge: { label: String(items.length), color: "outline" },
             });
-            return sidebar;
+            return navigation;
         },
-        getRoutes: () => categories.flatMap((category) => [undefined, ...category.tags].map((tag) => ({
-            path: joinUrl(navigationId, tag ? getKey(category.label, tag) : undefined),
+        getRoutes: () => Object.entries(paths).map(([path, tag]) => ({
+            path,
             element: (_jsx(Catalog, { label: label, categoryLabel: tag, items: items, filterCatalogItems: filterCatalogItems, categories: categories })),
-        }))),
+        })),
     };
 };
 //# sourceMappingURL=index.js.map

package/dist/lib/plugins/api-catalog/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/plugins/api-catalog/index.tsx"],"names":[],"mappings":";AAAA,OAAO,OAAO,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAIzC,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,QAAgB,EAAE,GAAW,EAAE,EAAE,CACtD,OAAO,CAAC,GAAG,QAAQ,IAAI,GAAG,EAAE,CAAC,CAAC;AA+BhC,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,EAC/B,YAAY,EACZ,KAAK,EACL,KAAK,EACL,UAAU,GAAG,EAAE,EACf,kBAAkB,GAOnB,EAAgB,EAAE;IACjB,OAAO;QACL,UAAU,EAAE,KAAK,UAAU,OAAO,CAAC,IAAI;YACrC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,YAAY,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,IAAI,CAAC,EAAE,CAAC;gBAClE,OAAO,EAAE,CAAC;YACZ,CAAC;YAED,MAAM,OAAO,GAAkB,UAAU,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;gBAC3D,IAAI,EAAE,UAAmB;gBACzB,KAAK,EAAE,QAAQ,CAAC,KAAK;gBACrB,WAAW,EAAE,KAAK;gBAClB,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;oBAC/B,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;oBAC5C,OAAO;wBACL,IAAI,EAAE,KAAc;wBACpB,EAAE,EAAE,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC;wBAClC,KAAK,EAAE,GAAG;wBACV,KAAK,EAAE;4BACL,KAAK,EAAE,MAAM,CACX,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CACnB,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CACjD,CAAC,MAAM,CACT;4BACD,KAAK,EAAE,SAAkB;yBAC1B;qBACF,CAAC;gBACJ,CAAC,CAAC;aACH,CAAC,CAAC,CAAC;YAEJ,OAAO,CAAC,OAAO,CAAC;gBACd,IAAI,EAAE,KAAc;gBACpB,EAAE,EAAE,OAAO,CAAC,YAAY,CAAC;gBACzB,KAAK,EAAE,UAAU;gBACjB,KAAK,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,SAAkB,EAAE;aAClE,CAAC,CAAC;YAEH,OAAO,OAAO,CAAC;QACjB,CAAC;QACD,SAAS,EAAE,GAAG,EAAE,CACd,UAAU,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAC9B,CAAC,SAAS,EAAE,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YAC1C,IAAI,EAAE,OAAO,CACX,YAAY,EACZ,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAC9C;YACD,OAAO,EAAE,CACP,KAAC,OAAO,IACN,KAAK,EAAE,KAAK,EACZ,aAAa,EAAE,GAAG,EAClB,KAAK,EAAE,KAAK,EACZ,kBAAkB,EAAE,kBAAkB,EACtC,UAAU,EAAE,UAAU,GACtB,CACH;SACF,CAAC,CAAC,CACJ;KACJ,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/plugins/api-catalog/index.tsx"],"names":[],"mappings":"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"}

package/dist/lib/plugins/api-keys/CreateApiKey.d.ts

@@ -1,4 +1,5 @@
-import { ApiKeyService } from "./index.js";
-export declare const CreateApiKey: ({ service }: {
+import { type ApiKeyService } from "./index.js";
+export declare const CreateApiKey: ({ service, onOpenChange, }: {
     service: ApiKeyService;
+    onOpenChange: (open: boolean) => void;
 }) => import("react/jsx-runtime").JSX.Element | null;

package/dist/lib/plugins/api-keys/CreateApiKey.js

@@ -1,12 +1,14 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { useForm } from "react-hook-form";
-import { Link, useNavigate } from "react-router";
+import { useNavigate } from "react-router";
+import { ActionButton } from "zudoku/ui/ActionButton.js";
+import { DialogClose, DialogFooter } from "zudoku/ui/Dialog.js";
 import { Select, SelectContent, SelectGroup, SelectItem, SelectTrigger, SelectValue, } from "zudoku/ui/Select.js";
 import { useZudoku } from "../../components/context/ZudokuContext.js";
 import { Button } from "../../ui/Button.js";
 import { Input } from "../../ui/Input.js";
-export const CreateApiKey = ({ service }) => {
+export const CreateApiKey = ({ service, onOpenChange, }) => {
     const context = useZudoku();
     const queryClient = useQueryClient();
     const navigate = useNavigate();
@@ -21,7 +23,7 @@ export const CreateApiKey = ({ service }) => {
                 throw new Error("createKey not implemented");
             }
             const expiresOnDate = expiresOn !== "never" ? addDaysToDate(Number(expiresOn)) : undefined;
-            return service.createKey({ description: description, expiresOn: expiresOnDate }, context);
+            return service.createKey({ description: description || "Secret Key", expiresOn: expiresOnDate }, context);
         },
         onSuccess: async () => {
             await queryClient.invalidateQueries({ queryKey: ["api-keys"] });
@@ -31,7 +33,9 @@ export const CreateApiKey = ({ service }) => {
     if (!service.createKey) {
         return null;
     }
-    return (_jsxs("div", { className: "max-w-screen-lg pt-[--padding-content-top] pb-[--padding-content-bottom]", children: [_jsx("div", { className: "flex justify-between mb-4 border-b pb-1", children: _jsx("h1", { className: "font-medium text-2xl", children: "New API Key" }) }), _jsx("form", { onSubmit: form.handleSubmit((data) => createKeyMutation.mutate(data)), children: _jsxs("div", { className: "flex gap-2 flex-col", children: ["Note", _jsx(Input, { ...form.register("description") }), "Expiration", _jsxs(Select, { onValueChange: (value) => form.setValue("expiresOn", value), defaultValue: form.getValues("expiresOn"), children: [_jsx(SelectTrigger, { children: _jsx(SelectValue, {}) }), _jsx(SelectContent, { children: _jsxs(SelectGroup, { children: [[7, 30, 60, 90].map((option) => (_jsxs(SelectItem, { value: String(option), children: [option, " days"] }, option))), _jsx(SelectItem, { value: "never", children: "Never" })] }) })] }), _jsxs("div", { className: "flex gap-2", children: [_jsx(Button, { children: "Generate Key" }), _jsx(Button, { variant: "outline", asChild: true, children: _jsx(Link, { to: "/settings/api-keys/", children: "Cancel" }) })] })] }) })] }));
+    return (_jsx("form", { onSubmit: form.handleSubmit((data) => createKeyMutation.mutate({ ...data }, {
+            onSuccess: () => onOpenChange(false),
+        })), children: _jsxs("div", { className: "flex gap-2 flex-col text-sm font-medium", children: ["Name", _jsx(Input, { ...form.register("description") }), "Expiration", _jsxs(Select, { onValueChange: (value) => form.setValue("expiresOn", value), defaultValue: form.getValues("expiresOn"), children: [_jsx(SelectTrigger, { children: _jsx(SelectValue, {}) }), _jsx(SelectContent, { children: _jsxs(SelectGroup, { children: [[7, 30, 60, 90].map((option) => (_jsxs(SelectItem, { value: String(option), children: [option, " days"] }, option))), _jsx(SelectItem, { value: "never", children: "Never" })] }) })] }), _jsxs(DialogFooter, { children: [_jsx(DialogClose, { asChild: true, children: _jsx(Button, { variant: "outline", children: "Cancel" }) }), _jsx(ActionButton, { isPending: createKeyMutation.isPending, children: "Generate Key" })] })] }) }));
 };
 const addDaysToDate = (days) => {
     const date = new Date();

package/dist/lib/plugins/api-keys/CreateApiKey.js.map

@@ -1 +1 @@
-{"version":3,"file":"CreateApiKey.js","sourceRoot":"","sources":["../../../../src/lib/plugins/api-keys/CreateApiKey.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"CreateApiKey.js","sourceRoot":"","sources":["../../../../src/lib/plugins/api-keys/CreateApiKey.tsx"],"names":[],"mappings":"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"}

package/dist/lib/plugins/api-keys/SettingsApiKeys.d.ts

@@ -1,4 +1,4 @@
-import { ApiKeyService } from "./index.js";
+import { type ApiKeyService } from "./index.js";
 export declare const SettingsApiKeys: ({ service }: {
     service: ApiKeyService;
 }) => import("react/jsx-runtime").JSX.Element;