@usebruno/filestore 0.7.1 → 0.8.1

package/dist/formats/bru/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/formats/bru/index.ts"],"names":[],"mappings":"AAWA,eAAO,MAAM,eAAe,SAAU,MAAM,GAAG,GAAG,WAAU,OAAO,KAAW,GAuG7E,CAAC;AAEF,eAAO,MAAM,mBAAmB,SAAU,GAAG,KAAG,MA+G/C,CAAC;AAEF,eAAO,MAAM,kBAAkB,SAAU,MAAM,GAAG,GAAG,WAAU,OAAO,KAAW,GA4ChF,CAAC;AAEF,eAAO,MAAM,sBAAsB,SAAU,GAAG,aAAa,OAAO,KAAG,MAuCtE,CAAC;AAEF,eAAO,MAAM,mBAAmB,QAAS,MAAM,KAAG,GAejD,CAAC;AAEF,eAAO,MAAM,uBAAuB,SAAU,GAAG,KAAG,MAOnD,CAAC;AAGF,eAAO,MAAM,gBAAgB,SAAU,MAAM,GAAG,GAAG,WAAU,OAAO,eAAuB,MAAM,iBAAiB,MAAM,KAAG,GA6D1H,CAAC;AAEF,eAAO,MAAM,gBAAgB,SAAU,GAAG;;;;;;;;;;;CAsBzC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/formats/bru/index.ts"],"names":[],"mappings":"AAWA,eAAO,MAAM,eAAe,SAAU,MAAM,GAAG,GAAG,WAAU,OAAO,KAAW,GAuG7E,CAAC;AAEF,eAAO,MAAM,mBAAmB,SAAU,GAAG,KAAG,MA+G/C,CAAC;AAEF,eAAO,MAAM,kBAAkB,SAAU,MAAM,GAAG,GAAG,WAAU,OAAO,KAAW,GA4ChF,CAAC;AAEF,eAAO,MAAM,sBAAsB,SAAU,GAAG,aAAa,OAAO,KAAG,MAuCtE,CAAC;AAEF,eAAO,MAAM,mBAAmB,QAAS,MAAM,KAAG,GAejD,CAAC;AAEF,eAAO,MAAM,uBAAuB,SAAU,GAAG,KAAG,MAOnD,CAAC;AAGF,eAAO,MAAM,gBAAgB,SAAU,MAAM,GAAG,GAAG,WAAU,OAAO,eAAuB,MAAM,iBAAiB,MAAM,KAAG,GAwE1H,CAAC;AAEF,eAAO,MAAM,gBAAgB,SAAU,GAAG;;;;;;;;;;;CAsBzC,CAAC"}

package/dist/formats/bru/tests/example-status-swap.spec.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=example-status-swap.spec.d.ts.map

package/dist/formats/bru/tests/example-status-swap.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"example-status-swap.spec.d.ts","sourceRoot":"","sources":["../../../../src/formats/bru/tests/example-status-swap.spec.js"],"names":[],"mappings":""}

