Skip to content

Commit bc20b38

Browse files
committed
Fix type export issues in progressions module
1 parent a442977 commit bc20b38

20 files changed

Lines changed: 271 additions & 339 deletions

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@ Calculate how the natal chart evolves over time using secondary progressions, so
592592
import {
593593
progressions,
594594
calculateProgression,
595-
formatProgressionResult,
595+
formatProgressedChart,
596596
} from "celestine";
597597

598598
// Define birth data
@@ -656,7 +656,7 @@ const solarArc = progressions.calculateSolarArc(
656656
console.log(`Solar Arc: ${progressions.formatSolarArc(solarArc)}`);
657657

658658
// Format complete result
659-
console.log(formatProgressionResult(result));
659+
console.log(formatProgressedChart(result));
660660
```
661661

662662
**Progression Types:**

src/index.ts

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -44,18 +44,15 @@ export * as ephemeris from './ephemeris/index.js';
4444

4545
/** House system calculations */
4646
export * as houses from './houses/index.js';
47-
47+
/** Progressions (secondary, solar arc, etc.) */
48+
export * as progressions from './progressions/index.js';
4849
/** Time and date conversions */
4950
export * as time from './time/index.js';
5051

51-
/** Zodiac sign calculations and dignities */
52-
export * as zodiac from './zodiac/index.js';
53-
5452
/** Transit calculations (predictive astrology) */
5553
export * as transits from './transits/index.js';
56-
57-
/** Progressions (secondary, solar arc, etc.) */
58-
export * as progressions from './progressions/index.js';
54+
/** Zodiac sign calculations and dignities */
55+
export * as zodiac from './zodiac/index.js';
5956

6057
// =============================================================================
6158
// Primary Chart API (most common entry point)
@@ -261,30 +258,30 @@ export {
261258
// =============================================================================
262259

263260
export type {
264-
/** Progressed body position */
265-
ProgressedBody,
266-
/** Progressed angle (ASC, MC) */
267-
ProgressedAngle,
268-
/** Progression aspect data */
269-
ProgressionAspect,
261+
/** Progressed angles (ASC, MC) */
262+
ProgressedAngles,
263+
/** Progressed aspect data */
264+
ProgressedAspect,
265+
/** Progressed chart with all data */
266+
ProgressedChart,
267+
/** Progressed planet position */
268+
ProgressedPlanet,
270269
/** Birth data for progressions */
271270
ProgressionBirthData,
272271
/** Progression configuration */
273272
ProgressionConfig,
274-
/** Complete progression result */
275-
ProgressionResult,
276273
/** Progression type */
277274
ProgressionType,
278275
} from './progressions/index.js';
279276
export {
280-
/** Calculate a complete progression */
281-
calculateProgression,
282277
/** Calculate progressed positions */
283278
calculateProgressedPositions,
279+
/** Calculate a complete progression */
280+
calculateProgression,
284281
/** Calculate solar arc */
285282
calculateSolarArc,
286283
/** Format progression result for display */
287-
formatProgressionResult,
284+
formatProgressedChart,
288285
/** Get progressed Moon report */
289286
getProgressedMoonReport,
290287
} from './progressions/index.js';

src/progressions/constants.test.ts

Lines changed: 19 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import {
2626
DEFAULT_PROGRESSION_CONFIG,
2727
EXACT_THRESHOLD,
2828
FUTURE_WARNING_YEARS,
29-
LUMINARY_ORB_EXTENSION,
3029
LUMINARIES,
30+
LUMINARY_ORB_EXTENSION,
3131
MAJOR_PROGRESSION_ASPECTS,
3232
MAX_PROGRESSION_AGE,
3333
MAX_TARGET_YEAR,
@@ -119,10 +119,7 @@ describe('progressions/constants', () => {
119119
describe('PROGRESSION_ORBS', () => {
120120
it('should have orbs for all aspect types', () => {
121121
for (const aspectType of Object.values(AspectType)) {
122-
assert.ok(
123-
PROGRESSION_ORBS[aspectType] !== undefined,
124-
`Missing orb for ${aspectType}`,
125-
);
122+
assert.ok(PROGRESSION_ORBS[aspectType] !== undefined, `Missing orb for ${aspectType}`);
126123
}
127124
});
128125

@@ -258,10 +255,7 @@ describe('progressions/constants', () => {
258255
describe('PROGRESSED_ANNUAL_MOTION', () => {
259256
it('should have motion values for default bodies', () => {
260257
for (const body of DEFAULT_PROGRESSION_BODIES) {
261-
assert.ok(
262-
PROGRESSED_ANNUAL_MOTION[body] !== undefined,
263-
`Missing motion for ${body}`,
264-
);
258+
assert.ok(PROGRESSED_ANNUAL_MOTION[body] !== undefined, `Missing motion for ${body}`);
265259
}
266260
});
267261

@@ -363,10 +357,7 @@ describe('progressions/constants', () => {
363357
describe('ASPECT_ANGLES', () => {
364358
it('should have angles for all aspect types', () => {
365359
for (const aspectType of Object.values(AspectType)) {
366-
assert.ok(
367-
ASPECT_ANGLES[aspectType] !== undefined,
368-
`Missing angle for ${aspectType}`,
369-
);
360+
assert.ok(ASPECT_ANGLES[aspectType] !== undefined, `Missing angle for ${aspectType}`);
370361
}
371362
});
372363

@@ -394,10 +385,7 @@ describe('progressions/constants', () => {
394385
describe('ASPECT_SYMBOLS', () => {
395386
it('should have symbols for all aspect types', () => {
396387
for (const aspectType of Object.values(AspectType)) {
397-
assert.ok(
398-
ASPECT_SYMBOLS[aspectType] !== undefined,
399-
`Missing symbol for ${aspectType}`,
400-
);
388+
assert.ok(ASPECT_SYMBOLS[aspectType] !== undefined, `Missing symbol for ${aspectType}`);
401389
}
402390
});
403391

@@ -445,9 +433,18 @@ describe('progressions/constants', () => {
445433

446434
it('should have all zodiac signs in correct order', () => {
447435
const expectedOrder = [
448-
'Aries', 'Taurus', 'Gemini', 'Cancer',
449-
'Leo', 'Virgo', 'Libra', 'Scorpio',
450-
'Sagittarius', 'Capricorn', 'Aquarius', 'Pisces',
436+
'Aries',
437+
'Taurus',
438+
'Gemini',
439+
'Cancer',
440+
'Leo',
441+
'Virgo',
442+
'Libra',
443+
'Scorpio',
444+
'Sagittarius',
445+
'Capricorn',
446+
'Aquarius',
447+
'Pisces',
451448
];
452449
assert.deepEqual([...SIGN_NAMES], expectedOrder);
453450
});
@@ -463,10 +460,7 @@ describe('progressions/constants', () => {
463460
});
464461

465462
it('should have bodies matching DEFAULT_PROGRESSION_BODIES', () => {
466-
assert.deepEqual(
467-
[...DEFAULT_PROGRESSION_CONFIG.bodies],
468-
[...DEFAULT_PROGRESSION_BODIES],
469-
);
463+
assert.deepEqual([...DEFAULT_PROGRESSION_CONFIG.bodies], [...DEFAULT_PROGRESSION_BODIES]);
470464
});
471465

472466
it('should not include progressed-to-progressed aspects by default', () => {
@@ -478,10 +472,7 @@ describe('progressions/constants', () => {
478472
});
479473

480474
it('should use major aspects by default', () => {
481-
assert.deepEqual(
482-
[...DEFAULT_PROGRESSION_CONFIG.aspectTypes],
483-
[...MAJOR_PROGRESSION_ASPECTS],
484-
);
475+
assert.deepEqual([...DEFAULT_PROGRESSION_CONFIG.aspectTypes], [...MAJOR_PROGRESSION_ASPECTS]);
485476
});
486477

487478
it('should include solar arc positions by default', () => {
@@ -514,4 +505,3 @@ describe('progressions/constants', () => {
514505
});
515506
});
516507
});
517-

src/progressions/constants.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,4 +409,3 @@ export const MIN_BIRTH_YEAR = 1800;
409409
* Far future calculations have decreasing accuracy.
410410
*/
411411
export const MAX_TARGET_YEAR = 2200;
412-

0 commit comments

Comments
 (0)