Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Timer Service updates #1024

Merged
merged 2 commits into from
Apr 25, 2024
Merged

Timer Service updates #1024

merged 2 commits into from
Apr 25, 2024

Conversation

dckc
Copy link
Member

@dckc dckc commented Mar 21, 2024

@dckc dckc requested a review from Chris-Hibbert March 21, 2024 22:41
@dckc dckc mentioned this pull request Mar 21, 2024
Copy link
Contributor

mergify bot commented Mar 21, 2024

⚠️ The sha of the head commit of this PR conflicts with #1022. Mergify cannot evaluate rules on this PR. ⚠️

@Chris-Hibbert
Copy link
Collaborator

The preview is not yet generating, but when this was part of #1022, I could see that there were gaps in the doc this is generated from. I'd like to fill in some of that. How did you build this? What do I have to do to correct the source material? Is this generated purely from types.d.ts?

@dckc
Copy link
Member Author

dckc commented Mar 22, 2024

Is this generated purely from types.d.ts?

Yes.

Copy link
Contributor

mergify bot commented Mar 22, 2024

⚠️ The sha of the head commit of this PR conflicts with #1022. Mergify cannot evaluate rules on this PR. ⚠️

1 similar comment
Copy link
Contributor

mergify bot commented Mar 22, 2024

⚠️ The sha of the head commit of this PR conflicts with #1022. Mergify cannot evaluate rules on this PR. ⚠️

@dckc dckc force-pushed the dc-price-authority branch from f78b8b6 to d5e8189 Compare March 22, 2024 22:33
Base automatically changed from dc-price-authority to main March 22, 2024 22:34
Copy link

cloudflare-workers-and-pages bot commented Mar 22, 2024

Deploying documentation with  Cloudflare Pages  Cloudflare Pages

Latest commit: 3785ca8
Status: ✅  Deploy successful!
Preview URL: https://c512e635.documentation-7tp.pages.dev
Branch Preview URL: https://dc-timer-ref.documentation-7tp.pages.dev

View logs

@dckc
Copy link
Member Author

dckc commented Mar 22, 2024

for reference...

... How did you build this? ...

with yarn typedoc in agoric-sdk, using a markdown plugin:

~/projects/agoric-sdk$ yarn add -W -D typedoc typedoc-plugin-markdown
diff --git a/typedoc.json b/typedoc.json
index 685abaab4..061bccfaa 100644
--- a/typedoc.json
+++ b/typedoc.json
@@ -7,6 +7,7 @@
   ],
   "name": "API documentation of Agoric SDK ",
   "entryPointStrategy": "packages",
+  "plugin": ["typedoc-plugin-markdown"],
   "out": "api-docs",
   "includeVersion": true,
   "logLevel": "Verbose"
~/projects/agoric-sdk$ yarn typedoc
...

~/projects/agoric-sdk$ tar cf ~/time.tar api-docs/modules/agoric_time.md api-docs/interfaces/agoric_time.*

then in this repo:

~/projects/documentation/main tar xf ~/time.tar

@Chris-Hibbert
Copy link
Collaborator

for reference...

Ahh. Thanks. I didn't know about specifying plugins in typedoc.json, but I was able to get a .html version so I could see what was generated. I hope there isn't a huge difference.

@dckc dckc enabled auto-merge (rebase) March 29, 2024 23:20
@dckc dckc requested review from LuqiPan and turadg March 29, 2024 23:21
@dckc
Copy link
Member Author

dckc commented Apr 3, 2024

@LuqiPan can you tell why https://docs.agoric.com/reference/agoric-sdk/modules/agoric_time is missing TimerService etc?

This PR should be largely obsolete as of #1038 , but the above page is missing a lot of stuff that this PR produces: https://dc-timer-ref.documentation-7tp.pages.dev/api-docs/modules/agoric_time.html

