klio 1.5.7 → 1.5.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "klio",
-  "version": "1.5.7",
+  "version": "1.5.8",
   "description": "A CLI for astrological calculations",
   "main": "src/main.js",
   "bin": {

package/src/astrology/astrologyService.js

@@ -1461,7 +1461,7 @@ async function calculatePersonalTransits(transitDate = null, birthData = null) {
 }
 
 // Function to calculate personal transit aspects
-function calculatePersonalTransitAspects(transitDate = null, birthData = null, targetPlanet = null) {
+function calculatePersonalTransitAspects(transitDate = null, birthData = null, targetPlanet = null, useHuberOrbs = true) {
   if (!birthData) {
     birthData = getBirthDataFromConfig();
     if (!birthData) {
@@ -1500,36 +1500,54 @@ function calculatePersonalTransitAspects(transitDate = null, birthData = null, t
 
   // Calculate aspects between transit and birth planets
   const aspects = [];
-  const aspectTypes = [
+  // Use the same orb model as other aspect calculations; default to Huber orbs
+  const aspectTypes = useHuberOrbs ? [
     { name: 'Conjunction', angle: 0, orb: 8 },
     { name: 'Opposition', angle: 180, orb: 8 },
     { name: 'Square', angle: 90, orb: 6 },
     { name: 'Trine', angle: 120, orb: 6 },
-    { name: 'Sextile', angle: 60, orb: 4 }
+    { name: 'Sextile', angle: 60, orb: 4 },
+    { name: 'Quincunx', angle: 150, orb: 3 }
+  ] : [
+    { name: 'Conjunction', angle: 0, orb: 10 },
+    { name: 'Opposition', angle: 180, orb: 10 },
+    { name: 'Square', angle: 90, orb: 8 },
+    { name: 'Trine', angle: 120, orb: 8 },
+    { name: 'Sextile', angle: 60, orb: 6 },
+    { name: 'Quincunx', angle: 150, orb: 4 }
   ];
 
   // Compare each transit planet with each birth planet
   for (const [transitName, transitLongitude] of Object.entries(transitPlanets)) {
+    // If filtering by target planet, only calculate for that transit planet
+    if (targetPlanet && transitName !== targetPlanet) continue;
+
     for (const [birthName, birthLongitude] of Object.entries(birthPlanets)) {
       // Skip if it's the same planet
       if (transitName === birthName) continue;
 
-      // Calculate the angle difference
-      const angleDiff = Math.abs(transitLongitude - birthLongitude) % 360;
-      const normalizedAngle = Math.min(angleDiff, 360 - angleDiff);
+      // Calculate the angle between the two planets
+      let rawDiff = transitLongitude - birthLongitude;
+      let angleDiff = ((rawDiff % 360) + 360) % 360;
 
-      // Check for aspects
+      // Check for aspects using the actual angle
       for (const aspect of aspectTypes) {
-        if (Math.abs(normalizedAngle - aspect.angle) <= aspect.orb) {
+        // Check both the angle and its complement (360 - angle)
+        const diff1 = Math.abs(angleDiff - aspect.angle);
+        const diff2 = Math.abs((360 - angleDiff) - aspect.angle);
+        const diff = Math.min(diff1, diff2);
+
+        if (diff <= aspect.orb) {
           aspects.push({
             transitPlanet: transitName,
             birthPlanet: birthName,
             type: aspect.name,
-            angle: normalizedAngle.toFixed(2),
-            orb: Math.abs(normalizedAngle - aspect.angle).toFixed(2),
+            angle: angleDiff.toFixed(2),
+            orb: diff.toFixed(2),
             transitLongitude: transitLongitude,
             birthLongitude: birthLongitude
           });
+          break; // Only match one aspect per planet pair
         }
       }
     }
@@ -1548,8 +1566,8 @@ function calculatePersonalTransitAspects(transitDate = null, birthData = null, t
 }
 
 // Function to display personal transit aspects
-function showPersonalTransitAspects(transitDate = null, birthData = null, targetPlanet = null) {
-  const aspectData = calculatePersonalTransitAspects(transitDate, birthData, targetPlanet);
+function showPersonalTransitAspects(transitDate = null, birthData = null, targetPlanet = null, useHuberOrbs = true) {
+  const aspectData = calculatePersonalTransitAspects(transitDate, birthData, targetPlanet, useHuberOrbs);
   
   if (!aspectData || aspectData.aspects.length === 0) {
     console.log('No personal transit aspects found.');
@@ -1557,7 +1575,7 @@ function showPersonalTransitAspects(transitDate = null, birthData = null, target
   }
 
   const transitDateDisplay = transitDate || getCurrentTimeInTimezone();
-  console.log(`Personal Transit Aspects (${transitDateDisplay.day}.${transitDateDisplay.month}.${transitDateDisplay.year}):`);
+  console.log(`Personal Transit Aspects (${transitDateDisplay.day}.${transitDateDisplay.month}.${transitDateDisplay.year}) [${(aspectData && aspectData.aspects.length>0) ? (useHuberOrbs ? 'Huber orbs' : 'Standard orbs') : ''}]:`);
   console.log('================================================================================');
   console.log('| Transit     | Birth      | Aspect      | Orb   | Transit Pos | Birth Pos   |');
   console.log('================================================================================');

package/src/cli/cli.js

@@ -882,7 +882,7 @@ program
         for (const [planetName] of Object.entries(planets)) {
           const transitPlanetData = getAstrologicalData(planetName, transitDateDisplay);
           const transitHouse = getPlanetHouse(parseFloat(transitPlanetData.degreeInSign) + (signs.indexOf(transitPlanetData.sign) * 30), houses.house);
-          const transitAspectsData = calculatePersonalTransitAspects(transitDateDisplay, birthData, planetName);
+          const transitAspectsData = calculatePersonalTransitAspects(transitDateDisplay, birthData, planetName, true);
           const transitAspects = transitAspectsData ? transitAspectsData.aspects : [];
           
           // Add planet data to each aspect for later display
@@ -999,13 +999,13 @@ program
       // Show personal transit aspects
       // Use the specific planet if specified, or all planets
       const targetPlanet = planetArg ? planetArg.toLowerCase() : null;
-      showPersonalTransitAspects(transitDate, birthData, targetPlanet);
+      showPersonalTransitAspects(transitDate, birthData, targetPlanet, true);
       
       // Handle AI request for personal transit aspects
       if (options.p) {
         // Get the transit aspects data for AI
         const { calculatePersonalTransitAspects } = require('../astrology/astrologyService');
-        const transitAspectsData = calculatePersonalTransitAspects(transitDate, birthData, targetPlanet);
+        const transitAspectsData = calculatePersonalTransitAspects(transitDate, birthData, targetPlanet, true);
         const transitAspects = transitAspectsData ? transitAspectsData.aspects : [];
         
         const aiData = {