sweph 2.10.0-8 → 2.10.0-9

package/README.md

@@ -76,6 +76,8 @@ If you find any inaccuracy or bug in this library, or if you find an upstream up
 
 * This library is a C/C++ add-on designed for Node.JS only, it will not work in browsers, other JS engines or in any other environment that does not support native C/C++ add-ons. In order to install this library, the target system must have the necessary build tools installed, such as `python`, `make` and `gcc` on Linux, `xcode` on Mac, `visual c++` on Windows, and/or other equivalent solutions.
 
-## Author
+## Copyright
 
-Copyright © 2021-2022, Timotej Valentin Rojko
+Copyright © 2021-2023, Timotej Valentin Rojko
+
+This library is offered free of charge for any type of use, including commercial use, however, if you're an individual or a company using this library in commercial products and/or services, consider subscribing to the appropriate sponsorship level [here](https://github.com/sponsors/timotejroiko) and get priority support for your business.

package/binding.gyp

@@ -4,36 +4,37 @@
 			"target_name": "sweph",
 			"sources": [
 				"src/sweph.cpp",
-				"<!@(node -p \"const { readdirSync, readFileSync, writeFileSync } = require('fs'); const file = readdirSync('./src/functions').map((x,i) => readFileSync('./src/functions/' + x, 'utf8').replace(/args/g, 'args' + i).replace('#include <sweph.h>', '')).reduce((a,b) => a + b, '#include <sweph.h>'); writeFileSync('./src/functions.cpp', file, 'utf8'); 'src/functions.cpp'\")"
+				"src/functions.cpp"
 			],
 			"include_dirs": [
 				"<!(node -p \"require('node-addon-api').include_dir\")",
 				"src"
 			],
-			'dependencies': [
-	  			'deps/swisseph.gyp:swisseph'
+			"dependencies": [
+	  			"swisseph"
 	  		],
 			"defines": [
 				"NAPI_DISABLE_CPP_EXCEPTIONS"
+			]
+		},
+		{
+			"target_name": "swisseph",
+			'type': "static_library",
+			"sources": [
+				"swisseph/swecl.c",
+				"swisseph/swedate.c",
+				"swisseph/swehel.c",
+				"swisseph/swehouse.c",
+				"swisseph/swejpl.c",
+				"swisseph/swemmoon.c",
+				"swisseph/swemplan.c",
+				"swisseph/sweph.c",
+				"swisseph/swephlib.c"
 			],
-			"cflags": [
-				"-flto",
-				"-Ofast",
-				"-pipe"
-			],
-			"cflags_cc": [
-				"-flto",
-				"-Ofast",
-				"-pipe"
-			],
-			"msvs_settings": {
-				"VCCLCompilerTool": {
-					"AdditionalOptions": [
-						"/O2",
-						"/GL",
-						"/Gw"
-					]
-				}
+			"direct_dependent_settings": {
+				"include_dirs": [
+					"swisseph"
+				]
 			}
 		}
 	]

package/index.d.ts

