@usebruno/filestore 0.8.0 → 0.9.0

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,GAwG7E,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.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../../src/formats/yml/common/auth.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EAQL,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAE,IAAI,IAAI,SAAS,EAAE,MAAM,oCAAoC,CAAC;AA2G5E,eAAO,MAAM,oBAAoB,UAAW,SAAS,GAAG,IAAI,KAAG,IAAI,GAAG,SA8BrE,CAAC;AAEF,eAAO,MAAM,WAAW,SAAU,IAAI,GAAG,IAAI,GAAG,SAAS,KAAG,SAAS,GAAG,IA+FvE,CAAC"}
+{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../../src/formats/yml/common/auth.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EASL,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAE,IAAI,IAAI,SAAS,EAAiC,MAAM,oCAAoC,CAAC;AAwI3G,eAAO,MAAM,oBAAoB,UAAW,SAAS,GAAG,IAAI,KAAG,IAAI,GAAG,SAgCrE,CAAC;AAEF,eAAO,MAAM,WAAW,SAAU,IAAI,GAAG,IAAI,GAAG,SAAS,KAAG,SAAS,GAAG,IAoHvE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@usebruno/filestore",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "license": "MIT",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -29,23 +29,23 @@
     "@types/jest": "^29.5.11",
     "@types/lodash": "^4.14.191",
     "@types/node": "^24.1.0",
-    "@usebruno/schema-types": "0.3.0",
+    "@usebruno/schema-types": "0.4.0",
     "babel-jest": "^29.7.0",
     "jest": "^29.2.0",
     "nanoid": "3.3.8",
     "rimraf": "^3.0.2",
-    "rollup": "3.29.5",
+    "rollup": "3.30.0",
     "rollup-plugin-dts": "^5.0.0",
     "rollup-plugin-peer-deps-external": "^2.2.4",
-    "rollup-plugin-terser": "^7.0.2",
+    "@rollup/plugin-terser": "^1.0.0",
     "typescript": "^4.8.4"
   },
   "overrides": {
-    "rollup": "3.29.5"
+    "rollup": "3.30.0"
   },
   "dependencies": {
     "@types/nanoid": "^2.1.0",
-    "@usebruno/lang": "0.35.0",
+    "@usebruno/lang": "0.36.0",
     "ajv": "^8.17.1",
     "lodash": "^4.17.21",
     "yaml": "^2.3.4"

package/src/formats/bru/index.ts

@@ -32,6 +32,7 @@ export const parseBruRequest = (data: string | any, parsed: boolean = false): an
     }
 
     const sequence = _.get(json, 'meta.seq');
