use DotProp

Author: cm-ayf

src/internal/OpenApiTools/components/ClientSchema.ts

@@ -1,3 +1,4 @@
+import DotProp from "dot-prop";
 import type { JSONSchema7Definition } from "json-schema";
 import ts from "typescript";
 
@@ -11,16 +12,10 @@ import type { AnySchema, ArraySchema, ObjectSchema, PrimitiveSchema } from "../t
 import type * as Walker from "../Walker";
 import * as ExternalDocumentation from "./ExternalDocumentation";
 
-function isReadOnlySchema(schema: JSONSchema7Definition, context: ToTypeNode.Context): boolean | undefined {
-  while (Guard.isReference(schema)) {
-    const schemaName = schema.$ref.match(/^#\/components\/schemas\/(.+)$/)?.[1];
-    if (!schemaName) return undefined;
-    const dereffed = context.rootSchema.components?.schemas?.[schemaName];
-    if (dereffed) {
-      schema = dereffed;
-    } else {
-      return undefined;
-    }
+function isReadOnlySchema(currentPoint: string, schema: JSONSchema7Definition, context: ToTypeNode.Context): boolean | undefined {
+  if (Guard.isReference(schema)) {
+    const { pathArray } = context.resolveReferencePath(currentPoint, schema.$ref);
+    schema = DotProp.get(context.rootSchema, pathArray.join(".")) as any;
   }
 
   if (typeof schema === "boolean") {
@@ -32,14 +27,15 @@ function isReadOnlySchema(schema: JSONSchema7Definition, context: ToTypeNode.Con
     if (directReadOnly) {
       return directReadOnly.readOnly;
     }
+
     return schema.allOf
-      .map(s => isReadOnlySchema(s, context))
+      .map(s => isReadOnlySchema(currentPoint, s, context))
       .reverse()
       .find((s): s is boolean => typeof s === "boolean");
   }
 
   if (Guard.isOneOfSchema(schema)) {
-    return schema.oneOf.some(s => isReadOnlySchema(s, context));
+    return schema.oneOf.some(s => isReadOnlySchema(currentPoint, s, context));
   }
 
   if (Guard.isPrimitiveSchema(schema) || Guard.isArraySchema(schema) || Guard.isObjectSchema(schema)) {
@@ -62,7 +58,7 @@ export const generatePropertySignatures = (
   }
   const required: string[] = schema.required || [];
   return Object.entries(schema.properties)
-    .filter(([, schema]) => !isReadOnlySchema(schema, context))
+    .filter(([, schema]) => !isReadOnlySchema(currentPoint, schema, context))
     .map(([propertyName, property]) => {
       if (!property) {
         return factory.PropertySignature.create({