zudoku 0.64.0 → 0.64.2

package/src/lib/util/flattenAllOf.ts

@@ -0,0 +1,101 @@
+import {
+  createComparator,
+  createMerger,
+  createShallowAllOfMerge,
+} from "@x0k/json-schema-merge";
+import {
+  createDeduplicator,
+  createIntersector,
+} from "@x0k/json-schema-merge/lib/array";
+import type { JSONSchema7Definition } from "json-schema";
+import type { Processor } from "../../config/validators/BuildSchema.js";
+import type { OpenAPIDocument } from "../oas/parser/index.js";
+import { type RecordAny, traverse } from "./traverse.js";
+
+export const flattenAllOfProcessor: Processor = async ({
+  schema,
+  file,
+  dereference,
+}) => {
+  try {
+    const dereferenced = await dereference(schema);
+
+    const flattened = traverse(dereferenced, (spec) => {
+      if (!spec || typeof spec !== "object" || Array.isArray(spec)) {
+        return spec;
+      }
+
+      const isSchemaObject =
+        "type" in spec ||
+        "properties" in spec ||
+        "allOf" in spec ||
+        "anyOf" in spec ||
+        "oneOf" in spec;
+
+      return isSchemaObject ? (flattenAllOf(spec) as RecordAny) : spec;
+    }) as OpenAPIDocument;
+
+    return flattened;
+  } catch (error) {
+    // biome-ignore lint/suspicious/noConsole: Logging allowed here
+    console.warn(
+      `Failed to flatten \`allOf\` in ${file}: ${error instanceof Error ? error.message : error}`,
+    );
+    return schema;
+  }
+};
+
+const { compareSchemaDefinitions, compareSchemaValues } = createComparator();
+const { mergeArrayOfSchemaDefinitions } = createMerger({
+  intersectJson: createIntersector(compareSchemaValues),
+  deduplicateJsonSchemaDef: createDeduplicator(compareSchemaDefinitions),
+});
+
+const shallowAllOfMerge = createShallowAllOfMerge(
+  mergeArrayOfSchemaDefinitions,
+);
+
+// Recursively flattens all `allOf` keywords in a JSON Schema object.
+export const flattenAllOf = (
+  schema: JSONSchema7Definition,
+): JSONSchema7Definition => {
+  const merged = shallowAllOfMerge(schema);
+
+  if (merged == null || typeof merged !== "object") {
+    return merged;
+  }
+
+  const { properties, items, additionalProperties } = merged;
+
+  if (properties != null && typeof properties === "object") {
+    for (const [name, sub] of Object.entries(properties)) {
+      if (sub && typeof sub === "object") {
+        properties[name] = flattenAllOf(sub);
+      }
+    }
+  }
+
+  if (items != null && typeof items === "object") {
+    if (Array.isArray(items)) {
+      merged.items = items.map((it: JSONSchema7Definition) =>
+        it && typeof it === "object" ? flattenAllOf(it) : it,
+      );
+    } else {
+      merged.items = flattenAllOf(items);
+    }
+  }
+
+  if (additionalProperties && typeof additionalProperties === "object") {
+    merged.additionalProperties = flattenAllOf(additionalProperties);
+  }
+
+  for (const key of ["anyOf", "oneOf"] as const) {
+    const arr = merged[key];
+    if (!Array.isArray(arr)) continue;
+    merged[key] = arr.map((v) =>
+      typeof v === "object" && v != null ? flattenAllOf(v) : v,
+    );
+  }
+
+  return merged;
+};

package/dist/lib/plugins/openapi/schema/AllOfGroup/AllOfGroupConnector.d.ts

@@ -1,5 +0,0 @@
-export declare const AllOfGroupConnector: ({ isOpen, className, schemeName, }: {
-    isOpen: boolean;
-    className?: string;
-    schemeName?: string;
-}) => import("react/jsx-runtime").JSX.Element;

package/dist/lib/plugins/openapi/schema/AllOfGroup/AllOfGroupConnector.js