+    const tags = _.get(json, 'meta.tags', []);
     const urlPath: Record<typeof requestType, string> = {
       'grpc-request': 'grpc.url',
       'ws-request': 'ws.url',
@@ -42,7 +43,7 @@ export const parseBruRequest = (data: string | any, parsed: boolean = false): an
       name: _.get(json, 'meta.name'),
       seq: !_.isNaN(sequence) ? Number(sequence) : 1,
       settings: _.get(json, 'settings', {}),
-      tags: _.get(json, 'meta.tags', []),
+      tags: Array.isArray(tags) ? tags : [],
       request: {
         // Preserving special characters in custom methods. Using _.upperCase strips special characters.
         method:
@@ -367,6 +368,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 +400,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.ts

@@ -6,9 +6,10 @@ import type {
   AuthBearer,
   AuthDigest,
   AuthNTLM,
+  AuthOAuth1,
   AuthWsse
 } from '@opencollection/types/common/auth';
-import type { Auth as BrunoAuth } from '@usebruno/schema-types/common/auth';
+import type { Auth as BrunoAuth, AuthOauth1 as BrunoAuthOauth1 } from '@usebruno/schema-types/common/auth';
 import { isString } from '../../../utils';
 import { toOpenCollectionOAuth2, toBrunoOAuth2 } from './auth-oauth2';
 
@@ -115,6 +116,35 @@ const buildApiKeyAuth = (config?: BrunoAuth['apikey']): AuthApiKey => {
   return auth;
 };
 
+const buildOAuth1Auth = (config?: BrunoAuth['oauth1']): AuthOAuth1 => {
+  const auth: AuthOAuth1 = { type: 'oauth1' };
+
+  if (!config) {
+    return auth;
+  }
+
+  if (isString(config.consumerKey)) auth.consumerKey = config.consumerKey;
+  if (isString(config.consumerSecret)) auth.consumerSecret = config.consumerSecret;
+  if (isString(config.accessToken)) auth.accessToken = config.accessToken;
+  if (isString(config.accessTokenSecret)) auth.accessTokenSecret = config.accessTokenSecret;
+  if (isString(config.callbackUrl)) auth.callbackUrl = config.callbackUrl;
+  if (isString(config.verifier)) auth.verifier = config.verifier;
+  if (isString(config.signatureMethod)) auth.signatureMethod = config.signatureMethod;
+  if (isString(config.privateKey)) {
+    auth.privateKey = config.privateKeyType === 'file'
+      ? { type: 'file' as const, value: config.privateKey }
+      : { type: 'text' as const, value: config.privateKey };
+  }
+  if (isString(config.timestamp)) auth.timestamp = config.timestamp;
+  if (isString(config.nonce)) auth.nonce = config.nonce;
+  if (isString(config.version)) auth.version = config.version;
+  if (isString(config.realm)) auth.realm = config.realm;
+  if (isString(config.placement)) auth.placement = config.placement as AuthOAuth1['placement'];
+  if (typeof config.includeBodyHash === 'boolean') auth.includeBodyHash = config.includeBodyHash;
+
+  return auth;
+};
+
 export const toOpenCollectionAuth = (auth?: BrunoAuth | null): Auth | undefined => {
   if (!auth || auth.mode === 'none') {
     return undefined;
@@ -139,6 +169,8 @@ export const toOpenCollectionAuth = (auth?: BrunoAuth | null): Auth | undefined
       return buildWsseAuth(auth.wsse);
     case 'apikey':
       return buildApiKeyAuth(auth.apikey);
+    case 'oauth1':
+      return buildOAuth1Auth(auth.oauth1);
     case 'oauth2':
       return toOpenCollectionOAuth2(auth.oauth2);
     default:
@@ -231,6 +263,27 @@ export const toBrunoAuth = (auth: Auth | null | undefined): BrunoAuth | null =>
       };
       break;
 
+    case 'oauth1':
+      brunoAuth.mode = 'oauth1';
+      brunoAuth.oauth1 = {
+        consumerKey: auth.consumerKey || null,
+        consumerSecret: auth.consumerSecret || null,
+        accessToken: auth.accessToken || null,
+        accessTokenSecret: auth.accessTokenSecret || null,
+        callbackUrl: auth.callbackUrl || null,
+        verifier: auth.verifier || null,
+        signatureMethod: (auth.signatureMethod as BrunoAuthOauth1['signatureMethod']) || 'HMAC-SHA1',
+        privateKey: (typeof auth.privateKey === 'object' && auth.privateKey ? auth.privateKey.value : auth.privateKey) || null,
+        privateKeyType: (typeof auth.privateKey === 'object' && auth.privateKey ? auth.privateKey.type : 'text') as BrunoAuthOauth1['privateKeyType'],
+        timestamp: auth.timestamp || null,
+        nonce: auth.nonce || null,
+        version: auth.version || '1.0',
+        realm: auth.realm || null,
+        placement: (auth.placement as BrunoAuthOauth1['placement']) || 'header',
+        includeBodyHash: auth.includeBodyHash || false
+      };
+      break;
+
     case 'oauth2':
       brunoAuth.mode = 'oauth2';
       brunoAuth.oauth2 = toBrunoOAuth2(auth);