@rvoh/psychic 2.3.3 → 2.3.5

package/dist/cjs/src/bin/helpers/OpenApiSpecDiff.js

@@ -3,6 +3,7 @@ import * as cp from 'node:child_process';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 import colorize from '../../cli/helpers/colorize.js';
+import PsychicApp from '../../psychic-app/index.js';
 /**
  * Class-based OpenAPI specification diff tool
  *
@@ -97,7 +98,7 @@ export class OpenApiSpecDiff {
             };
         }
         throw new Error(`⚠️ oasdiff not found.
-    
+
       Install it via the instructions here:
         https://github.com/tufin/oasdiff
       `);
@@ -162,15 +163,25 @@ export class OpenApiSpecDiff {
     }
     /**
      * Retrieves head branch content for a file
+     * @param absoluteFilePath - Absolute path to the file
      */
-    getHeadBranchContent(filePath) {
+    getHeadBranchContent(absoluteFilePath) {
         if (!this.oasdiffConfig) {
             throw new Error('OasDiff config not initialized');
         }
         const branchRef = process.env.CI === '1' ? `origin/${this.oasdiffConfig.headBranch}` : this.oasdiffConfig.headBranch;
-        return cp.execSync(`git show ${branchRef}:${filePath}`, {
+        // Get git repo root
+        const gitRepoRoot = cp
+            .execSync('git rev-parse --show-toplevel', {
             encoding: 'utf8',
             cwd: process.cwd(),
+        })
+            .trim();
+        // Get relative path from git repo root to the file
+        const gitPath = path.relative(gitRepoRoot, absoluteFilePath).replace(/\\/g, '/');
+        return cp.execFileSync('git', ['show', `${branchRef}:${gitPath}`], {
+            encoding: 'utf8',
+            cwd: gitRepoRoot,
         });
     }
     /**
@@ -183,13 +194,17 @@ export class OpenApiSpecDiff {
             breaking: [],
             changelog: [],
         };
-        const currentFilePath = config.outputFilepath;
+        // Get absolute path using apiRoot
+        const psychicApp = PsychicApp.getOrFail();
+        const currentFilePath = path.isAbsolute(config.outputFilepath)
+            ? config.outputFilepath
+            : path.join(psychicApp.apiRoot, config.outputFilepath);
         if (!fs.existsSync(currentFilePath)) {
             result.error = `File ${config.outputFilepath} does not exist in current branch`;
             return result;
         }
         const tempMainFilePath = this.createTempFilePath(config.outputFilepath);
-        const mainContent = this.getHeadBranchContent(config.outputFilepath);
+        const mainContent = this.getHeadBranchContent(currentFilePath);
         fs.mkdirSync(path.dirname(tempMainFilePath), { recursive: true });
         fs.writeFileSync(tempMainFilePath, mainContent);
         try {

package/dist/esm/src/bin/helpers/OpenApiSpecDiff.js

@@ -3,6 +3,7 @@ import * as cp from 'node:child_process';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 import colorize from '../../cli/helpers/colorize.js';
+import PsychicApp from '../../psychic-app/index.js';
 /**
  * Class-based OpenAPI specification diff tool
  *
@@ -97,7 +98,7 @@ export class OpenApiSpecDiff {
             };
         }
         throw new Error(`⚠️ oasdiff not found.
-    
+
       Install it via the instructions here:
         https://github.com/tufin/oasdiff
       `);
@@ -162,15 +163,25 @@ export class OpenApiSpecDiff {
     }
     /**
      * Retrieves head branch content for a file
+     * @param absoluteFilePath - Absolute path to the file
      */
-    getHeadBranchContent(filePath) {
+    getHeadBranchContent(absoluteFilePath) {
         if (!this.oasdiffConfig) {
             throw new Error('OasDiff config not initialized');
         }
         const branchRef = process.env.CI === '1' ? `origin/${this.oasdiffConfig.headBranch}` : this.oasdiffConfig.headBranch;
-        return cp.execSync(`git show ${branchRef}:${filePath}`, {
+        // Get git repo root
+        const gitRepoRoot = cp
+            .execSync('git rev-parse --show-toplevel', {
             encoding: 'utf8',
             cwd: process.cwd(),
+        })
+            .trim();
+        // Get relative path from git repo root to the file
+        const gitPath = path.relative(gitRepoRoot, absoluteFilePath).replace(/\\/g, '/');
+        return cp.execFileSync('git', ['show', `${branchRef}:${gitPath}`], {
+            encoding: 'utf8',
+            cwd: gitRepoRoot,
         });
     }
     /**
@@ -183,13 +194,17 @@ export class OpenApiSpecDiff {
             breaking: [],
             changelog: [],
         };
-        const currentFilePath = config.outputFilepath;
+        // Get absolute path using apiRoot
+        const psychicApp = PsychicApp.getOrFail();
+        const currentFilePath = path.isAbsolute(config.outputFilepath)
+            ? config.outputFilepath
+            : path.join(psychicApp.apiRoot, config.outputFilepath);
         if (!fs.existsSync(currentFilePath)) {
             result.error = `File ${config.outputFilepath} does not exist in current branch`;
             return result;
         }
         const tempMainFilePath = this.createTempFilePath(config.outputFilepath);
-        const mainContent = this.getHeadBranchContent(config.outputFilepath);
+        const mainContent = this.getHeadBranchContent(currentFilePath);
         fs.mkdirSync(path.dirname(tempMainFilePath), { recursive: true });
         fs.writeFileSync(tempMainFilePath, mainContent);
         try {

package/dist/types/src/bin/helpers/OpenApiSpecDiff.d.ts

@@ -1,4 +1,4 @@
-import type { DefaultPsychicOpenapiOptions } from '../../psychic-app/index.js';
+import { DefaultPsychicOpenapiOptions } from '../../psychic-app/index.js';
 /**
  * Interface to hold the result of a comparison
  * between the current local OpenAPI specification and the head branch
@@ -88,6 +88,7 @@ export declare class OpenApiSpecDiff {
     private createTempFilePath;
     /**
      * Retrieves head branch content for a file
+     * @param absoluteFilePath - Absolute path to the file
      */
     private getHeadBranchContent;
     /**

package/dist/types/src/psychic-app/index.d.ts

@@ -252,10 +252,10 @@ export interface CustomCookieMaxAgeOptions {
     days?: number;
 }
 export interface PsychicSslCredentials {
-    key: string | undefined;
-    cert: string | undefined;
-    ca: string[] | undefined;
-    rejectUnauthorized: boolean | undefined;
+    key?: string | undefined;
+    cert?: string | undefined;
+    ca?: string[] | undefined;
+    rejectUnauthorized?: boolean | undefined;
 }
 export interface DefaultPsychicOpenapiOptions extends PsychicOpenapiBaseOptions {
     outputFilepath?: string;

package/package.json

@@ -2,7 +2,7 @@
   "type": "module",
   "name": "@rvoh/psychic",
   "description": "Typescript web framework",
-  "version": "2.3.3",
+  "version": "2.3.5",
   "author": "RVOHealth",
   "repository": {
     "type": "git",