Repository navigation
merge: 同步上游 origin/main（11 个提交） - #2
Merged
Merged
Conversation
Co-authored-by: xunguangzlj-cloud <xunguangzlj-cloud@users.noreply.github.com>
formToBirthInfo 的时辰支按经度校正后的真太阳时算，换日却只看钟表 23 点。东经 100° 钟表 23:30（真太阳时 22:10 亥时）会被排成次日亥时；东经 135° 钟表 22:30（真太阳时 23:30 晚子时）则留在本日。改为与 true-solar-time.ts 的 resolveZiweiDayOffset 同一套判定，并加回归测试。 Co-authored-by: Renhuai123 <Renhuai123@users.noreply.github.com>
Co-authored-by: Renhuai123 <Renhuai123@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Bumps [next](https://github.com/vercel/next.js) from 16.3.8 to 16.4.3. - [Release notes](https://github.com/vercel/next.js/releases) - [Commits](vercel/next.js@v16.3.8...v16.4.3) --- updated-dependencies: - dependency-name: next dependency-version: 16.4.3 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…nhuai123#56) Bumps [postcss-selector-parser](https://github.com/postcss/postcss-selector-parser) from 6.1.4 to 6.1.5. - [Release notes](https://github.com/postcss/postcss-selector-parser/releases) - [Changelog](https://github.com/postcss/postcss-selector-parser/blob/6.1.5/CHANGELOG.md) - [Commits](postcss/postcss-selector-parser@6.1.4...6.1.5) --- updated-dependencies: - dependency-name: postcss-selector-parser dependency-version: 6.1.5 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: sakura168899-debug <sakura168899-debug@users.noreply.github.com>
统一 BirthForm 到 lib/ziwei/share.ts 的 formToBirthInfo，并删掉组件内 重复的 calcTrueSolarBranch。 Co-authored-by: Renhuai123 <Renhuai123@users.noreply.github.com>
Co-authored-by: Renhuai123 <Renhuai123@users.noreply.github.com>
…123#53) Co-authored-by: Renhuai123 <Renhuai123@users.noreply.github.com>
四化挂在 Star.siHua 上，盘上没有叫「化禄 / 化权 / 化科」的星。府相朝垣「命宫见禄」、 阳梁昌禄与机月同梁「再会化科」、杀破狼「三方有化禄或化权」却用 hasStar / sanFangAllStars 按星名查，永远查不到，这几条加分项从未出现过（1990 年逐日午时 扫盘：杀破狼 61 盘、机月同梁 44 盘、阳梁昌禄 7 盘本该带上加分项）。 改为与同文件双禄朝垣、三奇加会一致的 siHua 判定；只影响加分项展示， 不改格局成立与否、不改等级、不改排盘结果。新增回归 patterns-sihua-bonus。 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Renhuai123 <Renhuai123@users.noreply.github.com>
…3#49) generateChart is callable from runtime JS/JSON APIs where the 'male' | 'female' union is not enforced. Any value other than 'male' was silently mapped to 女 and produced a complete chart labelled 阴女. Add a RangeError guard next to the existing hour validation, consistent with the existing input validation, and add a regression test covering invalid values and unchanged behavior for valid ones. Fixes Renhuai123#38 Co-authored-by: viwe-monai <viwe-monai@users.noreply.github.com>
上游主要修复（已合入）： - 晚子时换日按真太阳时判定，与时辰支同一口径（Renhuai123#37/Renhuai123#63） - 合盘按当前表单重建命盘 + SSE 保留不完整行（Renhuai123#52/Renhuai123#53） - 格局四化加分项按星曜 siHua 判定（Renhuai123#58） - 闰月归属 policy 非法值当场拒绝（Renhuai123#71） - 性别值校验、窄屏布局、依赖升级（next 16.4.3 等） 冲突处理： - lib/ziwei/patterns.ts：上游格局逻辑合入 patterns-core.ts（纯逻辑层）， patterns.ts 保留 server-only 薄再导出 - app/heming/page.tsx：保留 streamAiText 共享客户端，重新应用 Renhuai123#52 重建逻辑； SSE \r 剥离移植进 lib/ai/client.ts，两个 heming 回归测试适配新契约 - app/chart/page.tsx：保留 chart-workspace 响应式布局（已含窄屏堆叠） - package.json：npm test 合并上游 7 个新回归 + share-codec 全部 25 个回归测试 + typecheck 通过
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
同步上游修复（晚子时真太阳时口径 Renhuai123#37/Renhuai123#63、合盘重建+SSE缓冲 Renhuai123#52/Renhuai123#53、格局 siHua 判定 Renhuai123#58、闰月 policy 校验 Renhuai123#71 等），冲突按「上游引擎修正为准 + 保留分享/AI/Docker 改造」处理：
patterns.ts：上游格局逻辑并入patterns-core.ts，保留 server-only 薄再导出heming/page.tsx：保留streamAiText共享客户端，重新应用 fix(heming): rebuild charts from the current birth forms Renhuai123/ziwei-doushu#52；\r 剥离移植进lib/ai/client.tspackage.json：npm test = 上游 17 个回归 + share-codec，共 25 个全过 + typecheck 绿