astro-ascendant 3.1.0 → 4.0.0

package/dist/astro-params/model.d.ts

@@ -1,8 +1,8 @@
 import { Schema } from "effect";
-export declare const Ayanamsa: Schema.Literals<readonly ["FaganBradley", "Lahiri", "DeLuce", "Raman", "Ushashashi", "Krishnamurti", "DjwhalKhul", "Yukteshwar", "JNBhasin", "BabylKugler1", "BabylKugler2", "BabylKugler3", "BabylHuber", "BabylEtPSC", "Aldebaran15Tau", "Hipparchos", "Sassanian", "GalacticCenter0Sag", "J2000", "J1900", "B1950", "SuryaSiddhanta", "SuryaSiddhantaMeanSun", "Aryabhata", "AryabhataMeanSun", "SSRevati", "SSCitra", "TrueCitra", "TrueRevati", "TruePushya", "GalacticCenterGilBrand", "GalacticEquatorIAU1958", "GalacticEquator", "GalacticEquatorMidMula", "Skydram", "TrueMula", "DhruvaGalCenterMulaWilhelm", "Aryabhata522", "BabylBritton"]>;
+export declare const Ayanamsa: Schema.Literals<readonly ["FaganBradley", "Lahiri", "DeLuce", "Raman", "Ushashashi", "Krishnamurti", "DjwhalKhul", "Yukteshwar", "JNBhasin", "BabylKugler1", "BabylKugler2", "BabylKugler3", "BabylHuber", "BabylEtPSC", "Aldebaran15Tau", "Hipparchos", "Sassanian", "GalacticCenter0Sag", "J2000", "J1900", "B1950", "SuryaSiddhanta", "SuryaSiddhantaMeanSun", "Aryabhata", "AryabhataMeanSun", "SSRevati", "SSCitra", "TrueCitra", "TrueRevati", "TruePushya", "GalacticCenterGilBrand", "GalacticEquatorIAU1958", "GalacticEquator", "GalacticEquatorMidMula", "Skydram", "TrueMula", "DhruvaGalCenterMulaWilhelm", "Aryabhata522", "BabylBritton", "TrueSheoran", "GalacticCenterCochrane", "GalacticEquatorFiorenza", "ValensMoon", "Lahiri1940", "LahiriVP285", "KrishnamurtiVP291", "LahiriICRC"]>;
 export declare const HouseSystem: Schema.Literals<readonly ["Placidus", "Koch", "Porphyrius", "Regiomontanus", "Campanus", "Equal", "VehlowEqual", "WholeSign", "Meridian", "Azimuthal", "PolichPage", "Alcabitus", "Morinus"]>;
 declare const Options_base: Schema.Class<Options, Schema.Struct<{
-    readonly ayanamsa: Schema.Literals<readonly ["FaganBradley", "Lahiri", "DeLuce", "Raman", "Ushashashi", "Krishnamurti", "DjwhalKhul", "Yukteshwar", "JNBhasin", "BabylKugler1", "BabylKugler2", "BabylKugler3", "BabylHuber", "BabylEtPSC", "Aldebaran15Tau", "Hipparchos", "Sassanian", "GalacticCenter0Sag", "J2000", "J1900", "B1950", "SuryaSiddhanta", "SuryaSiddhantaMeanSun", "Aryabhata", "AryabhataMeanSun", "SSRevati", "SSCitra", "TrueCitra", "TrueRevati", "TruePushya", "GalacticCenterGilBrand", "GalacticEquatorIAU1958", "GalacticEquator", "GalacticEquatorMidMula", "Skydram", "TrueMula", "DhruvaGalCenterMulaWilhelm", "Aryabhata522", "BabylBritton"]>;
+    readonly ayanamsa: Schema.Literals<readonly ["FaganBradley", "Lahiri", "DeLuce", "Raman", "Ushashashi", "Krishnamurti", "DjwhalKhul", "Yukteshwar", "JNBhasin", "BabylKugler1", "BabylKugler2", "BabylKugler3", "BabylHuber", "BabylEtPSC", "Aldebaran15Tau", "Hipparchos", "Sassanian", "GalacticCenter0Sag", "J2000", "J1900", "B1950", "SuryaSiddhanta", "SuryaSiddhantaMeanSun", "Aryabhata", "AryabhataMeanSun", "SSRevati", "SSCitra", "TrueCitra", "TrueRevati", "TruePushya", "GalacticCenterGilBrand", "GalacticEquatorIAU1958", "GalacticEquator", "GalacticEquatorMidMula", "Skydram", "TrueMula", "DhruvaGalCenterMulaWilhelm", "Aryabhata522", "BabylBritton", "TrueSheoran", "GalacticCenterCochrane", "GalacticEquatorFiorenza", "ValensMoon", "Lahiri1940", "LahiriVP285", "KrishnamurtiVP291", "LahiriICRC"]>;
     readonly houseSystem: Schema.Literals<readonly ["Placidus", "Koch", "Porphyrius", "Regiomontanus", "Campanus", "Equal", "VehlowEqual", "WholeSign", "Meridian", "Azimuthal", "PolichPage", "Alcabitus", "Morinus"]>;
 }>, {}>;
 export declare class Options extends Options_base {

package/dist/astro-params/model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/astro-params/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,eAAO,MAAM,QAAQ,2nBAwCnB,CAAC;AAEH,eAAO,MAAM,WAAW,+LActB,CAAC;;;;;AAEH,qBAAa,OAAQ,SAAQ,YAG3B;CAAG"}
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/astro-params/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAIhC,eAAO,MAAM,QAAQ,6wBAgDnB,CAAC;AAEH,eAAO,MAAM,WAAW,+LActB,CAAC;;;;;AAEH,qBAAa,OAAQ,SAAQ,YAG3B;CAAG"}

package/dist/astro-params/model.js

@@ -1,4 +1,6 @@
 import { Schema } from "effect";
+// Ordered by Swiss Ephemeris SE_SIDM numeric ID (0-46).
+// Note: this is catalog order, not recency — e.g. J2000 (18) is modern but early in the list.
 export const Ayanamsa = Schema.Literals([
     "FaganBradley",
     "Lahiri",
@@ -39,6 +41,14 @@ export const Ayanamsa = Schema.Literals([
     "DhruvaGalCenterMulaWilhelm",
     "Aryabhata522",
     "BabylBritton",
+    "TrueSheoran",
+    "GalacticCenterCochrane",
+    "GalacticEquatorFiorenza",
+    "ValensMoon",
+    "Lahiri1940",
+    "LahiriVP285",
+    "KrishnamurtiVP291",
+    "LahiriICRC",
 ]);
 export const HouseSystem = Schema.Literals([
     "Placidus",

package/dist/astro-params/model.js.map

@@ -1 +1 @@
-{"version":3,"file":"model.js","sourceRoot":"","sources":["../../src/astro-params/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,MAAM,CAAC,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;IACtC,cAAc;IACd,QAAQ;IACR,QAAQ;IACR,OAAO;IACP,YAAY;IACZ,cAAc;IACd,YAAY;IACZ,YAAY;IACZ,UAAU;IACV,cAAc;IACd,cAAc;IACd,cAAc;IACd,YAAY;IACZ,YAAY;IACZ,gBAAgB;IAChB,YAAY;IACZ,WAAW;IACX,oBAAoB;IACpB,OAAO;IACP,OAAO;IACP,OAAO;IACP,gBAAgB;IAChB,uBAAuB;IACvB,WAAW;IACX,kBAAkB;IAClB,UAAU;IACV,SAAS;IACT,WAAW;IACX,YAAY;IACZ,YAAY;IACZ,wBAAwB;IACxB,wBAAwB;IACxB,iBAAiB;IACjB,wBAAwB;IACxB,SAAS;IACT,UAAU;IACV,4BAA4B;IAC5B,cAAc;IACd,cAAc;CACf,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,WAAW,GAAG,MAAM,CAAC,QAAQ,CAAC;IACzC,UAAU;IACV,MAAM;IACN,YAAY;IACZ,eAAe;IACf,UAAU;IACV,OAAO;IACP,aAAa;IACb,WAAW;IACX,UAAU;IACV,WAAW;IACX,YAAY;IACZ,WAAW;IACX,SAAS;CACV,CAAC,CAAC;AAEH,MAAM,OAAO,OAAQ,SAAQ,MAAM,CAAC,KAAK,CAAU,aAAa,CAAC,CAAC;IAChE,QAAQ,EAAE,QAAQ;IAClB,WAAW,EAAE,WAAW;CACzB,CAAC;CAAG"}
+{"version":3,"file":"model.js","sourceRoot":"","sources":["../../src/astro-params/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,wDAAwD;AACxD,8FAA8F;AAC9F,MAAM,CAAC,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;IACtC,cAAc;IACd,QAAQ;IACR,QAAQ;IACR,OAAO;IACP,YAAY;IACZ,cAAc;IACd,YAAY;IACZ,YAAY;IACZ,UAAU;IACV,cAAc;IACd,cAAc;IACd,cAAc;IACd,YAAY;IACZ,YAAY;IACZ,gBAAgB;IAChB,YAAY;IACZ,WAAW;IACX,oBAAoB;IACpB,OAAO;IACP,OAAO;IACP,OAAO;IACP,gBAAgB;IAChB,uBAAuB;IACvB,WAAW;IACX,kBAAkB;IAClB,UAAU;IACV,SAAS;IACT,WAAW;IACX,YAAY;IACZ,YAAY;IACZ,wBAAwB;IACxB,wBAAwB;IACxB,iBAAiB;IACjB,wBAAwB;IACxB,SAAS;IACT,UAAU;IACV,4BAA4B;IAC5B,cAAc;IACd,cAAc;IACd,aAAa;IACb,wBAAwB;IACxB,yBAAyB;IACzB,YAAY;IACZ,YAAY;IACZ,aAAa;IACb,mBAAmB;IACnB,YAAY;CACb,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,WAAW,GAAG,MAAM,CAAC,QAAQ,CAAC;IACzC,UAAU;IACV,MAAM;IACN,YAAY;IACZ,eAAe;IACf,UAAU;IACV,OAAO;IACP,aAAa;IACb,WAAW;IACX,UAAU;IACV,WAAW;IACX,YAAY;IACZ,WAAW;IACX,SAAS;CACV,CAAC,CAAC;AAEH,MAAM,OAAO,OAAQ,SAAQ,MAAM,CAAC,KAAK,CAAU,aAAa,CAAC,CAAC;IAChE,QAAQ,EAAE,QAAQ;IAClB,WAAW,EAAE,WAAW;CACzB,CAAC;CAAG"}

package/dist/astro-params/service.js

@@ -6,7 +6,7 @@ export function layer(options) {
     return Layer.succeed(Service, Service.of(options));
 }
 const defaultLayer = layer({
-    ayanamsa: "Krishnamurti",
+    ayanamsa: "KrishnamurtiVP291",
     houseSystem: "Placidus",
 });
 export { Service as AstroParams, defaultLayer as DefaultAstroParams };

package/dist/astro-params/service.js.map

@@ -1 +1 @@
-{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/astro-params/service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAExC,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAgB,MAAM,YAAY,CAAC;AAEjE,MAAM,OAAQ,SAAQ,OAAO,CAAC,OAAO,EAMlC,CAAC,sCAAsC,CAAC;CAAG;AAE9C,MAAM,UAAU,KAAK,CAAC,OAAgB;IACpC,OAAO,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;AACrD,CAAC;AAED,MAAM,YAAY,GAAG,KAAK,CAAC;IACzB,QAAQ,EAAE,cAAc;IACxB,WAAW,EAAE,UAAU;CACxB,CAAC,CAAC;AAEH,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,YAAY,IAAI,kBAAkB,EAAE,CAAC"}
+{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/astro-params/service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAExC,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAgB,MAAM,YAAY,CAAC;AAEjE,MAAM,OAAQ,SAAQ,OAAO,CAAC,OAAO,EAMlC,CAAC,sCAAsC,CAAC;CAAG;AAE9C,MAAM,UAAU,KAAK,CAAC,OAAgB;IACpC,OAAO,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;AACrD,CAAC;AAED,MAAM,YAAY,GAAG,KAAK,CAAC;IACzB,QAAQ,EAAE,mBAAmB;IAC7B,WAAW,EAAE,UAAU;CACxB,CAAC,CAAC;AAEH,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,YAAY,IAAI,kBAAkB,EAAE,CAAC"}

package/dist/chart/calculate.d.ts

@@ -1,13 +1,8 @@
 import { Effect } from "effect";
 import type { DateTime as DateTimeType } from "effect/DateTime";
 import type { HouseData } from "../ephemeris/model.js";
+import type { MappedPositions } from "./charts.js";
 import { ChartCalculationError } from "./error.js";
 import { Chart } from "./model.js";
-/**
- * Creates a cusp-based chart from ephemeris house data and a division's
- * mapped planets.
- * It validates that the twelve normalized cusp intervals cover exactly one
- * circle, then assigns each planet to one half-open interval `[cusp, next cusp)`.
- */
-export declare const chartFromHouseData: (houses: HouseData, chart: Chart, date: DateTimeType) => Effect.Effect<Chart, ChartCalculationError | import("./divisional-mapping/error.js").DivisionalMappingError, never>;
+export declare const chartFromHouseData: (houses: HouseData, positions: MappedPositions, date: DateTimeType) => Effect.Effect<Chart, ChartCalculationError | import("./divisional-mapping/error.js").DivisionalMappingError | import("../utils/position.js").LongitudeError, never>;
 //# sourceMappingURL=calculate.d.ts.map

package/dist/chart/calculate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"calculate.d.ts","sourceRoot":"","sources":["../../src/chart/calculate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,MAAM,EAAkB,MAAM,QAAQ,CAAC;AAC1D,OAAO,KAAK,EAAE,QAAQ,IAAI,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEhE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAGvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAGnD,OAAO,EAEL,KAAK,EAaN,MAAM,YAAY,CAAC;AA4IpB;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,8KAiI7B,CAAC"}
+{"version":3,"file":"calculate.d.ts","sourceRoot":"","sources":["../../src/chart/calculate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAmC,MAAM,QAAQ,CAAC;AACjE,OAAO,KAAK,EAAE,QAAQ,IAAI,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEhE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAGvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAGnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAInD,OAAO,EAEL,KAAK,EAYN,MAAM,YAAY,CAAC;AA0JpB,eAAO,MAAM,kBAAkB,4OAiJ7B,CAAC"}

package/dist/chart/calculate.js

@@ -1,104 +1,99 @@
-import { DateTime, Effect, Record, Schema } from "effect";
-import { distributePlanets, forwardDistance, normalizeAngle } from "./cusp.js";
-import { getDivisionalTarget } from "./divisional-mapping/index.js";
+import { Effect, HashMap, Option, Record, Schema } from "effect";
+import { chartProjection } from "../provenance.js";
+import { EPS_CIRCLE, normalizeLongitude, signStartOf } from "../utils/position.js";
+import { angularDistance, distributePlanets, forwardDistance } from "./cusp.js";
+import { getDivisionalTarget } from "./divisional-mapping/calculate.js";
 import { ChartCalculationError } from "./error.js";
-import { nakshatraOf, subLordOf } from "./helper.js";
-import { RASHIS, SIGN_LORDS } from "./internal/constants.js";
+import { starOf, subLordOf } from "./helper.js";
+import { SIGN_LORDS } from "./internal/constants.js";
+import { dayLord, signAt, signLordOf } from "./internal/position.js";
 import { ChartAngles, Chart, ChartHouses, CircleAngle, HouseSignificators, House, Houses, Longitude, HOUSE_SIGNIFICATIONS, PlanetSignification, Planets, } from "./model.js";
-const HOUSE_NUMBERS = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12];
 const PLANET_NAMES = Planets.literals;
-function houseOfPlanet(planet, houses) {
+const houseOfPlanet = (planet, houses) => Effect.sync(() => {
     const index = houses.findIndex((house) => house.planets.some((item) => item.name === planet));
-    return index === -1 ? undefined : (index + 1);
-}
-function ownedHouses(planet, houses) {
-    return houses.flatMap((house, index) => {
-        const sign = RASHIS[Math.floor(Number(house.cusp) / 30)];
-        return sign !== undefined && SIGN_LORDS[sign] === planet ? [(index + 1)] : [];
-    });
-}
-function starLordOf(planet) {
-    return nakshatraOf(planet.longitude).lord;
-}
-function planetsInStarOf(starLord, planets) {
-    return planets.flatMap((planet) => (starLordOf(planet) === starLord ? [planet.name] : []));
-}
-function dayLord(date) {
-    const weekdays = [
-        "Sun",
-        "Moon",
-        "Mars",
-        "Mercury",
-        "Jupiter",
-        "Venus",
-        "Saturn",
-    ];
-    return weekdays[DateTime.toDate(date).getUTCDay()];
-}
-function signLordOf(longitude) {
-    const sign = RASHIS[Math.floor(Number(longitude) / 30)];
-    return SIGN_LORDS[sign];
-}
-function angularDistance(first, second) {
-    const distance = Math.abs(first - second) % 360;
-    return Math.min(distance, 360 - distance);
-}
-function agentOf(planet, houses) {
-    if (planet.name !== "Rahu" && planet.name !== "Ketu")
-        return undefined;
+    return (index + 1);
+});
+const ownedHouses = (planet, houses) => Effect.forEach(houses, (house, index) => signAt(house.cusp).pipe(Effect.map((sign) => (SIGN_LORDS[sign] === planet ? [(index + 1)] : [])))).pipe(Effect.map((groups) => groups.flat()));
+const planetsInStarOf = Effect.fn(function* (starLord, planets) {
+    const names = [];
+    for (const planet of planets) {
+        if ((yield* starOf(planet.longitude)).lord === starLord) {
+            names.push(planet.name);
+        }
+    }
+    return names;
+});
+const agentOf = Effect.fn(function* (planet, houses) {
+    if (planet.name !== "Rahu" && planet.name !== "Ketu") {
+        return yield* ChartCalculationError.make({
+            message: `${planet.name} has no agent; only Rahu and Ketu do`,
+            stage: "mapping",
+            cause: planet.name,
+        });
+    }
     const house = houses.find((item) => item.planets.some(({ name }) => name === planet.name));
     const conjunction = house?.planets
         .filter((item) => item.name !== planet.name)
         .sort((first, second) => angularDistance(first.longitude, planet.longitude) -
         angularDistance(second.longitude, planet.longitude))[0];
     return conjunction?.name ?? planet.sign.lord;
-}
-function calculateSignifications(houses, lagna, date) {
-    const houseEntries = HOUSE_NUMBERS.map((house) => [house, houses[house]]);
+});
+const planetSignificationOf = Effect.fn(function* (planet, byName, allHouses) {
+    const item = HashMap.get(byName, planet);
+    const agent = Option.isSome(item) && (planet === "Rahu" || planet === "Ketu")
+        ? Option.some(yield* agentOf(item.value, allHouses))
+        : Option.none();
+    const effective = Option.getOrElse(agent, () => planet);
+    const source = Option.isSome(agent) ? HashMap.get(byName, agent.value) : item;
+    const starLord = Option.isSome(source)
+        ? Option.some((yield* starOf(source.value.longitude)).lord)
+        : Option.none();
+    const level1 = Option.isSome(starLord) ? [yield* houseOfPlanet(starLord.value, allHouses)] : [];
+    const level2 = [yield* houseOfPlanet(effective, allHouses)];
+    const level3 = Option.isSome(starLord)
+        ? yield* ownedHouses(Option.getOrElse(agent, () => starLord.value), allHouses)
+        : [];
+    const level4 = yield* ownedHouses(effective, allHouses);
+    return [
+        planet,
+        PlanetSignification.make({
+            planet,
+            ...(Option.isSome(agent) ? { agent: agent.value } : {}),
+            level1,
+            level2,
+            level3,
+            level4,
+        }),
+    ];
+});
+const houseSignificatorsOf = Effect.fn(function* (house, chartHouse, planets) {
+    const occupants = chartHouse.planets.map((planet) => planet.name);
+    const owner = SIGN_LORDS[yield* signAt(chartHouse.cusp)];
+    const level1 = (yield* Effect.forEach(occupants, (o) => planetsInStarOf(o, planets))).flat();
+    const level3 = yield* planetsInStarOf(owner, planets);
+    return [
+        String(house),
+        HouseSignificators.make({ house, level1, level2: occupants, level3, level4: [owner] }),
+    ];
+});
+const calculateSignifications = Effect.fn(function* (houses, lagna, date) {
+    const houseEntries = Houses.literals.map((house) => [house, houses[house]]);
     const allHouses = houseEntries.map(([, house]) => house);
     const planets = allHouses.flatMap((house) => house.planets);
-    const byName = new Map(planets.map((planet) => [planet.name, planet]));
-    const significations = PLANET_NAMES.map((planet) => {
-        const item = byName.get(planet);
-        const agent = item === undefined ? undefined : agentOf(item, allHouses);
-        const effectivePlanet = agent ?? planet;
-        const source = agent === undefined ? item : byName.get(agent);
-        const starLord = source === undefined ? undefined : starLordOf(source);
-        return [
-            planet,
-            PlanetSignification.make({
-                planet,
-                ...(agent === undefined ? {} : { agent }),
-                level1: starLord === undefined
-                    ? []
-                    : [houseOfPlanet(starLord, allHouses)].filter((house) => house !== undefined),
-                level2: [houseOfPlanet(effectivePlanet, allHouses)].filter((house) => house !== undefined),
-                level3: starLord === undefined ? [] : ownedHouses(agent ?? starLord, allHouses),
-                level4: ownedHouses(effectivePlanet, allHouses),
-            }),
-        ];
-    });
-    const houseSignificators = houseEntries.map(([house, chartHouse]) => {
-        const occupants = chartHouse.planets.map((planet) => planet.name);
-        const owner = SIGN_LORDS[RASHIS[Math.floor(Number(chartHouse.cusp) / 30)]];
-        const level1 = occupants.flatMap((occupant) => planetsInStarOf(occupant, planets));
-        const level3 = planetsInStarOf(owner, planets);
-        return [
-            String(house),
-            HouseSignificators.make({
-                house,
-                level1,
-                level2: occupants,
-                level3,
-                level4: [owner],
-            }),
-        ];
-    });
-    const moon = byName.get("Moon");
-    const ascendantStarLord = nakshatraOf(lagna.longitude).lord;
+    const byName = HashMap.fromIterable(planets.map((planet) => [planet.name, planet]));
+    const significations = yield* Effect.forEach(PLANET_NAMES, (planet) => planetSignificationOf(planet, byName, allHouses));
+    const houseSignificators = yield* Effect.forEach(houseEntries, ([house, chartHouse]) => houseSignificatorsOf(house, chartHouse, planets));
+    const moon = HashMap.get(byName, "Moon");
+    const ascendantStarLord = (yield* starOf(lagna.longitude)).lord;
     const ascendantSignLord = SIGN_LORDS[lagna.sign.name];
-    const moonStarLord = moon === undefined ? ascendantStarLord : starLordOf(moon);
-    const moonSignLord = moon?.sign.lord ?? ascendantSignLord;
+    const moonStarLord = Option.isSome(moon)
+        ? (yield* starOf(moon.value.longitude)).lord
+        : ascendantStarLord;
+    const moonSignLord = Option.match(moon, {
+        onNone: () => ascendantSignLord,
+        onSome: (m) => m.sign.lord,
+    });
+    const dayLordOfDate = yield* dayLord(date);
     return {
         planetSignifications: Record.fromEntries(significations),
         houseSignificators: Record.fromEntries(houseSignificators),
@@ -107,17 +102,11 @@ function calculateSignifications(houses, lagna, date) {
             ascendantSignLord,
             moonStarLord,
             moonSignLord,
-            dayLord(date),
+            dayLordOfDate,
         ],
     };
-}
-/**
- * Creates a cusp-based chart from ephemeris house data and a division's
- * mapped planets.
- * It validates that the twelve normalized cusp intervals cover exactly one
- * circle, then assigns each planet to one half-open interval `[cusp, next cusp)`.
- */
-export const chartFromHouseData = Effect.fn("Chart.fromHouseData")(function* (houses, chart, date) {
+});
+export const chartFromHouseData = Effect.fn("astro-ascendant/chart/chartFromHouseData")(function* (houses, positions, date) {
     const rawCusps = houses.cusps.slice(1, 13);
     const rawAngles = [
         houses.ascendant,
@@ -129,7 +118,7 @@ export const chartFromHouseData = Effect.fn("Chart.fromHouseData")(function* (ho
         houses.coAscendant2,
         houses.polarAscendant,
     ];
-    if (rawCusps.length !== HOUSE_NUMBERS.length ||
+    if (rawCusps.length !== Houses.literals.length ||
         rawCusps.some((cusp) => !Number.isFinite(cusp)) ||
         rawAngles.some((angle) => !Number.isFinite(angle))) {
         return yield* ChartCalculationError.make({
@@ -138,42 +127,37 @@ export const chartFromHouseData = Effect.fn("Chart.fromHouseData")(function* (ho
             cause: houses,
         });
     }
-    const lagna = chart.houses[1].lagna;
-    if (lagna === null) {
-        return yield* ChartCalculationError.make({
-            stage: "mapping",
-            message: "Could not calculate chart",
-            cause: chart,
-        });
-    }
-    const mappedCusps = yield* Effect.all(rawCusps.map((cusp) => getDivisionalTarget(normalizeAngle(cusp), chart.division)), { concurrency: "unbounded" }).pipe(Effect.map((targets) => targets.map(({ longitude }) => longitude)));
-    const equalCusps = HOUSE_NUMBERS.map((_, index) => normalizeAngle(Math.floor(lagna.longitude / 30) * 30 + index * 30));
-    const mappedSpans = mappedCusps.map((cusp, index) => {
+    const { division, lagna, planets, sex } = positions;
+    const mappedCusps = yield* Effect.forEach(rawCusps, (cusp) => normalizeLongitude(cusp).pipe(Effect.flatMap((longitude) => getDivisionalTarget(longitude, division)), Effect.map(({ longitude }) => longitude)), { concurrency: "unbounded" });
+    const signStart = yield* signStartOf(lagna.longitude);
+    const equalCusps = yield* Effect.forEach(Houses.literals, (_, index) => normalizeLongitude(signStart + index * 30));
+    const mappedSpans = [];
+    for (const [index, cusp] of mappedCusps.entries()) {
         const nextCusp = mappedCusps[(index + 1) % mappedCusps.length];
-        return nextCusp === undefined ? Number.NaN : forwardDistance(cusp, nextCusp);
-    });
+        mappedSpans.push(nextCusp === undefined ? Number.NaN : yield* forwardDistance(cusp, nextCusp));
+    }
     const mappedFullCircle = mappedSpans.reduce((total, span) => total + span, 0);
     const cusps = houses.houseSystem === "WholeSign" ||
         mappedSpans.some((span) => span === 0) ||
-        Math.abs(mappedFullCircle - 360) > 1e-7
+        Math.abs(mappedFullCircle - 360) > EPS_CIRCLE
         ? equalCusps
         : mappedCusps;
-    const spans = cusps.map((cusp, index) => {
+    const spans = [];
+    for (const [index, cusp] of cusps.entries()) {
         const nextCusp = cusps[(index + 1) % cusps.length];
-        return nextCusp === undefined ? Number.NaN : forwardDistance(cusp, nextCusp);
-    });
+        spans.push(nextCusp === undefined ? Number.NaN : yield* forwardDistance(cusp, nextCusp));
+    }
     const fullCircle = spans.reduce((total, span) => total + span, 0);
-    if (spans.some((span) => span === 0) || Math.abs(fullCircle - 360) > 1e-7) {
+    if (spans.some((span) => span === 0) || Math.abs(fullCircle - 360) > EPS_CIRCLE) {
         return yield* ChartCalculationError.make({
             stage: "mapping",
             message: "Could not calculate chart",
             cause: houses.cusps,
         });
     }
-    const planets = Record.values(chart.houses).flatMap((house) => house.planets);
-    const planetsByHouse = distributePlanets(planets, cusps, spans);
+    const planetsByHouse = yield* distributePlanets(planets, cusps, spans);
     const houseEntries = [];
-    for (const [index, houseNumber] of HOUSE_NUMBERS.entries()) {
+    for (const [index, houseNumber] of Houses.literals.entries()) {
         const cusp = cusps[index];
         const housePlanets = planetsByHouse[index];
         if (cusp === undefined || housePlanets === undefined) {
@@ -183,14 +167,18 @@ export const chartFromHouseData = Effect.fn("Chart.fromHouseData")(function* (ho
                 cause: houses.cusps,
             });
         }
+        const sign = yield* signAt(cusp);
+        const signLord = yield* signLordOf(cusp);
+        const starLord = (yield* starOf(cusp)).lord;
+        const subLord = yield* subLordOf(cusp);
         houseEntries.push([
             String(houseNumber),
             House.make({
-                sign: RASHIS[Math.floor(cusp / 30)],
-                cusp: Longitude.make(cusp),
-                signLord: signLordOf(Longitude.make(cusp)),
-                starLord: nakshatraOf(Longitude.make(cusp)).lord,
-                subLord: subLordOf(Longitude.make(cusp)),
+                sign,
+                cusp,
+                signLord,
+                starLord,
+                subLord,
                 significations: HOUSE_SIGNIFICATIONS[houseNumber],
                 planets: housePlanets,
                 lagna: index === 0 ? lagna : null,
@@ -202,21 +190,29 @@ export const chartFromHouseData = Effect.fn("Chart.fromHouseData")(function* (ho
         message: "Could not calculate chart",
         cause,
     })));
-    const significations = calculateSignifications(chartHouses, lagna, date);
+    const significations = yield* calculateSignifications(chartHouses, lagna, date);
+    const ascendantAngle = yield* normalizeLongitude(houses.ascendant);
+    const mcAngle = yield* normalizeLongitude(houses.mc);
+    const armcAngle = yield* normalizeLongitude(houses.armc);
+    const vertexAngle = yield* normalizeLongitude(houses.vertex);
+    const equatorialAscendantAngle = yield* normalizeLongitude(houses.equatorialAscendant);
+    const coAscendant1Angle = yield* normalizeLongitude(houses.coAscendant1);
+    const coAscendant2Angle = yield* normalizeLongitude(houses.coAscendant2);
+    const polarAscendantAngle = yield* normalizeLongitude(houses.polarAscendant);
     return Chart.make({
-        ...(chart.sex === undefined ? {} : { sex: chart.sex }),
-        provenance: chart.provenance,
-        division: chart.division,
+        ...(sex === undefined ? {} : { sex }),
+        provenance: chartProjection.provenance,
+        division,
         houses: chartHouses,
         angles: ChartAngles.make({
-            ascendant: CircleAngle.make(normalizeAngle(houses.ascendant)),
-            mc: CircleAngle.make(normalizeAngle(houses.mc)),
-            armc: CircleAngle.make(normalizeAngle(houses.armc)),
-            vertex: CircleAngle.make(normalizeAngle(houses.vertex)),
-            equatorialAscendant: CircleAngle.make(normalizeAngle(houses.equatorialAscendant)),
-            coAscendant1: CircleAngle.make(normalizeAngle(houses.coAscendant1)),
-            coAscendant2: CircleAngle.make(normalizeAngle(houses.coAscendant2)),
-            polarAscendant: CircleAngle.make(normalizeAngle(houses.polarAscendant)),
+            ascendant: CircleAngle.make(ascendantAngle),
+            mc: CircleAngle.make(mcAngle),
+            armc: CircleAngle.make(armcAngle),
+            vertex: CircleAngle.make(vertexAngle),
+            equatorialAscendant: CircleAngle.make(equatorialAscendantAngle),
+            coAscendant1: CircleAngle.make(coAscendant1Angle),
+            coAscendant2: CircleAngle.make(coAscendant2Angle),
+            polarAscendant: CircleAngle.make(polarAscendantAngle),
         }),
         ...significations,
     });

package/dist/chart/calculate.js.map

@@ -1 +1 @@
-{"version":3,"file":"calculate.js","sourceRoot":"","sources":["../../src/chart/calculate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAI1D,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC/E,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EACL,WAAW,EACX,KAAK,EACL,WAAW,EACX,WAAW,EACX,kBAAkB,EAClB,KAAK,EACL,MAAM,EAEN,SAAS,EACT,oBAAoB,EAEpB,mBAAmB,EACnB,OAAO,GAER,MAAM,YAAY,CAAC;AAEpB,MAAM,aAAa,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAU,CAAC;AACvE,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ,CAAC;AAEtC,SAAS,aAAa,CAAC,MAAe,EAAE,MAAwB;IAC9D,MAAM,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC;IAC9F,OAAO,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAE,CAAC,KAAK,GAAG,CAAC,CAAY,CAAC;AAC5D,CAAC;AAED,SAAS,WAAW,CAAC,MAAe,EAAE,MAAwB;IAC5D,OAAO,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;QACrC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAuB,CAAC;QAC/E,OAAO,IAAI,KAAK,SAAS,IAAI,UAAU,CAAC,IAAI,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAC1F,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,UAAU,CAAC,MAAc;IAChC,OAAO,WAAW,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC;AAC5C,CAAC;AAED,SAAS,eAAe,CAAC,QAAiB,EAAE,OAA0B;IACpE,OAAO,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAC7F,CAAC;AAED,SAAS,OAAO,CAAC,IAAkB;IACjC,MAAM,QAAQ,GAAuB;QACnC,KAAK;QACL,MAAM;QACN,MAAM;QACN,SAAS;QACT,SAAS;QACT,OAAO;QACP,QAAQ;KACT,CAAC;IACF,OAAO,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,CAAE,CAAC;AACtD,CAAC;AAED,SAAS,UAAU,CAAC,SAAoB;IACtC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,CAAW,CAAC;IAClE,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC;AAED,SAAS,eAAe,CAAC,KAAa,EAAE,MAAc;IACpD,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,MAAM,CAAC,GAAG,GAAG,CAAC;IAChD,OAAO,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,GAAG,QAAQ,CAAC,CAAC;AAC5C,CAAC;AAED,SAAS,OAAO,CAAC,MAAc,EAAE,MAAwB;IACvD,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM;QAAE,OAAO,SAAS,CAAC;IAEvE,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAC3F,MAAM,WAAW,GAAG,KAAK,EAAE,OAAO;SAC/B,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,CAAC;SAC3C,IAAI,CACH,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,CAChB,eAAe,CAAC,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC;QAClD,eAAe,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,CACtD,CAAC,CAAC,CAAC,CAAC;IAEP,OAAO,WAAW,EAAE,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;AAC/C,CAAC;AAED,SAAS,uBAAuB,CAC9B,MAAuC,EACvC,KAAY,EACZ,IAAkB;IAElB,MAAM,YAAY,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAU,CAAC,CAAC;IACnF,MAAM,SAAS,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;IACzD,MAAM,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC5D,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAU,CAAC,CAAC,CAAC;IAChF,MAAM,cAAc,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACjD,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAChC,MAAM,KAAK,GAAG,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QACxE,MAAM,eAAe,GAAG,KAAK,IAAI,MAAM,CAAC;QACxC,MAAM,MAAM,GAAG,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAC9D,MAAM,QAAQ,GAAG,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACvE,OAAO;YACL,MAAM;YACN,mBAAmB,CAAC,IAAI,CAAC;gBACvB,MAAM;gBACN,GAAG,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC;gBACzC,MAAM,EACJ,QAAQ,KAAK,SAAS;oBACpB,CAAC,CAAC,EAAE;oBACJ,CAAC,CAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC,MAAM,CAC1C,CAAC,KAAK,EAAmB,EAAE,CAAC,KAAK,KAAK,SAAS,CACnC;gBACpB,MAAM,EAAE,CAAC,aAAa,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC,CAAC,MAAM,CACxD,CAAC,KAAK,EAAmB,EAAE,CAAC,KAAK,KAAK,SAAS,CAChD;gBACD,MAAM,EAAE,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,IAAI,QAAQ,EAAE,SAAS,CAAC;gBAC/E,MAAM,EAAE,WAAW,CAAC,eAAe,EAAE,SAAS,CAAC;aAChD,CAAC;SACM,CAAC;IACb,CAAC,CAAC,CAAC;IAEH,MAAM,kBAAkB,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,UAAU,CAAC,EAAE,EAAE;QAClE,MAAM,SAAS,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAClE,MAAM,KAAK,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAW,CAAC,CAAC;QACrF,MAAM,MAAM,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,eAAe,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;QACnF,MAAM,MAAM,GAAG,eAAe,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAC/C,OAAO;YACL,MAAM,CAAC,KAAK,CAAC;YACb,kBAAkB,CAAC,IAAI,CAAC;gBACtB,KAAK;gBACL,MAAM;gBACN,MAAM,EAAE,SAAS;gBACjB,MAAM;gBACN,MAAM,EAAE,CAAC,KAAK,CAAC;aAChB,CAAC;SACM,CAAC;IACb,CAAC,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAChC,MAAM,iBAAiB,GAAG,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC;IAC5D,MAAM,iBAAiB,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACtD,MAAM,YAAY,GAAG,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IAC/E,MAAM,YAAY,GAAG,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,iBAAiB,CAAC;IAE1D,OAAO;QACL,oBAAoB,EAAE,MAAM,CAAC,WAAW,CAAC,cAAc,CAGtD;QACD,kBAAkB,EAAE,MAAM,CAAC,WAAW,CAAC,kBAAkB,CAGxD;QACD,aAAa,EAAE;YACb,iBAAiB;YACjB,iBAAiB;YACjB,YAAY;YACZ,YAAY;YACZ,OAAO,CAAC,IAAI,CAAC;SACmC;KACnD,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC,EAAE,CAAC,qBAAqB,CAAC,CAAC,QAAQ,CAAC,EAC1E,MAAiB,EACjB,KAAY,EACZ,IAAkB;IAElB,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAC3C,MAAM,SAAS,GAAG;QAChB,MAAM,CAAC,SAAS;QAChB,MAAM,CAAC,EAAE;QACT,MAAM,CAAC,IAAI;QACX,MAAM,CAAC,MAAM;QACb,MAAM,CAAC,mBAAmB;QAC1B,MAAM,CAAC,YAAY;QACnB,MAAM,CAAC,YAAY;QACnB,MAAM,CAAC,cAAc;KACtB,CAAC;IAEF,IACE,QAAQ,CAAC,MAAM,KAAK,aAAa,CAAC,MAAM;QACxC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC/C,SAAS,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAClD,CAAC;QACD,OAAO,KAAK,CAAC,CAAC,qBAAqB,CAAC,IAAI,CAAC;YACvC,KAAK,EAAE,SAAS;YAChB,OAAO,EAAE,2BAA2B;YACpC,KAAK,EAAE,MAAM;SACd,CAAC,CAAC;IACL,CAAC;IAED,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IACpC,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QACnB,OAAO,KAAK,CAAC,CAAC,qBAAqB,CAAC,IAAI,CAAC;YACvC,KAAK,EAAE,SAAS;YAChB,OAAO,EAAE,2BAA2B;YACpC,KAAK,EAAE,KAAK;SACb,CAAC,CAAC;IACL,CAAC;IAED,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CACnC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,mBAAmB,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC,EACjF,EAAE,WAAW,EAAE,WAAW,EAAE,CAC7B,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IAC3E,MAAM,UAAU,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAChD,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,GAAG,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,GAAG,EAAE,CAAC,CACnE,CAAC;IACF,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;QAClD,MAAM,QAAQ,GAAG,WAAW,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;QAC/D,OAAO,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,eAAe,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC/E,CAAC,CAAC,CAAC;IACH,MAAM,gBAAgB,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC;IAC9E,MAAM,KAAK,GACT,MAAM,CAAC,WAAW,KAAK,WAAW;QAClC,WAAW,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC,CAAC;QACtC,IAAI,CAAC,GAAG,CAAC,gBAAgB,GAAG,GAAG,CAAC,GAAG,IAAI;QACrC,CAAC,CAAC,UAAU;QACZ,CAAC,CAAC,WAAW,CAAC;IAClB,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;QACtC,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;QACnD,OAAO,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,eAAe,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC/E,CAAC,CAAC,CAAC;IACH,MAAM,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC;IAClE,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC,GAAG,IAAI,EAAE,CAAC;QAC1E,OAAO,KAAK,CAAC,CAAC,qBAAqB,CAAC,IAAI,CAAC;YACvC,KAAK,EAAE,SAAS;YAChB,OAAO,EAAE,2BAA2B;YACpC,KAAK,EAAE,MAAM,CAAC,KAAK;SACpB,CAAC,CAAC;IACL,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC9E,MAAM,cAAc,GAAG,iBAAiB,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;IAEhE,MAAM,YAAY,GAAoC,EAAE,CAAC;IACzD,KAAK,MAAM,CAAC,KAAK,EAAE,WAAW,CAAC,IAAI,aAAa,CAAC,OAAO,EAAE,EAAE,CAAC;QAC3D,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;QAC1B,MAAM,YAAY,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;QAC3C,IAAI,IAAI,KAAK,SAAS,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;YACrD,OAAO,KAAK,CAAC,CAAC,qBAAqB,CAAC,IAAI,CAAC;gBACvC,KAAK,EAAE,SAAS;gBAChB,OAAO,EAAE,2BAA2B;gBACpC,KAAK,EAAE,MAAM,CAAC,KAAK;aACpB,CAAC,CAAC;QACL,CAAC;QACD,YAAY,CAAC,IAAI,CAAC;YAChB,MAAM,CAAC,WAAW,CAAC;YACnB,KAAK,CAAC,IAAI,CAAC;gBACT,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,EAAE,CAAC,CAAE;gBACpC,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC;gBAC1B,QAAQ,EAAE,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC1C,QAAQ,EAAE,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI;gBAChD,OAAO,EAAE,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACxC,cAAc,EAAE,oBAAoB,CAAC,WAAW,CAAC;gBACjD,OAAO,EAAE,YAAY;gBACrB,KAAK,EAAE,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;aAClC,CAAC;SACH,CAAC,CAAC;IACL,CAAC;IAED,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAChE,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,CACjC,CAAC,IAAI,CACJ,MAAM,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE,CACxB,qBAAqB,CAAC,IAAI,CAAC;QACzB,KAAK,EAAE,SAAS;QAChB,OAAO,EAAE,2BAA2B;QACpC,KAAK;KACN,CAAC,CACH,CACF,CAAC;IAEF,MAAM,cAAc,GAAG,uBAAuB,CAAC,WAAW,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;IAEzE,OAAO,KAAK,CAAC,IAAI,CAAC;QAChB,GAAG,CAAC,KAAK,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,CAAC;QACtD,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,MAAM,EAAE,WAAW;QACnB,MAAM,EAAE,WAAW,CAAC,IAAI,CAAC;YACvB,SAAS,EAAE,WAAW,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAC7D,EAAE,EAAE,WAAW,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAC/C,IAAI,EAAE,WAAW,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACnD,MAAM,EAAE,WAAW,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YACvD,mBAAmB,EAAE,WAAW,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;YACjF,YAAY,EAAE,WAAW,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;YACnE,YAAY,EAAE,WAAW,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;YACnE,cAAc,EAAE,WAAW,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;SACxE,CAAC;QACF,GAAG,cAAc;KAClB,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"calculate.js","sourceRoot":"","sources":["../../src/chart/calculate.ts"],"names":[],"mappings":"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"}

package/dist/chart/charts.d.ts

@@ -1,11 +1,18 @@
 import { Effect } from "effect";
 import { ChartCalculationError } from "./error.js";
-import { Chart, type Placements } from "./model.js";
-/**
- * Projects D1 plus requested divisional charts from shared Placements. D1 is
- * always first; duplicate requests are removed and remaining divisions sort in
- * ascending numeric order, preserving a stable calculation result.
- * Optional sex metadata is copied unchanged into every projected chart.
- */
+import { Chart, type Division, Lagna, type Placements, Planet, type Sex } from "./model.js";
+export interface MappedPositions {
+    readonly division: Division;
+    readonly lagna: Lagna;
+    readonly planets: readonly Planet[];
+    readonly sex: Sex | undefined;
+}
+export declare const mappedPositions: (placements: Placements, division: 1 | 2 | 3 | 4 | 7 | 9 | 10 | 12 | 16 | 20 | 24 | 27 | 30 | 40 | 45 | 60, sex: "Female" | "Male" | undefined) => Effect.Effect<{
+    division: 1 | 2 | 3 | 4 | 7 | 9 | 10 | 12 | 16 | 20 | 24 | 27 | 30 | 40 | 45 | 60;
+    lagna: Lagna;
+    planets: Planet[];
+    sex: "Female" | "Male" | undefined;
+}, import("./divisional-mapping/error.js").DivisionalMappingError | import("../utils/position.js").LongitudeError, never>;
+export declare function requestedDivisions(divisions: readonly Division[]): readonly [Division, ...Division[]];
 export declare const project: (placements: Placements, divisions?: readonly (1 | 2 | 3 | 4 | 7 | 9 | 10 | 12 | 16 | 20 | 24 | 27 | 30 | 40 | 45 | 60)[] | undefined, sex?: "Female" | "Male" | undefined) => Effect.Effect<[Chart, ...Chart[]], ChartCalculationError, never>;
 //# sourceMappingURL=charts.d.ts.map

package/dist/chart/charts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"charts.d.ts","sourceRoot":"","sources":["../../src/chart/charts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,MAAM,EAAiC,MAAM,QAAQ,CAAC;AAItE,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAGnD,OAAO,EACL,KAAK,EAKL,KAAK,UAAU,EAKhB,MAAM,YAAY,CAAC;AAkGpB;;;;;GAKG;AACH,eAAO,MAAM,OAAO,iPAmBnB,CAAC"}
+{"version":3,"file":"charts.d.ts","sourceRoot":"","sources":["../../src/chart/charts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,MAAM,EAAiC,MAAM,QAAQ,CAAC;AAMtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAGnD,OAAO,EACL,KAAK,EACL,KAAK,QAAQ,EAGb,KAAK,EACL,KAAK,UAAU,EACf,MAAM,EAGN,KAAK,GAAG,EAET,MAAM,YAAY,CAAC;AAEpB,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAC5B,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,SAAS,CAAC;CAC/B;AAsCD,eAAO,MAAM,eAAe;;;;;yHA2C1B,CAAC;AAYH,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,SAAS,QAAQ,EAAE,GAC7B,SAAS,CAAC,QAAQ,EAAE,GAAG,QAAQ,EAAE,CAAC,CASpC;AAED,eAAO,MAAM,OAAO,iPAmBnB,CAAC"}

package/dist/chart/charts.js

@@ -1,37 +1,42 @@
 import { Array, Effect, Order, pipe, Record as Struct } from "effect";
-import { methods } from "../provenance.js";
-import { getDivisionalTarget } from "./divisional-mapping/index.js";
+import { chartProjection } from "../provenance.js";
+import { Zodiac } from "../utils/index.js";
+import { normalizeLongitude } from "../utils/position.js";
+import { getDivisionalTarget } from "./divisional-mapping/calculate.js";
 import { ChartCalculationError } from "./error.js";
-import { inSignStatus } from "./helper.js";
+import { inSignStatus, starOf, subLordOf } from "./helper.js";
 import { SIGN_LORDS } from "./internal/constants.js";
-import { Chart, House, Houses, Lagna, Planet, Rashis, Sign, } from "./model.js";
-/**
- * Assembles a Whole Sign chart from division-mapped Lagna and planet positions.
- * House one is the mapped Lagna sign and every following house advances one sign.
- */
-function chartFromMappedPlacements({ division, lagna, planets, sex, }) {
+import { Chart, House, Houses, Lagna, Planet, Rashis, Sign, HOUSE_SIGNIFICATIONS, } from "./model.js";
+const chartFromMappedPlacements = Effect.fn(function* ({ division, lagna, planets, sex, }) {
     const lagnaSignIndex = Rashis.literals.indexOf(lagna.sign.name);
-    const houses = Struct.fromEntries(Array.range(0, 11).map((index) => {
+    const entries = [];
+    for (const index of Array.range(0, 11)) {
         const house = (index + 1);
-        const houseSign = Array.getUnsafe(Rashis.literals, (lagnaSignIndex + index) % 12);
-        return [
+        const houseSign = Zodiac.signAt(lagnaSignIndex + index);
+        const cusp = yield* normalizeLongitude(Zodiac.wrapIndex(lagnaSignIndex + index) * 30);
+        entries.push([
             String(house),
             House.make({
                 sign: houseSign,
+                cusp,
+                signLord: SIGN_LORDS[houseSign],
+                starLord: (yield* starOf(cusp)).lord,
+                subLord: yield* subLordOf(cusp),
+                significations: HOUSE_SIGNIFICATIONS[house],
                 planets: planets.filter((planet) => planet.sign.name === houseSign),
                 lagna: house === 1 ? lagna : null,
             }),
-        ];
-    }));
+        ]);
+    }
+    const houses = Struct.fromEntries(entries);
     return Chart.make({
         ...(sex === undefined ? {} : { sex }),
-        provenance: methods.chartProjection.provenance,
+        provenance: chartProjection.provenance,
         division,
         houses,
     });
-}
-/** Maps canonical D1 Placements into one requested division before house assembly. */
-const chartFromPlacements = Effect.fn("astro-ascendant/chart/chartFromPlacements")(function* (placements, division, sex) {
+});
+export const mappedPositions = Effect.fn("astro-ascendant/chart/mappedPositions")(function* (placements, division, sex) {
     const lagna = yield* getDivisionalTarget(placements.lagna.longitude, division).pipe(Effect.map((mapped) => {
         const mappedSign = Array.getUnsafe(Rashis.literals, mapped.signIndex);
         return Lagna.make({
@@ -58,18 +63,16 @@ const chartFromPlacements = Effect.fn("astro-ascendant/chart/chartFromPlacements
             }),
         });
     }))), { concurrency: "unbounded" });
-    return chartFromMappedPlacements({ division, lagna, planets, sex });
+    return { division, lagna, planets, sex };
+});
+const chartFromPlacements = Effect.fn("astro-ascendant/chart/chartFromPlacements")(function* (placements, division, sex) {
+    const positions = yield* mappedPositions(placements, division, sex);
+    return yield* chartFromMappedPlacements(positions);
 });
-function requestedDivisions(divisions) {
+export function requestedDivisions(divisions) {
     const requested = pipe(divisions, Array.filter((division) => division !== 1), Array.dedupe, Array.sort(Order.Number));
     return [1, ...requested];
 }
-/**
- * Projects D1 plus requested divisional charts from shared Placements. D1 is
- * always first; duplicate requests are removed and remaining divisions sort in
- * ascending numeric order, preserving a stable calculation result.
- * Optional sex metadata is copied unchanged into every projected chart.
- */
 export const project = Effect.fn("astro-ascendant/chart/project")(function* (placements, divisions = [], sex) {
     const requested = requestedDivisions(divisions);
     const [firstDivision, ...remainingDivisions] = requested;