package/dist/formats/yml/common/auth-oauth2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth-oauth2.d.ts","sourceRoot":"","sources":["../../../../src/formats/yml/common/auth-oauth2.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,UAAU,EAWX,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EACV,MAAM,IAAI,WAAW,EAEtB,MAAM,oCAAoC,CAAC;AA6P5C,eAAO,MAAM,sBAAsB,WAAY,WAAW,GAAG,IAAI,KAAG,UAAU,GAAG,SAkBhF,CAAC;AAsCF,eAAO,MAAM,aAAa,UAAW,UAAU,GAAG,IAAI,GAAG,SAAS,KAAG,WAAW,GAAG,IAqOlF,CAAC"}
+{"version":3,"file":"auth-oauth2.d.ts","sourceRoot":"","sources":["../../../../src/formats/yml/common/auth-oauth2.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,UAAU,EAWX,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EACV,MAAM,IAAI,WAAW,EAEtB,MAAM,oCAAoC,CAAC;AAuQ5C,eAAO,MAAM,sBAAsB,WAAY,WAAW,GAAG,IAAI,KAAG,UAAU,GAAG,SAkBhF,CAAC;AAsCF,eAAO,MAAM,aAAa,UAAW,UAAU,GAAG,IAAI,GAAG,SAAS,KAAG,WAAW,GAAG,IA0OlF,CAAC"}

package/dist/formats/yml/items/parseHttpRequest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parseHttpRequest.d.ts","sourceRoot":"","sources":["../../../../src/formats/yml/items/parseHttpRequest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,IAAI,SAAS,EAA6C,MAAM,wCAAwC,CAAC;AAE3H,OAAO,KAAK,EAAE,WAAW,EAAmB,MAAM,qCAAqC,CAAC;AAWxF,QAAA,MAAM,gBAAgB,cAAe,WAAW,KAAG,SAmLlD,CAAC;AAEF,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"parseHttpRequest.d.ts","sourceRoot":"","sources":["../../../../src/formats/yml/items/parseHttpRequest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,IAAI,SAAS,EAA6C,MAAM,wCAAwC,CAAC;AAE3H,OAAO,KAAK,EAAE,WAAW,EAAmB,MAAM,qCAAqC,CAAC;AAWxF,QAAA,MAAM,gBAAgB,cAAe,WAAW,KAAG,SAoLlD,CAAC;AAEF,eAAe,gBAAgB,CAAC"}

package/dist/formats/yml/parseCollection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parseCollection.d.ts","sourceRoot":"","sources":["../../../src/formats/yml/parseCollection.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AAS3E,UAAU,gBAAgB;IACxB,cAAc,EAAE,UAAU,CAAC;IAC3B,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAClC;AAED,QAAA,MAAM,eAAe,cAAe,MAAM,KAAG,gBA0M5C,CAAC;AAEF,eAAe,eAAe,CAAC"}
+{"version":3,"file":"parseCollection.d.ts","sourceRoot":"","sources":["../../../src/formats/yml/parseCollection.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AAS3E,UAAU,gBAAgB;IACxB,cAAc,EAAE,UAAU,CAAC;IAC3B,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAClC;AAED,QAAA,MAAM,eAAe,cAAe,MAAM,KAAG,gBAoN5C,CAAC;AAEF,eAAe,eAAe,CAAC"}

package/dist/formats/yml/stringifyCollection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stringifyCollection.d.ts","sourceRoot":"","sources":["../../../src/formats/yml/stringifyCollection.ts"],"names":[],"mappings":"AAkEA,QAAA,MAAM,mBAAmB,mBAAoB,GAAG,eAAe,GAAG,KAAG,MA2MpE,CAAC;AAEF,eAAe,mBAAmB,CAAC"}
+{"version":3,"file":"stringifyCollection.d.ts","sourceRoot":"","sources":["../../../src/formats/yml/stringifyCollection.ts"],"names":[],"mappings":"AAkEA,QAAA,MAAM,mBAAmB,mBAAoB,GAAG,eAAe,GAAG,KAAG,MA0NpE,CAAC;AAEF,eAAe,mBAAmB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@usebruno/filestore",
-  "version": "0.7.1",
+  "version": "0.8.1",
   "license": "MIT",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -29,7 +29,7 @@
     "@types/jest": "^29.5.11",
     "@types/lodash": "^4.14.191",
     "@types/node": "^24.1.0",
-    "@usebruno/schema-types": "0.2.0",
+    "@usebruno/schema-types": "0.3.0",
     "babel-jest": "^29.7.0",
     "jest": "^29.2.0",
     "nanoid": "3.3.8",
@@ -45,7 +45,7 @@
   },
   "dependencies": {
     "@types/nanoid": "^2.1.0",
-    "@usebruno/lang": "0.34.0",
+    "@usebruno/lang": "0.35.0",
     "ajv": "^8.17.1",
     "lodash": "^4.17.21",
     "yaml": "^2.3.4"

package/src/formats/bru/index.ts

@@ -367,6 +367,17 @@ export const bruExampleToJson = (data: string | any, parsed: boolean = false, pa
         transformedType = 'http-request';
     }
 
+    /**
+     * Backward compatibility (pre-v3.0.2 - v3.2.0): Postman imports before PR #6876 stored status/statusText swapped
+     * (code: "OK", text: "202" instead of code: 202, text: "OK"). Detect and swap back.
+     * TODO(Sid / Shubh): Remove after v5 — all collections should be migrated by then.
+     */
+    let status = _.get(json, 'response.status', '200');
+    let statusText = _.get(json, 'response.statusText', 'OK');
+    if (isNaN(Number(status)) && !isNaN(Number(statusText))) {
+      [status, statusText] = [statusText, status];
+    }
+
     // Follow the same structure as the main request, but with missing fields for examples
     const transformedJson = {
       type: transformedType,
@@ -388,8 +399,8 @@ export const bruExampleToJson = (data: string | any, parsed: boolean = false, pa
           name: header.name,
           value: header.value
         })),
-        status: String(_.get(json, 'response.status', '200')),
-        statusText: _.get(json, 'response.statusText', 'OK'),
+        status: Number(status) || 200,
+        statusText: statusText || 'OK',
         body: {
           type: _.get(json, 'response.body.type', 'json'),
           content: _.get(json, 'response.body.content', '')

package/src/formats/bru/tests/example-status-swap.spec.js

@@ -0,0 +1,109 @@
+const { bruExampleToJson } = require('../index');
+
+describe('bruExampleToJson - status/statusText swap fix', () => {
+  it('should parse normal status and statusText correctly', () => {
+    const parsed = {
+      name: 'Normal Example',
+      description: '',
+      request: { url: 'https://api.example.com/test', method: 'get' },
+      response: {
+        headers: [],
+        status: '200',
+        statusText: 'OK',
+        body: { type: 'json', content: '{}' }
+      }
+    };
+
+    const result = bruExampleToJson(parsed, true, 'http', 'GET');
+    expect(result.response.status).toBe(200);
+    expect(result.response.statusText).toBe('OK');
+  });
+
+  it('should swap back status and statusText when they are reversed (pre-fix Postman import)', () => {
+    const parsed = {
+      name: 'Swapped Example',
+      description: '',
+      request: { url: 'https://api.example.com/test', method: 'get' },
+      response: {
+        headers: [],
+        status: 'Accepted',
+        statusText: '202',
+        body: { type: 'json', content: '{}' }
+      }
+    };
+
+    const result = bruExampleToJson(parsed, true, 'http', 'GET');
+    expect(result.response.status).toBe(202);
+    expect(result.response.statusText).toBe('Accepted');
+  });
+
+  it('should swap back status OK and statusText 200', () => {
+    const parsed = {
+      name: 'Swapped OK Example',
+      description: '',
+      request: { url: 'https://api.example.com/test', method: 'get' },
+      response: {
+        headers: [],
+        status: 'OK',
+        statusText: '200',
+        body: { type: 'json', content: '{}' }
+      }
+    };
+
+    const result = bruExampleToJson(parsed, true, 'http', 'GET');
+    expect(result.response.status).toBe(200);
+    expect(result.response.statusText).toBe('OK');
+  });
+
+  it('should swap back status Not Found and statusText 404', () => {
+    const parsed = {
+      name: 'Swapped Not Found Example',
+      description: '',
+      request: { url: 'https://api.example.com/test', method: 'get' },
+      response: {
+        headers: [],
+        status: 'Not Found',
+        statusText: '404',
+        body: { type: 'json', content: '{}' }
+      }
+    };
+
+    const result = bruExampleToJson(parsed, true, 'http', 'GET');
+    expect(result.response.status).toBe(404);
+    expect(result.response.statusText).toBe('Not Found');
+  });
+
+  it('should not swap when status is already numeric and statusText is text (correct order)', () => {
+    const parsed = {
+      name: 'Correct Order Example',
+      description: '',
+      request: { url: 'https://api.example.com/test', method: 'get' },
+      response: {
+        headers: [],
+        status: '404',
+        statusText: 'Not Found',
+        body: { type: 'json', content: '{}' }
+      }
+    };
+
+    const result = bruExampleToJson(parsed, true, 'http', 'GET');
+    expect(result.response.status).toBe(404);
+    expect(result.response.statusText).toBe('Not Found');
+  });
+
+  it('should use defaults when response has no status', () => {
+    const parsed = {
+      name: 'No Status Example',
+      description: '',
+      request: { url: 'https://api.example.com/test', method: 'get' },
+      response: {
+        headers: [],
+        body: { type: 'json', content: '{}' }
+      }
+    };
+
+    const result = bruExampleToJson(parsed, true, 'http', 'GET');
+    expect(result.response.status).toBe(200);
+    expect(result.response.statusText).toBe('OK');
+  });
+});

package/src/formats/yml/common/auth-oauth2.ts

@@ -114,6 +114,8 @@ const buildTokenConfig = (oauth: BrunoOAuth2): OAuth2TokenConfig | undefined =>
     };
   }
 
+  tokenConfig.source = oauth.tokenSource || 'access_token';
+
   return Object.keys(tokenConfig).length > 0 ? tokenConfig : undefined;
 };
 
