@conduit-client/model 3.12.0 → 3.13.0

package/dist/types/v1/parser/swagger/swagger-utils.d.ts

@@ -1,5 +1,6 @@
 import type { OpenAPIV3 } from 'openapi-types';
 import type { ScalarType } from '../../types';
+import type { ResolverError, MissingPointerError } from '@apidevtools/json-schema-ref-parser';
 export type OpenAPISchema = OpenAPIV3.SchemaObject | OpenAPIV3.ReferenceObject;
 /**
  * Check if an object is a reference object ($ref)
@@ -49,3 +50,5 @@ export declare function isReferencePath(obj: OpenAPIV3.PathItemObject): obj is O
  * and checking for schema-specific properties.
  */
 export declare function extractRootLevelSchemas(file: OpenAPIV3.Document): Record<string, OpenAPISchema>;
+export declare function isResolverError(error: unknown): error is ResolverError;
+export declare function isMissingPointerError(error: unknown): error is MissingPointerError;

package/dist/v1/index.js

@@ -7,7 +7,6 @@ import * as url from "url";
 import amf from "amf-client-js";
 import path from "path";
 import SwaggerParser from "@apidevtools/swagger-parser";
-import { MissingPointerError, ResolverError } from "@apidevtools/json-schema-ref-parser";
 const BindingTypesEnum = ["wire", "imperative", "imperative-legacy", "mutation"];
 class BaseTypeRegistry extends Map {
   nameOf(t) {
@@ -13650,6 +13649,12 @@ function extractRootLevelSchemas(file) {
   }
   return schemas2;
 }
+function isResolverError(error) {
+  return error instanceof Error && "code" in error && error.code === "ERESOLVER";
+}
+function isMissingPointerError(error) {
+  return error instanceof Error && "code" in error && error.code === "EMISSINGPOINTER";
+}
 class SwaggerEnumerableScalarType extends SwaggerBaseType {
   typeResolve() {
     if (this.schema.enum && this.schema.enum.length > 0) {
@@ -15242,41 +15247,52 @@ async function parseSwaggerDocument(source, logger) {
       $refs
     };
   } catch (error) {
-    if (error instanceof MissingPointerError) {
-      const missingFile = error.source;
+    if (isMissingPointerError(error)) {
       const tokenMatch = error.message.match(/Token "([^"]+)"/);
       const token = (tokenMatch == null ? void 0 : tokenMatch[1]) ?? "unknown";
-      const refInfo = findRefPositionInCache(missingFile, token);
-      const filename = missingFile.split("/").pop() ?? missingFile;
-      if (refInfo) {
-        const { position, refValue } = refInfo;
-        logger.error(
-          position,
-          `Cannot resolve reference '${refValue}': token '${token}' does not exist in '${filename}'`
-        );
-      } else {
+      const missingFile = error.source;
+      if (!missingFile) {
         logger.error(
           { line: 0, column: 0 },
-          `Cannot resolve reference: token '${token}' does not exist in '${filename}'`
+          `Cannot resolve reference: token '${token}' does not exist`
         );
+      } else {
+        const refInfo = findRefPositionInCache(missingFile, token);
+        const filename = missingFile.split("/").pop() ?? missingFile;
+        if (refInfo) {
+          const { position, refValue } = refInfo;
+          logger.error(
+            position,
+            `Cannot resolve reference '${refValue}': token '${token}' does not exist in '${filename}'`
+          );
+        } else {
+          logger.error(
+            { line: 0, column: 0 },
+            `Cannot resolve reference: token '${token}' does not exist in '${filename}'`
+          );
+        }
       }
       positionMapCache.clear();
       throw error;
     }
-    if (error instanceof ResolverError) {
+    if (isResolverError(error)) {
       const missingFile = error.source;
-      const refInfo = findRefPositionInCache(missingFile);
-      if (refInfo) {
-        const { position, refValue } = refInfo;
-        logger.error(
-          position,
-          `Cannot resolve external reference '${refValue}': file not found '${missingFile}'`
-        );
+      if (!missingFile) {
+        logger.error({ line: 0, column: 0 }, `Cannot resolve reference: file not found`);
       } else {
-        logger.error(
-          { line: 0, column: 0 },
-          `Cannot resolve reference '${missingFile}': file not found`
-        );
+        const refInfo = findRefPositionInCache(missingFile);
+        if (refInfo) {
+          const { position, refValue } = refInfo;
+          logger.error(
+            position,
+            `Cannot resolve external reference '${refValue}': file not found '${missingFile}'`
+          );
+        } else {
+          logger.error(
+            { line: 0, column: 0 },
+            `Cannot resolve reference '${missingFile}': file not found`
+          );
+        }
       }
       positionMapCache.clear();
       throw error;