@@ -1,7 +0,0 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { ChevronDownIcon, CircleFadingPlusIcon } from "lucide-react";
-import { cn } from "../../../../util/cn.js";
-export const AllOfGroupConnector = ({ isOpen, className, schemeName, }) => {
-    return (_jsx("div", { className: cn("text-green-500 dark:text-green-300/60", "relative text-sm flex py-2", "before:border-l before:absolute before:-top-2 before:-bottom-2 before:border-border before:border-dashed before:content-['']", className), children: _jsxs("div", { className: "-translate-x-[7px] flex gap-1 items-center", children: [_jsx(CircleFadingPlusIcon, { size: 16, className: "fill-card" }), _jsx("div", { className: cn("translate-y-px mx-px opacity-0 group-hover:opacity-100 transition", !isOpen && "-rotate-90"), children: _jsx(ChevronDownIcon, { size: 16 }) }), _jsx("span", { className: "text-sm text-foreground", children: schemeName })] }) }));
-};
-//# sourceMappingURL=AllOfGroupConnector.js.map

package/dist/lib/plugins/openapi/schema/AllOfGroup/AllOfGroupConnector.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"AllOfGroupConnector.js","sourceRoot":"","sources":["../../../../../../src/lib/plugins/openapi/schema/AllOfGroup/AllOfGroupConnector.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACrE,OAAO,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAE5C,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,EAClC,MAAM,EACN,SAAS,EACT,UAAU,GAKX,EAAE,EAAE;IACH,OAAO,CACL,cACE,SAAS,EAAE,EAAE,CACX,uCAAuC,EACvC,4BAA4B,EAC5B,8HAA8H,EAC9H,SAAS,CACV,YAED,eAAK,SAAS,EAAC,4CAA4C,aACzD,KAAC,oBAAoB,IAAC,IAAI,EAAE,EAAE,EAAE,SAAS,EAAC,WAAW,GAAG,EACxD,cACE,SAAS,EAAE,EAAE,CACX,mEAAmE,EACnE,CAAC,MAAM,IAAI,YAAY,CACxB,YAED,KAAC,eAAe,IAAC,IAAI,EAAE,EAAE,GAAI,GACzB,EACN,eAAM,SAAS,EAAC,yBAAyB,YAAE,UAAU,GAAQ,IACzD,GACF,CACP,CAAC;AACJ,CAAC,CAAC"}

package/dist/lib/plugins/openapi/schema/AllOfGroup/AllOfGroupItem.d.ts

@@ -1,4 +0,0 @@
-import type { SchemaObject } from "../../../../oas/parser/index.js";
-export declare const AllOfGroupItem: (props: {
-    schema: SchemaObject;
-}) => import("react/jsx-runtime").JSX.Element;

package/dist/lib/plugins/openapi/schema/AllOfGroup/AllOfGroupItem.js

@@ -1,10 +0,0 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import * as Collapsible from "@radix-ui/react-collapsible";
-import { useState } from "react";
-import { SchemaView } from "../SchemaView.js";
-import { AllOfGroupConnector } from "./AllOfGroupConnector.js";
-export const AllOfGroupItem = (props) => {
-    const [isOpen, setIsOpen] = useState(true);
-    return (_jsxs(Collapsible.Root, { open: isOpen, onOpenChange: () => setIsOpen((prev) => !prev), className: "group", children: [_jsx(Collapsible.Trigger, { children: _jsx(AllOfGroupConnector, { isOpen: isOpen, schemeName: props.schema.title }) }), !isOpen && _jsx("div", { className: "wavy-line bg-border translate-y-1" }), _jsx(Collapsible.Content, { children: _jsx(SchemaView, { schema: props.schema }) })] }));
-};
-//# sourceMappingURL=AllOfGroupItem.js.map

package/dist/lib/plugins/openapi/schema/AllOfGroup/AllOfGroupItem.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"AllOfGroupItem.js","sourceRoot":"","sources":["../../../../../../src/lib/plugins/openapi/schema/AllOfGroup/AllOfGroupItem.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,WAAW,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEjC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,KAA+B,EAAE,EAAE;IAChE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAE3C,OAAO,CACL,MAAC,WAAW,CAAC,IAAI,IACf,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,EAC9C,SAAS,EAAC,OAAO,aAEjB,KAAC,WAAW,CAAC,OAAO,cAClB,KAAC,mBAAmB,IAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK,GAAI,GACnD,EACrB,CAAC,MAAM,IAAI,cAAK,SAAS,EAAC,mCAAmC,GAAG,EACjE,KAAC,WAAW,CAAC,OAAO,cAClB,KAAC,UAAU,IAAC,MAAM,EAAE,KAAK,CAAC,MAAM,GAAI,GAChB,IACL,CACpB,CAAC;AACJ,CAAC,CAAC"}

