ballistics-engine 0.36.3 → 0.39.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/LICENSE-APACHE ADDED
@@ -0,0 +1,201 @@
1
+ Apache License
2
+ Version 2.0, January 2004
3
+ http://www.apache.org/licenses/
4
+
5
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6
+
7
+ 1. Definitions.
8
+
9
+ "License" shall mean the terms and conditions for use, reproduction,
10
+ and distribution as defined by Sections 1 through 9 of this document.
11
+
12
+ "Licensor" shall mean the copyright owner or entity authorized by
13
+ the copyright owner that is granting the License.
14
+
15
+ "Legal Entity" shall mean the union of the acting entity and all
16
+ other entities that control, are controlled by, or are under common
17
+ control with that entity. For the purposes of this definition,
18
+ "control" means (i) the power, direct or indirect, to cause the
19
+ direction or management of such entity, whether by contract or
20
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
21
+ outstanding shares, or (iii) beneficial ownership of such entity.
22
+
23
+ "You" (or "Your") shall mean an individual or Legal Entity
24
+ exercising permissions granted by this License.
25
+
26
+ "Source" form shall mean the preferred form for making modifications,
27
+ including but not limited to software source code, documentation
28
+ source, and configuration files.
29
+
30
+ "Object" form shall mean any form resulting from mechanical
31
+ transformation or translation of a Source form, including but
32
+ not limited to compiled object code, generated documentation,
33
+ and conversions to other media types.
34
+
35
+ "Work" shall mean the work of authorship, whether in Source or
36
+ Object form, made available under the License, as indicated by a
37
+ copyright notice that is included in or attached to the work
38
+ (an example is provided in the Appendix below).
39
+
40
+ "Derivative Works" shall mean any work, whether in Source or Object
41
+ form, that is based on (or derived from) the Work and for which the
42
+ editorial revisions, annotations, elaborations, or other modifications
43
+ represent, as a whole, an original work of authorship. For the purposes
44
+ of this License, Derivative Works shall not include works that remain
45
+ separable from, or merely link (or bind by name) to the interfaces of,
46
+ the Work and Derivative Works thereof.
47
+
48
+ "Contribution" shall mean any work of authorship, including
49
+ the original version of the Work and any modifications or additions
50
+ to that Work or Derivative Works thereof, that is intentionally
51
+ submitted to Licensor for inclusion in the Work by the copyright owner
52
+ or by an individual or Legal Entity authorized to submit on behalf of
53
+ the copyright owner. For the purposes of this definition, "submitted"
54
+ means any form of electronic, verbal, or written communication sent
55
+ to the Licensor or its representatives, including but not limited to
56
+ communication on electronic mailing lists, source code control systems,
57
+ and issue tracking systems that are managed by, or on behalf of, the
58
+ Licensor for the purpose of discussing and improving the Work, but
59
+ excluding communication that is conspicuously marked or otherwise
60
+ designated in writing by the copyright owner as "Not a Contribution."
61
+
62
+ "Contributor" shall mean Licensor and any individual or Legal Entity
63
+ on behalf of whom a Contribution has been received by Licensor and
64
+ subsequently incorporated within the Work.
65
+
66
+ 2. Grant of Copyright License. Subject to the terms and conditions of
67
+ this License, each Contributor hereby grants to You a perpetual,
68
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69
+ copyright license to reproduce, prepare Derivative Works of,
70
+ publicly display, publicly perform, sublicense, and distribute the
71
+ Work and such Derivative Works in Source or Object form.
72
+
73
+ 3. Grant of Patent License. Subject to the terms and conditions of
74
+ this License, each Contributor hereby grants to You a perpetual,
75
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76
+ (except as stated in this section) patent license to make, have made,
77
+ use, offer to sell, sell, import, and otherwise transfer the Work,
78
+ where such license applies only to those patent claims licensable
79
+ by such Contributor that are necessarily infringed by their
80
+ Contribution(s) alone or by combination of their Contribution(s)
81
+ with the Work to which such Contribution(s) was submitted. If You
82
+ institute patent litigation against any entity (including a
83
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
84
+ or a Contribution incorporated within the Work constitutes direct
85
+ or contributory patent infringement, then any patent licenses
86
+ granted to You under this License for that Work shall terminate
87
+ as of the date such litigation is filed.
88
+
89
+ 4. Redistribution. You may reproduce and distribute copies of the
90
+ Work or Derivative Works thereof in any medium, with or without
91
+ modifications, and in Source or Object form, provided that You
92
+ meet the following conditions:
93
+
94
+ (a) You must give any other recipients of the Work or
95
+ Derivative Works a copy of this License; and
96
+
97
+ (b) You must cause any modified files to carry prominent notices
98
+ stating that You changed the files; and
99
+
100
+ (c) You must retain, in the Source form of any Derivative Works
101
+ that You distribute, all copyright, patent, trademark, and
102
+ attribution notices from the Source form of the Work,
103
+ excluding those notices that do not pertain to any part of
104
+ the Derivative Works; and
105
+
106
+ (d) If the Work includes a "NOTICE" text file as part of its
107
+ distribution, then any Derivative Works that You distribute must
108
+ include a readable copy of the attribution notices contained
109
+ within such NOTICE file, excluding those notices that do not
110
+ pertain to any part of the Derivative Works, in at least one
111
+ of the following places: within a NOTICE text file distributed
112
+ as part of the Derivative Works; within the Source form or
113
+ documentation, if provided along with the Derivative Works; or,
114
+ within a display generated by the Derivative Works, if and
115
+ wherever such third-party notices normally appear. The contents
116
+ of the NOTICE file are for informational purposes only and
117
+ do not modify the License. You may add Your own attribution
118
+ notices within Derivative Works that You distribute, alongside
119
+ or as an addendum to the NOTICE text from the Work, provided
120
+ that such additional attribution notices cannot be construed
121
+ as modifying the License.
122
+
123
+ You may add Your own copyright statement to Your modifications and
124
+ may provide additional or different license terms and conditions
125
+ for use, reproduction, or distribution of Your modifications, or
126
+ for any such Derivative Works as a whole, provided Your use,
127
+ reproduction, and distribution of the Work otherwise complies with
128
+ the conditions stated in this License.
129
+
130
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
131
+ any Contribution intentionally submitted for inclusion in the Work
132
+ by You to the Licensor shall be under the terms and conditions of
133
+ this License, without any additional terms or conditions.
134
+ Notwithstanding the above, nothing herein shall supersede or modify
135
+ the terms of any separate license agreement you may have executed
136
+ with Licensor regarding such Contributions.
137
+
138
+ 6. Trademarks. This License does not grant permission to use the trade
139
+ names, trademarks, service marks, or product names of the Licensor,
140
+ except as required for reasonable and customary use in describing the
141
+ origin of the Work and reproducing the content of the NOTICE file.
142
+
143
+ 7. Disclaimer of Warranty. Unless required by applicable law or
144
+ agreed to in writing, Licensor provides the Work (and each
145
+ Contributor provides its Contributions) on an "AS IS" BASIS,
146
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147
+ implied, including, without limitation, any warranties or conditions
148
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149
+ PARTICULAR PURPOSE. You are solely responsible for determining the
150
+ appropriateness of using or redistributing the Work and assume any
151
+ risks associated with Your exercise of permissions under this License.
152
+
153
+ 8. Limitation of Liability. In no event and under no legal theory,
154
+ whether in tort (including negligence), contract, or otherwise,
155
+ unless required by applicable law (such as deliberate and grossly
156
+ negligent acts) or agreed to in writing, shall any Contributor be
157
+ liable to You for damages, including any direct, indirect, special,
158
+ incidental, or consequential damages of any character arising as a
159
+ result of this License or out of the use or inability to use the
160
+ Work (including but not limited to damages for loss of goodwill,
161
+ work stoppage, computer failure or malfunction, or any and all
162
+ other commercial damages or losses), even if such Contributor
163
+ has been advised of the possibility of such damages.
164
+
165
+ 9. Accepting Warranty or Additional Liability. While redistributing
166
+ the Work or Derivative Works thereof, You may choose to offer,
167
+ and charge a fee for, acceptance of support, warranty, indemnity,
168
+ or other liability obligations and/or rights consistent with this
169
+ License. However, in accepting such obligations, You may act only
170
+ on Your own behalf and on Your sole responsibility, not on behalf
171
+ of any other Contributor, and only if You agree to indemnify,
172
+ defend, and hold each Contributor harmless for any liability
173
+ incurred by, or claims asserted against, such Contributor by reason
174
+ of your accepting any such warranty or additional liability.
175
+
176
+ END OF TERMS AND CONDITIONS
177
+
178
+ APPENDIX: How to apply the Apache License to your work.
179
+
180
+ To apply the Apache License to your work, attach the following
181
+ boilerplate notice, with the fields enclosed by brackets "[]"
182
+ replaced with your own identifying information. (Don't include
183
+ the brackets!) The text should be enclosed in the appropriate
184
+ comment syntax for the file format. We also recommend that a
185
+ file or class name and description of purpose be included on the
186
+ same "printed page" as the copyright notice for easier
187
+ identification within third-party archives.
188
+
189
+ Copyright 2025 Alex Jokela
190
+
191
+ Licensed under the Apache License, Version 2.0 (the "License");
192
+ you may not use this file except in compliance with the License.
193
+ You may obtain a copy of the License at
194
+
195
+ http://www.apache.org/licenses/LICENSE-2.0
196
+
197
+ Unless required by applicable law or agreed to in writing, software
198
+ distributed under the License is distributed on an "AS IS" BASIS,
199
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200
+ See the License for the specific language governing permissions and
201
+ limitations under the License.
package/README.md CHANGED
@@ -16,7 +16,7 @@ A high-performance ballistics trajectory calculation engine with comprehensive p
16
16
  - **Drops Reference: LOS vs Target Plane** - Reference sampled drops to the line of sight (default, unchanged) or to the vertical target plane on steep inclined shots (`trajectory --drops-reference target`: drop ÷ cos(shooting angle), JBM's "target plane" checkbox; sampled table/CSV column relabeled `Drop (target)`/`drop_target_in`; solve-json `shot.drops_reference`) — see [CLI_USAGE.md](CLI_USAGE.md#drops-reference-los-vs-target-plane---drops-reference--mba-1403)
17
17
  - **Scope Tracking Correction Factors** - Compensate turrets that don't track their nominal click value: derive `CF = actual/dialed` from a tall-target test (`tall-target` subcommand, pure arithmetic), then `--elevation-cf`/`--windage-cf` (or validated saved-profile fields) DIVIDE every dial-unit output once at the shared conversion boundary — come-ups, range/compare/wind cards, mover lead/Ring, PDF dope card, zero MOA/mrad — never raw inches (an under-tracking scope, CF < 1, needs more dial); `true-velocity` multiplies dialed observations by the CF (scope-dial to true angular) so scope error is not baked into trued MV/BC — see [CLI_USAGE.md](CLI_USAGE.md#scope-tracking-correction-factors---elevation-cf---windage-cf-tall-target--mba-1358)
18
18
  - **Equivalent Horizontal Range (BDC shoot-to)** - Inclined zeroed shots print the flat range whose angular correction against the same zero matches the inclined solution (SIG AMR / Leica EHR / Gunwerks style, angular-match inversion over one flat re-solve — not the rifleman's-rule cosine), so fixed BDC turrets/reticles can dial as if flat (`trajectory` summary line; solve-json `summary.equivalent_horizontal_range_m`; public `TrajectorySolver::equivalent_horizontal_range`) — see [CLI_USAGE.md](CLI_USAGE.md#equivalent-horizontal-range-bdc-shoot-to--mba-1395)
19
- - **Reticle Hold Points** - Place a firing solution where you actually read it: a point in your own reticle, FFP/SFP aware with second-focal-plane subtensions rescaled for the magnification in use (`reticle hold`, native + browser terminal + a new appended C ABI export; `reticle generate mil-grid|tree|bdc` builds descriptions in one shared serde schema that saved profiles, `--reticle-json` and solve-json's optional `reticle` block all speak). Horus/TREMOR grid layouts, wind-dot calibration and any vendor catalog are deliberately excluded — see [CLI_USAGE.md](CLI_USAGE.md#reticle-hold-points-reticle--mba-1361)
19
+ - **Reticle Hold Points** - Place a firing solution where you actually read it: a point in your own reticle, FFP/SFP aware with second-focal-plane subtensions rescaled for the magnification in use (`reticle hold`, native + browser terminal + a new appended C ABI export; `reticle generate mil-grid|tree|bdc` builds descriptions in one shared serde schema that saved profiles, `--reticle-json` and solve-json's optional `reticle` block all speak; `reticle import` converts a third-party Ventum spec into that schema and names on stderr every element it could not represent as a hold — arcs included, with each horseshoe's apex and tips resolved for you rather than invented as marks). Horus/TREMOR grid layouts, wind-dot calibration and any vendor catalog are deliberately excluded — see [CLI_USAGE.md](CLI_USAGE.md#reticle-hold-points-reticle--mba-1361)
20
20
  - **Reticle/BDC Inverse Solvers** - Three read-only solvers over an existing load, sharing one drop-vs-range root find: `mark-to-range` maps each reticle subtension to the range where it lands (Nightforce / Nikon Spot On / Swarovski / TRACT), reporting marks the load cannot reach rather than dropping them; `bdc-match` fits the magnification that makes an SFP BDC reticle match the load (Zeiss Rapid-Z; closed-form least squares, with a residual warning when nothing fits); `optimal-zero` min-max searches the one zero that minimizes the largest hold a whole target list needs and reports whether a dead-center hold keeps each inside its vital zone (GeoBallistics HDZ). CLI-only this train — see [CLI_USAGE.md](CLI_USAGE.md#reticlebdc-inverse-solvers--mba-1362)
21
21
  - **Robust Hold Corridors** - Solve a bounded set of NAMED segmented-wind scenarios at once (`hold-corridor --scenarios set.json --ranges 200,400,600 [--target rect:WxH|circle:D]`) and get, at every range, each scenario's hold, the min/max corridor they span, the minimax (Chebyshev-center) hold, the worst-case miss from it, and whether one hold keeps every scenario inside the target — with a versioned `RobustHoldReportV1` JSON form. Caps (≤8 scenarios, ≤64 ranges) and malformed segments are structured errors raised *before* any solving, and reordering scenarios cannot change the answer. No probabilities are assigned anywhere: the corridor is the span of the hypotheses you supplied, not a confidence interval — see [CLI_USAGE.md](CLI_USAGE.md#robust-hold-corridors-hold-corridor--mba-1349)
22
22
  - **Moving-Target Lead** - Wind-aware hold tables for targets moving at a constant speed/angle, with iterative intercept-range correction for non-perpendicular motion (`lead` subcommand; public `ballistics_engine::calculate_lead` API) — see [CLI_USAGE.md](CLI_USAGE.md#moving-target-lead)
@@ -662,34 +662,38 @@ These bindings depend on the `ballistics-engine` crate published on [crates.io](
662
662
 
663
663
  ### WASM / npm Package
664
664
 
665
- The engine also compiles to WebAssembly (`src/wasm.rs`, `wasm-bindgen`) and already powers
666
- [ballistics.sh](https://ballistics.sh) and [ballistics.rs](https://ballistics.rs) in the browser.
667
- It is not yet published to npm for third-party use — `scripts/build-npm.sh` builds and prepares a
668
- publish-ready package; publishing itself is a manual step (see below).
665
+ The engine also compiles to WebAssembly (`src/wasm.rs`, `wasm-bindgen`), powers
666
+ [ballistics.sh](https://ballistics.sh) and [ballistics.rs](https://ballistics.rs) in the browser,
667
+ and is published to npm as
668
+ [**`ballistics-engine`**](https://www.npmjs.com/package/ballistics-engine).
669
669
 
670
670
  ```bash
671
- scripts/build-npm.sh
671
+ npm install ballistics-engine
672
672
  ```
673
673
 
674
- This builds two `wasm-bindgen` targets, both with `--no-default-features` (the default
675
- `pdf`/`online` features pull in `printpdf`/`ureq`+`ring`, which do not compile for
676
- `wasm32-unknown-unknown`) plus
677
- `--features wasm-terminal` (the browser terminal's command set — see
678
- [Trimming the WASM module](#trimming-the-wasm-module)):
679
-
680
- - **`pkg/`** `--target bundler`, the package meant for `npm publish`. Consumed via a native
681
- `.wasm` ES import by bundlers that understand it (webpack with `experiments.asyncWebAssembly`,
682
- Vite, Rollup + `@rollup/plugin-wasm`, Parcel).
683
- - **`pkg-web/`** `--target web`, a no-bundler build for direct `<script type="module">` browser
684
- use or manual Node usage without a bundler — the same `--target` already used to build
685
- ballistics.sh/ballistics.rs's WASM. Documented and built for completeness; not published under
686
- the primary package name in this initial pass.
687
-
688
- `wasm-pack` has no built-in dual-target/"publish both" mode, and stitching bundler- and web-target
689
- output into one package.json via manual `exports` conditions isn't something `wasm-pack` generates
690
- or tests for you — see the comment header of `scripts/build-npm.sh` for the full reasoning. A
691
- single bundler-target package as the published npm artifact, with the web build documented
692
- separately, is the ecosystem-standard shape for `wasm-bindgen` crates on npm.
674
+ The published package is the `wasm-pack --target web` build: the entry point is an ES module with
675
+ an explicit async `init()`, which is the same artifact ballistics.sh loads. It is built with
676
+ `--no-default-features` (the default `pdf`/`online` features pull in `printpdf`/`ureq`+`ring`,
677
+ which do not compile for `wasm32-unknown-unknown`) plus `--features wasm-terminal` the browser
678
+ terminal's command set, see [Trimming the WASM module](#trimming-the-wasm-module).
679
+
680
+ Publishing is automated: `.github/workflows/publish-npm.yml` runs on every `v*` tag and publishes
681
+ with npm trusted publishing (OIDC), so there is no npm token anywhere in this repository and every
682
+ release carries a provenance attestation. `scripts/release/npm-package.sh` builds and verifies the
683
+ exact directory that gets published, and is worth running by hand to inspect a release:
684
+
685
+ ```bash
686
+ scripts/release/npm-package.sh 0.36.3 /tmp/npm-0.36.3
687
+ npm pack --dry-run /tmp/npm-0.36.3 # lists the tarball contents, publishes nothing
688
+ ```
689
+
690
+ `scripts/build-npm.sh` is a separate, exploratory script that builds **both** `wasm-bindgen`
691
+ targets side by side `pkg/` (`--target bundler`, for webpack with
692
+ `experiments.asyncWebAssembly`, Vite, Rollup + `@rollup/plugin-wasm`, Parcel) and `pkg-web/`
693
+ (`--target web`). Only the web build is published under the `ballistics-engine` name; `wasm-pack`
694
+ has no dual-target/"publish both" mode, and the two targets' module wiring differs enough that
695
+ they cannot be stitched into one package via `exports` conditions without hand-written glue
696
+ `wasm-pack` neither generates nor tests.
693
697
 
694
698
  ### Trimming the WASM module
695
699
 
@@ -788,25 +792,18 @@ Two things are *not* separable, because they are not separate to begin with:
788
792
  decision-support) are native-CLI-only — they were never wired into the WASM dispatch, and
789
793
  dead-code elimination already keeps them out of the module. There is nothing to remove.
790
794
 
791
- The script also post-processes each `package.json` (name, description, license, repository,
792
- keywords, and the `files` list including an `LICENSE-APACHE` entry `wasm-pack` itself omits even
793
- though it copies the file) and installs `README-npm.md` as the package's `README.md`.
794
-
795
- **Before publishing**, edit `pkg/package.json`'s `"name"` it ships as the placeholder
796
- `"@SCOPE/ballistics-engine"`. Replace `SCOPE` with the maintainer's real npm org/user scope (a
797
- scope decision, plus an npm account with publish rights to it, are both needed and don't exist yet
798
- as of this writing). Then:
799
-
800
- ```bash
801
- scripts/build-npm.sh
802
- cd pkg
803
- npm pack --dry-run # sanity-check the tarball contents first
804
- npm publish --access public
805
- ```
806
-
807
- (`--access public` is required the first time a scoped package is published, since scoped packages
808
- default to private on free npm accounts; `pkg/package.json` also sets `publishConfig.access` to
809
- `public` so a plain `npm publish` works too.)
795
+ Both packaging scripts post-process the generated `package.json` through
796
+ `scripts/build-npm-postprocess.mjs` (name, description, license, repository, keywords, and the
797
+ `files` list including a `LICENSE-APACHE` entry `wasm-pack` omits even though it copies the file,
798
+ so the dual-licensed crate would otherwise ship only half its licence text). `build-npm.sh`
799
+ additionally installs `README-npm.md` as its packages' `README.md`; the published package keeps the
800
+ crate's own `README.md`, which is what `wasm-pack` copies.
801
+
802
+ Publishing is not a manual step. `.github/workflows/publish-npm.yml` builds and publishes on a
803
+ `v*` tag using npm trusted publishing; see `scripts/release/RELEASE.md` ("The npm channel") for the
804
+ one-time npmjs.com setup, what breaks the trust relationship, and how to re-run a tag whose publish
805
+ failed. Ten versions between 0.25.0 and 0.36.3 are missing from npm because the channel was hand-run
806
+ at the time; they are not backfillable and are documented as staying missing.
810
807
 
811
808
  ## FFI Layer
812
809
 
Binary file
package/package.json CHANGED
@@ -4,17 +4,18 @@
4
4
  "collaborators": [
5
5
  "Alex Jokela <email@tinycomputers.io>"
6
6
  ],
7
- "description": "High-performance ballistics trajectory engine with professional physics",
8
- "version": "0.36.3",
7
+ "description": "High-performance ballistics trajectory engine with professional physics (WASM build)",
8
+ "version": "0.39.0",
9
9
  "license": "MIT OR Apache-2.0",
10
10
  "repository": {
11
11
  "type": "git",
12
- "url": "https://github.com/ajokela/ballistics-engine"
12
+ "url": "git+https://github.com/ajokela/ballistics-engine.git"
13
13
  },
14
14
  "files": [
15
15
  "ballistics_engine_bg.wasm",
16
16
  "ballistics_engine.js",
17
- "ballistics_engine.d.ts"
17
+ "ballistics_engine.d.ts",
18
+ "LICENSE-APACHE"
18
19
  ],
19
20
  "main": "ballistics_engine.js",
20
21
  "homepage": "https://ballistics.rs/",
@@ -26,6 +27,11 @@
26
27
  "ballistics",
27
28
  "trajectory",
28
29
  "physics",
29
- "simulation"
30
- ]
31
- }
30
+ "simulation",
31
+ "wasm",
32
+ "webassembly"
33
+ ],
34
+ "publishConfig": {
35
+ "access": "public"
36
+ }
37
+ }