@dckc dckc marked this pull request as draft April 3, 2024 17:36
auto-merge was automatically disabled April 3, 2024 17:36

Pull request was converted to draft

@LuqiPan
Copy link
Contributor

LuqiPan commented Apr 3, 2024

These are the relevant logs for time package when building on CF:

21:25:31.883	[info] Converting project at ./packages/time
21:25:31.883	[debug] Using TypeScript 5.5.0-dev.20240327 from ./node_modules/typescript/lib
21:25:31.883	[debug] Expanded ./packages/time/src/timeMath.js to:
21:25:31.883		./packages/time/src/timeMath.js
21:25:31.883	[debug] Expanded ./packages/time/src/types.js to:
21:25:31.884		./packages/time/src/types.js
21:25:32.319	[debug] Converting with 1 programs 2 entry points
21:25:32.488	[debug] Finished getting entry points in 605ms
21:25:32.488	[debug] Begin readme.md/package.json search at ./packages/time
21:25:32.490	[debug] Finished conversion in 1ms
21:25:32.490	[warning] TimeMathType, defined in ./packages/time/src/types.d.ts, is referenced by timeMath.TimeMath but not included in the documentation.
21:25:32.490	[debug] Validation took 0ms

These are the logs when building on agoric-sdk/master:

[info] Converting project at ./packages/time
[debug] Using TypeScript 5.5.0-dev.20240327 from ./node_modules/typescript/lib
[debug] Expanded ./packages/time/src/timeMath.js to:
	./packages/time/src/timeMath.js
[debug] Expanded ./packages/time/src/types.js to:
	./packages/time/src/types.js
[debug] Converting with 1 programs 2 entry points
[debug] Finished getting entry points in 336ms
[debug] Begin readme.md/package.json search at ./packages/time
[debug] Finished conversion in 2ms
[warning] TimeMathType, defined in ./packages/time/src/types.d.ts, is referenced by timeMath.TimeMath but not included in the documentation.
[debug] Validation took 0ms

Looks pretty similar. Is TypeScript 5.5.0 affecting things?

@LuqiPan
Copy link
Contributor

LuqiPan commented Apr 3, 2024

TypeScript 5.4.3 still yielded similar results:

[info] Converting project at ./packages/time
[debug] Using TypeScript 5.4.3 from ./node_modules/typescript/lib
[debug] Expanded ./packages/time/src/timeMath.js to:
	./packages/time/src/timeMath.js
[debug] Expanded ./packages/time/src/types.js to:
	./packages/time/src/types.js
[debug] Converting with 1 programs 2 entry points
[debug] Finished getting entry points in 264ms
[debug] Begin readme.md/package.json search at ./packages/time
[debug] Finished conversion in 1ms
[warning] TimeMathType, defined in ./packages/time/src/types.d.ts, is referenced by timeMath.TimeMath but not included in the documentation.
[debug] Validation took 0ms

@dckc did you remember roughly with what git hash you built the .md files in this PR?

@dckc
Copy link
Member Author

dckc commented Apr 3, 2024

@dckc did you remember roughly with what git hash you built the .md files in this PR?

I think I used
Agoric/agoric-sdk@b4c1e63

based on notes in Agoric/agoric-sdk#9131

It's strange... the "Defined in" links to to, for example, https://github.com/Agoric/agoric-sdk/blob/b78dc2aa5/packages/time/src/types.d.ts#L174

but that's 404. as is Agoric/agoric-sdk@b78dc2aa5

I don't seem to have that one locally either.

Copy link

Cloudflare deployment logs are available here

@dckc dckc marked this pull request as ready for review April 24, 2024 21:46
@dckc
Copy link
Member Author

dckc commented Apr 24, 2024

PTAL.

@dckc dckc merged commit 49672f9 into main Apr 25, 2024
4 checks passed
@dckc dckc deleted the dc-timer-ref branch April 25, 2024 03:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Timer device docs - 4daydapp
3 participants