@@ -649,7 +649,7 @@ declare module "sweph" {
 		 * ```
 		 * ```
 		 */
-		data: JdEtUd;
+		data: JdEtUt;
 	}
 
 	interface VisLimitMag extends Flag, Error {
@@ -1728,7 +1728,7 @@ declare module "sweph" {
 		dip: number
 	]
 
-	type JdEtUd = [
+	type JdEtUt = [
 		/**
 		 * Julian day in ephemeris/terrestrial time
 		 */

package/index.mjs

@@ -1,4 +1,4 @@
-import { createRequire } from 'module';
+import { createRequire } from "module";
 import c from "./constants.js";
 
 const require = createRequire(import.meta.url);
@@ -8,94 +8,94 @@ sweph.constants = c;
 sweph.sweph = sweph;
 sweph.default = sweph;
 
-export default sweph
-export const constants = sweph.constants
-export const close = sweph.close
-export const set_delta_t_userdef = sweph.set_delta_t_userdef
-export const set_ephe_path = sweph.set_ephe_path
-export const set_jpl_file = sweph.set_jpl_file
-export const set_sid_mode = sweph.set_sid_mode
-export const set_tid_acc = sweph.set_tid_acc
-export const set_topo = sweph.set_topo
-export const version = sweph.version
-export const get_library_path = sweph.get_library_path
-export const get_tid_acc = sweph.get_tid_acc
-export const get_planet_name = sweph.get_planet_name
-export const get_current_file_data = sweph.get_current_file_data
-export const get_orbital_elements = sweph.get_orbital_elements
-export const get_ayanamsa_name = sweph.get_ayanamsa_name
-export const get_ayanamsa_ex_ut = sweph.get_ayanamsa_ex_ut
-export const get_ayanamsa_ex = sweph.get_ayanamsa_ex
-export const get_ayanamsa_ut = sweph.get_ayanamsa_ut
-export const get_ayanamsa = sweph.get_ayanamsa
-export const calc = sweph.calc
-export const calc_ut = sweph.calc_ut
-export const calc_pctr = sweph.calc_pctr
-export const fixstar = sweph.fixstar
-export const fixstar_ut = sweph.fixstar_ut
-export const fixstar_mag = sweph.fixstar_mag
-export const fixstar2 = sweph.fixstar2
-export const fixstar2_ut = sweph.fixstar2_ut
-export const fixstar2_mag = sweph.fixstar2_mag
-export const nod_aps = sweph.nod_aps
-export const nod_aps_ut = sweph.nod_aps_ut
-export const orbit_max_min_true_distance = sweph.orbit_max_min_true_distance
-export const sol_eclipse_when_loc = sweph.sol_eclipse_when_loc
-export const sol_eclipse_when_glob = sweph.sol_eclipse_when_glob
-export const sol_eclipse_how = sweph.sol_eclipse_how
-export const sol_eclipse_where = sweph.sol_eclipse_where
-export const lun_occult_when_loc = sweph.lun_occult_when_loc
-export const lun_occult_when_glob = sweph.lun_occult_when_glob
-export const lun_occult_where = sweph.lun_occult_where
-export const lun_eclipse_when_loc = sweph.lun_eclipse_when_loc
-export const lun_eclipse_when = sweph.lun_eclipse_when
-export const lun_eclipse_how = sweph.lun_eclipse_how
-export const rise_trans = sweph.rise_trans
-export const rise_trans_true_hor = sweph.rise_trans_true_hor
-export const pheno = sweph.pheno
-export const pheno_ut = sweph.pheno_ut
-export const azalt = sweph.azalt
-export const azalt_rev = sweph.azalt_rev
-export const refrac = sweph.refrac
-export const refrac_extended = sweph.refrac_extended
-export const heliacal_ut = sweph.heliacal_ut
-export const vis_limit_mag = sweph.vis_limit_mag
-export const heliacal_pheno_ut = sweph.heliacal_pheno_ut
-export const julday = sweph.julday
-export const date_conversion = sweph.date_conversion
-export const revjul = sweph.revjul
-export const utc_time_zone = sweph.utc_time_zone
-export const utc_to_jd = sweph.utc_to_jd
-export const jdet_to_utc = sweph.jdet_to_utc
-export const jdut1_to_utc = sweph.jdut1_to_utc
-export const time_equ = sweph.time_equ
-export const lmt_to_lat = sweph.lmt_to_lat
-export const lat_to_lmt = sweph.lat_to_lmt
-export const deltat = sweph.deltat
-export const deltat_ex = sweph.deltat_ex
-export const house_name = sweph.house_name
-export const houses = sweph.houses
-export const houses_armc = sweph.houses_armc
-export const houses_armc_ex2 = sweph.houses_armc_ex2
-export const houses_ex = sweph.houses_ex
-export const houses_ex2 = sweph.houses_ex2
-export const house_pos = sweph.house_pos
-export const gauquelin_sector = sweph.gauquelin_sector
-export const sidtime = sweph.sidtime
-export const sidtime0 = sweph.sidtime0
-export const cotrans = sweph.cotrans
-export const cotrans_sp = sweph.cotrans_sp
-export const degnorm = sweph.degnorm
-export const radnorm = sweph.radnorm
-export const split_deg = sweph.split_deg
-export const csnorm = sweph.csnorm
-export const difcsn = sweph.difcsn
-export const difdegn = sweph.difdegn
-export const difcs2n = sweph.difcs2n
-export const difdeg2n = sweph.difdeg2n
-export const csroundsec = sweph.csroundsec
-export const d2l = sweph.d2l
-export const day_of_week = sweph.day_of_week
-export const cs2timestr = sweph.cs2timestr
-export const cs2lonlatstr = sweph.cs2lonlatstr
-export const cs2degstr = sweph.cs2degstr
+export default sweph;
+export const constants = sweph.constants;
+export const close = sweph.close;
+export const set_delta_t_userdef = sweph.set_delta_t_userdef;
+export const set_ephe_path = sweph.set_ephe_path;
+export const set_jpl_file = sweph.set_jpl_file;
+export const set_sid_mode = sweph.set_sid_mode;
+export const set_tid_acc = sweph.set_tid_acc;
+export const set_topo = sweph.set_topo;
+export const version = sweph.version;
+export const get_library_path = sweph.get_library_path;
+export const get_tid_acc = sweph.get_tid_acc;
+export const get_planet_name = sweph.get_planet_name;
+export const get_current_file_data = sweph.get_current_file_data;
+export const get_orbital_elements = sweph.get_orbital_elements;
+export const get_ayanamsa_name = sweph.get_ayanamsa_name;
+export const get_ayanamsa_ex_ut = sweph.get_ayanamsa_ex_ut;
+export const get_ayanamsa_ex = sweph.get_ayanamsa_ex;
+export const get_ayanamsa_ut = sweph.get_ayanamsa_ut;
+export const get_ayanamsa = sweph.get_ayanamsa;
+export const calc = sweph.calc;
+export const calc_ut = sweph.calc_ut;
+export const calc_pctr = sweph.calc_pctr;
+export const fixstar = sweph.fixstar;
+export const fixstar_ut = sweph.fixstar_ut;
+export const fixstar_mag = sweph.fixstar_mag;
+export const fixstar2 = sweph.fixstar2;
+export const fixstar2_ut = sweph.fixstar2_ut;
+export const fixstar2_mag = sweph.fixstar2_mag;
+export const nod_aps = sweph.nod_aps;
+export const nod_aps_ut = sweph.nod_aps_ut;
+export const orbit_max_min_true_distance = sweph.orbit_max_min_true_distance;
+export const sol_eclipse_when_loc = sweph.sol_eclipse_when_loc;
+export const sol_eclipse_when_glob = sweph.sol_eclipse_when_glob;
+export const sol_eclipse_how = sweph.sol_eclipse_how;
+export const sol_eclipse_where = sweph.sol_eclipse_where;
+export const lun_occult_when_loc = sweph.lun_occult_when_loc;
+export const lun_occult_when_glob = sweph.lun_occult_when_glob;
+export const lun_occult_where = sweph.lun_occult_where;
+export const lun_eclipse_when_loc = sweph.lun_eclipse_when_loc;
+export const lun_eclipse_when = sweph.lun_eclipse_when;
+export const lun_eclipse_how = sweph.lun_eclipse_how;
+export const rise_trans = sweph.rise_trans;
+export const rise_trans_true_hor = sweph.rise_trans_true_hor;
+export const pheno = sweph.pheno;
+export const pheno_ut = sweph.pheno_ut;
+export const azalt = sweph.azalt;
+export const azalt_rev = sweph.azalt_rev;
+export const refrac = sweph.refrac;
+export const refrac_extended = sweph.refrac_extended;
+export const heliacal_ut = sweph.heliacal_ut;
+export const vis_limit_mag = sweph.vis_limit_mag;
+export const heliacal_pheno_ut = sweph.heliacal_pheno_ut;
+export const julday = sweph.julday;
+export const date_conversion = sweph.date_conversion;
+export const revjul = sweph.revjul;
+export const utc_time_zone = sweph.utc_time_zone;
+export const utc_to_jd = sweph.utc_to_jd;
+export const jdet_to_utc = sweph.jdet_to_utc;
+export const jdut1_to_utc = sweph.jdut1_to_utc;
+export const time_equ = sweph.time_equ;
+export const lmt_to_lat = sweph.lmt_to_lat;
+export const lat_to_lmt = sweph.lat_to_lmt;
+export const deltat = sweph.deltat;
+export const deltat_ex = sweph.deltat_ex;
+export const house_name = sweph.house_name;
+export const houses = sweph.houses;
+export const houses_armc = sweph.houses_armc;
+export const houses_armc_ex2 = sweph.houses_armc_ex2;
+export const houses_ex = sweph.houses_ex;
+export const houses_ex2 = sweph.houses_ex2;
+export const house_pos = sweph.house_pos;
+export const gauquelin_sector = sweph.gauquelin_sector;
+export const sidtime = sweph.sidtime;
+export const sidtime0 = sweph.sidtime0;
+export const cotrans = sweph.cotrans;
+export const cotrans_sp = sweph.cotrans_sp;
+export const degnorm = sweph.degnorm;
+export const radnorm = sweph.radnorm;
+export const split_deg = sweph.split_deg;
+export const csnorm = sweph.csnorm;
+export const difcsn = sweph.difcsn;
+export const difdegn = sweph.difdegn;
+export const difcs2n = sweph.difcs2n;
+export const difdeg2n = sweph.difdeg2n;
+export const csroundsec = sweph.csroundsec;
+export const d2l = sweph.d2l;
+export const day_of_week = sweph.day_of_week;
+export const cs2timestr = sweph.cs2timestr;
+export const cs2lonlatstr = sweph.cs2lonlatstr;
+export const cs2degstr = sweph.cs2degstr;

package/package.json

@@ -1,30 +1,48 @@
 {
 	"name": "sweph",
-	"version": "2.10.0-8",
+	"version": "2.10.0-9",
 	"description": "The definitive Swiss Ephemeris bindings for Node.js",
-	"main": "index.js",
-	"typings": "./index.d.ts",
+	"keywords": [
+		"sweph",
+		"swiss",
+		"ephemeris",
+		"astrology",
+		"astronomy",
+		"swisseph",
+		"node"
+	],
+	"homepage": "https://github.com/timotejroiko/sweph",
+	"bugs": "https://github.com/timotejroiko/sweph/issues",
+	"repository": "github:timotejroiko/sweph",
+	"funding": "https://github.com/timotejroiko/sweph?sponsor=1",
+	"author": "Timotej Valentin Rojko",
 	"exports": {
 		"require": "./index.js",
 		"import": "./index.mjs"
 	},
+	"main": "index.js",
+	"types": "./index.d.ts",
+	"files": [
+		"./index.js",
+		"./index.mjs",
+		"./index.d.ts",
+		"./constants.js",
+		"./binding.gyp",
+		"./swisseph",
+		"./src/functions",
+		"./src/sweph.cpp",
+		"./src/sweph.h"
+	],
 	"scripts": {
-		"test": "echo \"Error: no test specified\" && exit 0"
+		"preinstall": "node -e \"const { readdirSync, readFileSync, writeFileSync } = require('fs'); const file = readdirSync('./src/functions').map((x,i) => readFileSync('./src/functions/' + x, 'utf8').replace(/args/g, 'args' + i).replace('#include <sweph.h>', '')).reduce((a,b) => a + b, '#include <sweph.h>'); writeFileSync('./src/functions.cpp', file, 'utf8');\"",
+		"install": "node-gyp rebuild && npm run test",
+		"test": "node -e \"const s = require('./'); const c = s.calc(2222222,0,4); console.log('OK')\""
 	},
-	"repository": {
-		"url": "https://github.com/timotejroiko/sweph.git"
-	},
-	"bugs": "https://github.com/timotejroiko/sweph/issues",
 	"dependencies": {
 		"node-addon-api": "*"
 	},
-	"funding": {
-		"type": "patreon",
-		"url": "https://patreon.com/timotejroiko"
-	},
-	"author": "Timotej Valentin Rojko",
 	"license": "(GPL-2.0-or-later OR LGPL-3.0-or-later)",
 	"devDependencies": {
-		"eslint": "^8.21.0"
+		"eslint": "^8.44.0"
 	}
 }

package/src/functions/houses.cpp

@@ -16,7 +16,6 @@ Napi::Value sweph_houses(const Napi::CallbackInfo& info) {
 	double cusps [37];
 	double points [10];
 	char sys = info[3].As<Napi::String>().Utf8Value()[0];
-	int g = sys == 'G' ? 37 : 13;
 	int flag = swe_houses(
 		info[0].As<Napi::Number>().DoubleValue(),
 		info[1].As<Napi::Number>().DoubleValue(),
@@ -25,6 +24,7 @@ Napi::Value sweph_houses(const Napi::CallbackInfo& info) {
 		cusps,
 		points
 	);
+	int g = sys == 'G' && flag == OK ? 37 : 13;
 	Napi::Object data = Napi::Object::New(env);
 	data["houses"] = sweph_js_array_converter(&cusps[1], g-1, env);
 	data["points"] = sweph_js_array_converter(points, 8, env);

package/src/functions/houses_ex.cpp

@@ -17,7 +17,6 @@ Napi::Value sweph_houses_ex(const Napi::CallbackInfo& info) {
 	double cusps [37];
 	double points [10];
 	char sys = info[4].As<Napi::String>().Utf8Value()[0];
-	int g = sys == 'G' ? 37 : 13;
 	int flag = swe_houses_ex(
 		info[0].As<Napi::Number>().DoubleValue(),
 		info[1].As<Napi::Number>().Int32Value(),
@@ -27,6 +26,7 @@ Napi::Value sweph_houses_ex(const Napi::CallbackInfo& info) {
 		cusps,
 		points
 	);
+	int g = sys == 'G' && flag == OK ? 37 : 13;
 	Napi::Object data = Napi::Object::New(env);
 	data["houses"] = sweph_js_array_converter(&cusps[1], g-1, env);
 	data["points"] = sweph_js_array_converter(points, 8, env);

package/src/functions/houses_ex2.cpp

@@ -20,7 +20,6 @@ Napi::Value sweph_houses_ex2(const Napi::CallbackInfo& info) {
 	double pspeed [10];
 	char serr [AS_MAXCH] = "";
 	char sys = info[4].As<Napi::String>().Utf8Value()[0];
-	int g = sys == 'G' ? 37 : 13;
 	int flag = swe_houses_ex2(
 		info[0].As<Napi::Number>().DoubleValue(),
 		info[1].As<Napi::Number>().Int32Value(),
@@ -33,6 +32,7 @@ Napi::Value sweph_houses_ex2(const Napi::CallbackInfo& info) {
 		pspeed,
 		serr
 	);
+	int g = sys == 'G' && flag == OK ? 37 : 13;
 	Napi::Object data = Napi::Object::New(env);
 	data["houses"] = sweph_js_array_converter(&cusps[1], g-1, env);
 	data["points"] = sweph_js_array_converter(points, 8, env);

package/src/sweph.cpp

@@ -106,7 +106,7 @@ bool sweph_is_type(int type, Napi::Value data) {
 
 bool sweph_type_check(const std::pair<int, const char*> types[], const Napi::CallbackInfo& info) {
 	Napi::Env env = info.Env();
-	if(info.Length() < types[0].first) {
+	if((int)info.Length() < types[0].first) {
 		Napi::TypeError::New(env, types[0].second).ThrowAsJavaScriptException();
 		return false;
 	}

package/.github/FUNDING.yml

@@ -1,5 +0,0 @@
-# These are supported funding model platforms
-
-github: timotejroiko
-patreon: timotejroiko
-custom: https://paypal.me/timotejroiko

package/deps/swisseph.gyp

@@ -1,43 +0,0 @@
-{
-	"targets": [
-		{
-			"target_name": "swisseph",
-			"type": "static_library",
-			"direct_dependent_settings": {
-				"include_dirs": [
-					"swisseph"
-				]
-			},
-			"sources": [
-				"swisseph/swecl.c",
-				"swisseph/swedate.c",
-				"swisseph/swehel.c",
-				"swisseph/swehouse.c",
-				"swisseph/swejpl.c",
-				"swisseph/swemmoon.c",
-				"swisseph/swemplan.c",
-				"swisseph/sweph.c",
-				"swisseph/swephlib.c"
-			],
-			"cflags": [
-				"-flto",
-				"-Ofast",
-				"-pipe"
-			],
-			"cflags_cc": [
-				"-flto",
-				"-Ofast",
-				"-pipe"
-			],
-			"msvs_settings": {
-				"VCCLCompilerTool": {
-					"AdditionalOptions": [
-						"/O2",
-						"/GL",
-						"/Gw"
-					]
-				}
-			}
-		}
-	]
-}