package/dist/lib/plugins/openapi/schema/AllOfGroup/AllOfGroupView.d.ts

@@ -1,5 +0,0 @@
-import type { SchemaObject } from "../../../../oas/parser/index.js";
-export declare const AllOfGroupView: ({ schema, cardHeader, }: {
-    schema: SchemaObject;
-    cardHeader?: React.ReactNode;
-}) => import("react/jsx-runtime").JSX.Element | null;

package/dist/lib/plugins/openapi/schema/AllOfGroup/AllOfGroupView.js

@@ -1,16 +0,0 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import * as Collapsible from "@radix-ui/react-collapsible";
-import { SquareMinusIcon, SquarePlusIcon } from "lucide-react";
-import { useCallback, useState } from "react";
-import { Card } from "../../../../ui/Card.js";
-import { AllOfGroupItem } from "./AllOfGroupItem.js";
-export const AllOfGroupView = ({ schema, cardHeader, }) => {
-    const [isOpen, setIsOpen] = useState(true);
-    const toggleOpen = useCallback(() => setIsOpen((prev) => !prev), []);
-    if (!schema.allOf)
-        return null;
-    return (_jsx(Collapsible.Root, { open: isOpen, onOpenChange: toggleOpen, asChild: true, children: _jsxs(Card, { className: "overflow-hidden", children: [cardHeader, _jsxs(Collapsible.Trigger, { className: "flex gap-2 items-center py-2 px-6 w-full text-sm text-muted-foreground -translate-x-1.5", children: [isOpen ? (_jsx(SquareMinusIcon, { size: 14 })) : (_jsx(SquarePlusIcon, { size: 14 })), _jsx("span", { children: "All of" })] }), _jsx(Collapsible.Content, { className: "pb-4 px-6", children: schema.allOf.map((subSchema, index) => (
-                    // biome-ignore lint/suspicious/noArrayIndexKey: Index needed for key
-                    _jsx(AllOfGroupItem, { schema: subSchema }, index))) })] }) }));
-};
-//# sourceMappingURL=AllOfGroupView.js.map

package/dist/lib/plugins/openapi/schema/AllOfGroup/AllOfGroupView.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"AllOfGroupView.js","sourceRoot":"","sources":["../../../../../../src/lib/plugins/openapi/schema/AllOfGroup/AllOfGroupView.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,WAAW,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAE9C,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,EAC7B,MAAM,EACN,UAAU,GAIX,EAAE,EAAE;IACH,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC3C,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;IAErE,IAAI,CAAC,MAAM,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IAE/B,OAAO,CACL,KAAC,WAAW,CAAC,IAAI,IAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,OAAO,kBAC/D,MAAC,IAAI,IAAC,SAAS,EAAC,iBAAiB,aAC9B,UAAU,EACX,MAAC,WAAW,CAAC,OAAO,IAAC,SAAS,EAAC,yFAAyF,aACrH,MAAM,CAAC,CAAC,CAAC,CACR,KAAC,eAAe,IAAC,IAAI,EAAE,EAAE,GAAI,CAC9B,CAAC,CAAC,CAAC,CACF,KAAC,cAAc,IAAC,IAAI,EAAE,EAAE,GAAI,CAC7B,EACD,oCAAmB,IACC,EAEtB,KAAC,WAAW,CAAC,OAAO,IAAC,SAAS,EAAC,WAAW,YACvC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE,CAAC;oBACtC,qEAAqE;oBACrE,KAAC,cAAc,IAAa,MAAM,EAAE,SAAS,IAAxB,KAAK,CAAuB,CAClD,CAAC,GACkB,IACjB,GACU,CACpB,CAAC;AACJ,CAAC,CAAC"}