@kubb/oas 2.13.3 → 2.14.0

package/dist/parser.cjs

@@ -11,7 +11,12 @@ async function parse(pathOrApi) {
     enablePaths: true,
     colorizeErrors: true
   });
-  const document = await oasNormalize.load();
+  let document;
+  try {
+    document = await oasNormalize.bundle();
+  } catch (e) {
+    document = await oasNormalize.load();
+  }
   if (_chunkEPQ73VUMcjs.isOpenApiV2Document.call(void 0, document)) {
     const { openapi: oas } = await _swagger2openapi2.default.convertObj(document, { anchors: true });
     return new (0, _chunkEPQ73VUMcjs.Oas)({ oas });

package/dist/parser.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/parser/index.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,kBAAkB;AACzB,OAAO,qBAAqB;AAO5B,eAAsB,MAAM,WAAwD;AAClF,QAAM,eAAe,IAAI,aAAa,WAAW;AAAA,IAC/C,aAAa;AAAA,IACb,gBAAgB;AAAA,EAClB,CAAC;AAED,QAAM,WAAY,MAAM,aAAa,KAAK;AAE1C,MAAI,oBAAoB,QAAQ,GAAG;AACjC,UAAM,EAAE,SAAS,IAAI,IAAI,MAAM,gBAAgB,WAAW,UAAU,EAAE,SAAS,KAAK,CAAC;AAErF,WAAO,IAAI,IAAI,EAAE,IAAiC,CAAC;AAAA,EACrD;AAEA,SAAO,IAAI,IAAI,EAAE,KAAK,SAAS,CAAC;AAClC","sourcesContent":["import OASNormalize from 'oas-normalize'\nimport swagger2openapi from 'swagger2openapi'\n\nimport type { OpenAPIV2 } from 'openapi-types'\nimport { Oas } from '../Oas.ts'\nimport type { OasTypes } from '../types.ts'\nimport { isOpenApiV2Document } from '../utils.ts'\n\nexport async function parse(pathOrApi: string | OasTypes.OASDocument): Promise<Oas> {\n  const oasNormalize = new OASNormalize(pathOrApi, {\n    enablePaths: true,\n    colorizeErrors: true,\n  })\n\n  const document = (await oasNormalize.load()) as unknown as OpenAPIV2.Document\n\n  if (isOpenApiV2Document(document)) {\n    const { openapi: oas } = await swagger2openapi.convertObj(document, { anchors: true })\n\n    return new Oas({ oas: oas as OasTypes.OASDocument })\n  }\n\n  return new Oas({ oas: document })\n}\n"]}
+{"version":3,"sources":["../src/parser/index.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,kBAAkB;AACzB,OAAO,qBAAqB;AAQ5B,eAAsB,MAAM,WAA+C;AACzE,QAAM,eAAe,IAAI,aAAa,WAAW;AAAA,IAC/C,aAAa;AAAA,IACb,gBAAgB;AAAA,EAClB,CAAC;AACD,MAAI;AAEJ,MAAI;AAEF,eAAW,MAAM,aAAa,OAAO;AAAA,EACvC,SAAS,GAAG;AACV,eAAY,MAAM,aAAa,KAAK;AAAA,EACtC;AAEA,MAAI,oBAAoB,QAAQ,GAAG;AACjC,UAAM,EAAE,SAAS,IAAI,IAAI,MAAM,gBAAgB,WAAW,UAAU,EAAE,SAAS,KAAK,CAAC;AAErF,WAAO,IAAI,IAAI,EAAE,IAAwB,CAAC;AAAA,EAC5C;AAEA,SAAO,IAAI,IAAI,EAAE,KAAK,SAAS,CAAC;AAClC","sourcesContent":["import OASNormalize from 'oas-normalize'\nimport swagger2openapi from 'swagger2openapi'\n\nimport { Oas } from '../Oas.ts'\nimport { isOpenApiV2Document } from '../utils.ts'\n\nimport type { OASDocument } from 'oas/types'\nimport type { OpenAPI } from 'openapi-types'\n\nexport async function parse(pathOrApi: string | OASDocument): Promise<Oas> {\n  const oasNormalize = new OASNormalize(pathOrApi, {\n    enablePaths: true,\n    colorizeErrors: true,\n  })\n  let document: OpenAPI.Document\n\n  try {\n    // resolve external refs\n    document = await oasNormalize.bundle()\n  } catch (e) {\n    document = (await oasNormalize.load()) as OpenAPI.Document\n  }\n\n  if (isOpenApiV2Document(document)) {\n    const { openapi: oas } = await swagger2openapi.convertObj(document, { anchors: true })\n\n    return new Oas({ oas: oas as OASDocument })\n  }\n\n  return new Oas({ oas: document })\n}\n"]}

package/dist/parser.d.cts

@@ -1,8 +1,8 @@
 import { O as Oas } from './Oas-BEe7KZDj.cjs';
-import * as OasTypes from 'oas/types';
+import { OASDocument } from 'oas/types';
 import 'oas';
 import 'oas/operation';
 
-declare function parse(pathOrApi: string | OasTypes.OASDocument): Promise<Oas>;
+declare function parse(pathOrApi: string | OASDocument): Promise<Oas>;
 
 export { parse };

package/dist/parser.d.ts

@@ -1,8 +1,8 @@
 import { O as Oas } from './Oas-BEe7KZDj.js';
-import * as OasTypes from 'oas/types';
+import { OASDocument } from 'oas/types';
 import 'oas';
 import 'oas/operation';
 
-declare function parse(pathOrApi: string | OasTypes.OASDocument): Promise<Oas>;
+declare function parse(pathOrApi: string | OASDocument): Promise<Oas>;
 
 export { parse };

package/dist/parser.js

@@ -11,7 +11,12 @@ async function parse(pathOrApi) {
     enablePaths: true,
     colorizeErrors: true
   });
-  const document = await oasNormalize.load();
+  let document;
+  try {
+    document = await oasNormalize.bundle();
+  } catch (e) {
+    document = await oasNormalize.load();
+  }
   if (isOpenApiV2Document(document)) {
     const { openapi: oas } = await swagger2openapi.convertObj(document, { anchors: true });
     return new Oas({ oas });

package/dist/parser.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/parser/index.ts"],"sourcesContent":["import OASNormalize from 'oas-normalize'\nimport swagger2openapi from 'swagger2openapi'\n\nimport type { OpenAPIV2 } from 'openapi-types'\nimport { Oas } from '../Oas.ts'\nimport type { OasTypes } from '../types.ts'\nimport { isOpenApiV2Document } from '../utils.ts'\n\nexport async function parse(pathOrApi: string | OasTypes.OASDocument): Promise<Oas> {\n  const oasNormalize = new OASNormalize(pathOrApi, {\n    enablePaths: true,\n    colorizeErrors: true,\n  })\n\n  const document = (await oasNormalize.load()) as unknown as OpenAPIV2.Document\n\n  if (isOpenApiV2Document(document)) {\n    const { openapi: oas } = await swagger2openapi.convertObj(document, { anchors: true })\n\n    return new Oas({ oas: oas as OasTypes.OASDocument })\n  }\n\n  return new Oas({ oas: document })\n}\n"],"mappings":";;;;;;AAAA,OAAO,kBAAkB;AACzB,OAAO,qBAAqB;AAO5B,eAAsB,MAAM,WAAwD;AAClF,QAAM,eAAe,IAAI,aAAa,WAAW;AAAA,IAC/C,aAAa;AAAA,IACb,gBAAgB;AAAA,EAClB,CAAC;AAED,QAAM,WAAY,MAAM,aAAa,KAAK;AAE1C,MAAI,oBAAoB,QAAQ,GAAG;AACjC,UAAM,EAAE,SAAS,IAAI,IAAI,MAAM,gBAAgB,WAAW,UAAU,EAAE,SAAS,KAAK,CAAC;AAErF,WAAO,IAAI,IAAI,EAAE,IAAiC,CAAC;AAAA,EACrD;AAEA,SAAO,IAAI,IAAI,EAAE,KAAK,SAAS,CAAC;AAClC;","names":[]}
+{"version":3,"sources":["../src/parser/index.ts"],"sourcesContent":["import OASNormalize from 'oas-normalize'\nimport swagger2openapi from 'swagger2openapi'\n\nimport { Oas } from '../Oas.ts'\nimport { isOpenApiV2Document } from '../utils.ts'\n\nimport type { OASDocument } from 'oas/types'\nimport type { OpenAPI } from 'openapi-types'\n\nexport async function parse(pathOrApi: string | OASDocument): Promise<Oas> {\n  const oasNormalize = new OASNormalize(pathOrApi, {\n    enablePaths: true,\n    colorizeErrors: true,\n  })\n  let document: OpenAPI.Document\n\n  try {\n    // resolve external refs\n    document = await oasNormalize.bundle()\n  } catch (e) {\n    document = (await oasNormalize.load()) as OpenAPI.Document\n  }\n\n  if (isOpenApiV2Document(document)) {\n    const { openapi: oas } = await swagger2openapi.convertObj(document, { anchors: true })\n\n    return new Oas({ oas: oas as OASDocument })\n  }\n\n  return new Oas({ oas: document })\n}\n"],"mappings":";;;;;;AAAA,OAAO,kBAAkB;AACzB,OAAO,qBAAqB;AAQ5B,eAAsB,MAAM,WAA+C;AACzE,QAAM,eAAe,IAAI,aAAa,WAAW;AAAA,IAC/C,aAAa;AAAA,IACb,gBAAgB;AAAA,EAClB,CAAC;AACD,MAAI;AAEJ,MAAI;AAEF,eAAW,MAAM,aAAa,OAAO;AAAA,EACvC,SAAS,GAAG;AACV,eAAY,MAAM,aAAa,KAAK;AAAA,EACtC;AAEA,MAAI,oBAAoB,QAAQ,GAAG;AACjC,UAAM,EAAE,SAAS,IAAI,IAAI,MAAM,gBAAgB,WAAW,UAAU,EAAE,SAAS,KAAK,CAAC;AAErF,WAAO,IAAI,IAAI,EAAE,IAAwB,CAAC;AAAA,EAC5C;AAEA,SAAO,IAAI,IAAI,EAAE,KAAK,SAAS,CAAC;AAClC;","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubb/oas",
-  "version": "2.13.3",
+  "version": "2.14.0",
   "description": "Oas helpers",
   "keywords": [
     "typescript",
@@ -48,13 +48,13 @@
     "!/**/__tests__/**"
   ],
   "dependencies": {
+    "hotscript": "^1.0.13",
+    "json-schema-to-ts": "^3.0.1",
     "oas": "^24.2.2",
     "oas-normalize": "^11.0.4",
     "openapi-types": "^12.1.3",
     "remeda": "^1.61.0",
     "swagger2openapi": "^7.0.8",
-    "hotscript": "^1.0.13",
-    "json-schema-to-ts": "^3.0.1",
     "ts-toolbelt": "^9.6.0"
   },
   "devDependencies": {

package/src/parser/index.ts

@@ -1,23 +1,30 @@
 import OASNormalize from 'oas-normalize'
 import swagger2openapi from 'swagger2openapi'
 
-import type { OpenAPIV2 } from 'openapi-types'
 import { Oas } from '../Oas.ts'
-import type { OasTypes } from '../types.ts'
 import { isOpenApiV2Document } from '../utils.ts'
 
-export async function parse(pathOrApi: string | OasTypes.OASDocument): Promise<Oas> {
+import type { OASDocument } from 'oas/types'
+import type { OpenAPI } from 'openapi-types'
+
+export async function parse(pathOrApi: string | OASDocument): Promise<Oas> {
   const oasNormalize = new OASNormalize(pathOrApi, {
     enablePaths: true,
     colorizeErrors: true,
   })
+  let document: OpenAPI.Document
 
-  const document = (await oasNormalize.load()) as unknown as OpenAPIV2.Document
+  try {
+    // resolve external refs
+    document = await oasNormalize.bundle()
+  } catch (e) {
+    document = (await oasNormalize.load()) as OpenAPI.Document
+  }
 
   if (isOpenApiV2Document(document)) {
     const { openapi: oas } = await swagger2openapi.convertObj(document, { anchors: true })
 
-    return new Oas({ oas: oas as OasTypes.OASDocument })
+    return new Oas({ oas: oas as OASDocument })
   }
 
   return new Oas({ oas: document })