@@ -143,13 +145,16 @@ const buildClientCredentialsFlow = (oauth: BrunoOAuth2): OAuth2ClientCredentials
   isNonEmptyString(oauth.scope) && (flow.scope = oauth.scope);
 
   const accessTokenRequest = mapAdditionalParameters(oauth.additionalParameters?.token);
-  if (accessTokenRequest) {
-    flow.additionalParameters = { accessTokenRequest };
-  }
-
   const refreshTokenRequest = mapAdditionalParameters(oauth.additionalParameters?.refresh);
-  if (refreshTokenRequest) {
-    flow.additionalParameters = { refreshTokenRequest };
+
+  if (accessTokenRequest || refreshTokenRequest) {
+    flow.additionalParameters = {};
+    if (accessTokenRequest) {
+      flow.additionalParameters.accessTokenRequest = accessTokenRequest;
+    }
+    if (refreshTokenRequest) {
+      flow.additionalParameters.refreshTokenRequest = refreshTokenRequest;
+    }
   }
 
   const tokenConfig = buildTokenConfig(oauth);
@@ -179,13 +184,16 @@ const buildResourceOwnerPasswordFlow = (oauth: BrunoOAuth2): OAuth2ResourceOwner
   isNonEmptyString(oauth.scope) && (flow.scope = oauth.scope);
 
   const accessTokenRequest = mapAdditionalParameters(oauth.additionalParameters?.token);
-  if (accessTokenRequest) {
-    flow.additionalParameters = { accessTokenRequest };
-  }
-
   const refreshTokenRequest = mapAdditionalParameters(oauth.additionalParameters?.refresh);
-  if (refreshTokenRequest) {
-    flow.additionalParameters = { refreshTokenRequest };
+
+  if (accessTokenRequest || refreshTokenRequest) {
+    flow.additionalParameters = {};
+    if (accessTokenRequest) {
+      flow.additionalParameters.accessTokenRequest = accessTokenRequest;
+    }
+    if (refreshTokenRequest) {
+      flow.additionalParameters.refreshTokenRequest = refreshTokenRequest;
+    }
   }
 
   const tokenConfig = buildTokenConfig(oauth);
@@ -212,18 +220,20 @@ const buildAuthorizationCodeFlow = (oauth: BrunoOAuth2): OAuth2AuthorizationCode
   if (credentials) flow.credentials = credentials;
 
   const authorizationRequest = mapAdditionalParameters(oauth.additionalParameters?.authorization);
-  if (authorizationRequest) {
-    flow.additionalParameters = { authorizationRequest };
-  }
-
   const accessTokenRequest = mapAdditionalParameters(oauth.additionalParameters?.token);
-  if (accessTokenRequest) {
-    flow.additionalParameters = { accessTokenRequest };
-  }
-
   const refreshTokenRequest = mapAdditionalParameters(oauth.additionalParameters?.refresh);
-  if (refreshTokenRequest) {
-    flow.additionalParameters = { refreshTokenRequest };
+
+  if (authorizationRequest || accessTokenRequest || refreshTokenRequest) {
+    flow.additionalParameters = {};
+    if (authorizationRequest) {
+      flow.additionalParameters.authorizationRequest = authorizationRequest;
+    }
+    if (accessTokenRequest) {
+      flow.additionalParameters.accessTokenRequest = accessTokenRequest;
+    }
+    if (refreshTokenRequest) {
+      flow.additionalParameters.refreshTokenRequest = refreshTokenRequest;
+    }
   }
 
   isNonEmptyString(oauth.scope) && (flow.scope = oauth.scope);
@@ -345,6 +355,7 @@ export const toBrunoOAuth2 = (oauth: AuthOAuth2 | null | undefined): BrunoOAuth2
     tokenPlacement: null,
     tokenHeaderPrefix: null,
     tokenQueryKey: null,
+    tokenSource: 'access_token',
     refreshTokenUrl: null,
     autoRefreshToken: false, // Default to false
     autoFetchToken: true, // Default to true
@@ -363,6 +374,7 @@ export const toBrunoOAuth2 = (oauth: AuthOAuth2 | null | undefined): BrunoOAuth2
 
       // token config
       if (oauth.tokenConfig?.id) brunoOAuth.credentialsId = oauth.tokenConfig.id;
+      if (oauth.tokenConfig?.source) brunoOAuth.tokenSource = oauth.tokenConfig.source || 'access_token';
       if (oauth.tokenConfig?.placement) {
         if ('header' in oauth.tokenConfig.placement) {
           brunoOAuth.tokenPlacement = 'header';
@@ -408,6 +420,7 @@ export const toBrunoOAuth2 = (oauth: AuthOAuth2 | null | undefined): BrunoOAuth2
 
       // token config
       if (oauth.tokenConfig?.id) brunoOAuth.credentialsId = oauth.tokenConfig.id;
+      if (oauth.tokenConfig?.source) brunoOAuth.tokenSource = oauth.tokenConfig.source || 'access_token';
       if (oauth.tokenConfig?.placement) {
         if ('header' in oauth.tokenConfig.placement) {
           brunoOAuth.tokenPlacement = 'header';
@@ -454,6 +467,7 @@ export const toBrunoOAuth2 = (oauth: AuthOAuth2 | null | undefined): BrunoOAuth2
 
       // token config
       if (oauth.tokenConfig?.id) brunoOAuth.credentialsId = oauth.tokenConfig.id;
+      if (oauth.tokenConfig?.source) brunoOAuth.tokenSource = oauth.tokenConfig.source || 'access_token';
       if (oauth.tokenConfig?.placement) {
         if ('header' in oauth.tokenConfig.placement) {
           brunoOAuth.tokenPlacement = 'header';
@@ -502,6 +516,7 @@ export const toBrunoOAuth2 = (oauth: AuthOAuth2 | null | undefined): BrunoOAuth2
 
       // token config
       if (oauth.tokenConfig?.id) brunoOAuth.credentialsId = oauth.tokenConfig.id;
+      if (oauth.tokenConfig?.source) brunoOAuth.tokenSource = oauth.tokenConfig.source || 'access_token';
       if (oauth.tokenConfig?.placement) {
         if ('header' in oauth.tokenConfig.placement) {
           brunoOAuth.tokenPlacement = 'header';

package/src/formats/yml/items/parseHttpRequest.ts

@@ -171,7 +171,8 @@ const parseHttpRequest = (ocRequest: HttpRequest): BrunoItem => {
 
       if (example.response) {
         brunoExample.response = {
-          status: example.response.status !== undefined ? String(example.response.status) : null,
+          status: typeof example.response.status === 'number' ? example.response.status
+            : example.response.status !== undefined ? Number(example.response.status) : null,
           statusText: example.response.statusText || null,
           headers: toBrunoHttpHeaders(example.response.headers) || [],
           body: null

package/src/formats/yml/parseCollection.ts

@@ -41,7 +41,7 @@ const parseCollection = (ymlString: string): ParsedCollection => {
       }
     }
 
-    // bruno-specific script extensions
+    // bruno-specific extensions
     const brunoExtensions = oc.extensions?.bruno as any;
     if (Array.isArray(brunoExtensions?.scripts?.additionalContextRoots)) {
       const sanitizedRoots = brunoExtensions.scripts.additionalContextRoots
@@ -54,6 +54,16 @@ const parseCollection = (ymlString: string): ParsedCollection => {
         };
       }
     }
+    if (Array.isArray(brunoExtensions?.openapi) && brunoExtensions.openapi.length > 0) {
+      brunoConfig.openapi = brunoExtensions.openapi.map((entry: any) => ({
+        sourceUrl: entry.sourceUrl,
+        groupBy: entry.groupBy,
+        ...(entry.lastSyncDate && { lastSyncDate: entry.lastSyncDate }),
+        ...(entry.specHash && { specHash: entry.specHash }),
+        autoCheck: entry.autoCheck !== false,
+        autoCheckInterval: entry.autoCheckInterval || 5
+      }));
+    }
 
     // protobuf
     if (oc.config?.protobuf) {

package/src/formats/yml/stringifyCollection.ts

@@ -262,6 +262,21 @@ const stringifyCollection = (collectionRoot: any, brunoConfig: any): string => {
       };
     }
 
+    // bruno-specific extensions
+    if (Array.isArray(brunoConfig.openapi) && brunoConfig.openapi.length > 0) {
+      if (!oc.extensions.bruno) {
+        oc.extensions.bruno = {};
+      }
+      (oc.extensions.bruno as any).openapi = brunoConfig.openapi.map((entry: any) => ({
+        sourceUrl: entry.sourceUrl,
+        groupBy: entry.groupBy,
+        ...(entry.lastSyncDate && { lastSyncDate: entry.lastSyncDate }),
+        ...(entry.specHash && { specHash: entry.specHash }),
+        autoCheck: entry.autoCheck !== false,
+        autoCheckInterval: entry.autoCheckInterval || 5
+      }));
+    }
+
     return stringifyYml(oc);
   } catch (error) {
     console.error('Error stringifying opencollection.yml:', error);