Skip to content
This repository has been archived by the owner on Feb 22, 2023. It is now read-only.

Move all the types to /types directory #1997

Merged
merged 1 commit into from
Dec 6, 2022
Merged

Move all the types to /types directory #1997

merged 1 commit into from
Dec 6, 2022

Conversation

obulat
Copy link
Contributor

@obulat obulat commented Nov 20, 2022

Fixes

Fixes #1161 by @sarayourfriend

Description

This PR moves all the type declarations from /models to /types.

There are several arrays in the /types now that are not really types, and they are used to create types like typeof something[number]. Would it make sense to extract them to models so that when you can safely use import type {something} when you import something from /types? Or is it better to keep related items in the same file, even if they are type and non-type values (as is here)?

Testing Instructions

The CI should pass.

Checklist

  • My pull request has a descriptive title (not a vague title like Update index.md).
  • My pull request targets the default branch of the repository (main) or a parent feature branch.
  • My commit messages follow best practices.
  • My code follows the established code style of the repository.
  • I added or updated tests for the changes I made (if applicable).
  • I added or updated documentation (if applicable).
  • I tried running the project locally and verified that there are no visible errors.

Developer Certificate of Origin

Developer Certificate of Origin
Developer Certificate of Origin
Version 1.1

Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
1 Letterman Drive
Suite D4700
San Francisco, CA, 94129

Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.


Developer's Certificate of Origin 1.1

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
    have the right to submit it under the open source license
    indicated in the file; or

(b) The contribution is based upon previous work that, to the best
    of my knowledge, is covered under an appropriate open source
    license and I have the right under that license to submit that
    work with modifications, whether created in whole or in part
    by me, under the same open source license (unless I am
    permitted to submit under a different license), as indicated
    in the file; or

(c) The contribution was provided directly to me by some other
    person who certified (a), (b) or (c) and I have not modified
    it.

(d) I understand and agree that this project and the contribution
    are public and that a record of the contribution (including all
    personal information I submit with it, including my sign-off) is
    maintained indefinitely and may be redistributed consistent with
    this project or the open source license(s) involved.

@obulat obulat requested a review from a team as a code owner November 20, 2022 05:39
@obulat obulat requested review from zackkrida and dhruvkb November 20, 2022 05:39
@github-actions
Copy link

github-actions bot commented Nov 20, 2022

Storybook and Tailwind configuration previews: Ready

Storybook: https://wordpress.github.io/openverse-frontend/_preview/1997
Tailwind: https://wordpress.github.io/openverse-frontend/_preview/1997/tailwind

Please note that GitHub pages takes a little time to deploy newly pushed code, if the links above don't work or you see old versions, wait 5 minutes and try again.

You can check the GitHub pages deployment action list to see the current status of the deployments.

@openverse-bot openverse-bot added 🟩 priority: low Low priority and doesn't need to be rushed 🤖 aspect: dx Concerns developers' experience with the codebase 🧰 goal: internal improvement Improvement that benefits maintainers, not users labels Nov 20, 2022
@github-actions
Copy link

Size Change: -533 B (0%)

Total Size: 823 kB

Filename Size Change
./.nuxt/dist/client/232.js 0 B -272 B (removed) 🏆
./.nuxt/dist/client/232.modern.js 0 B -277 B (removed) 🏆
./.nuxt/dist/client/233.js 0 B -1.85 kB (removed) 🏆
./.nuxt/dist/client/app.js 130 kB -251 B (0%)
./.nuxt/dist/client/app.modern.js 121 kB -246 B (0%)
./.nuxt/dist/client/runtime.js 2.69 kB -16 B (-1%)
./.nuxt/dist/client/runtime.modern.js 2.69 kB -17 B (-1%)
./.nuxt/dist/client/230.js 272 B +272 B (new file) 🆕
./.nuxt/dist/client/230.modern.js 277 B +277 B (new file) 🆕
./.nuxt/dist/client/231.js 1.85 kB +1.85 kB (new file) 🆕
ℹ️ View Unchanged
Filename Size Change
./.nuxt/dist/client/commons/app.js 88.3 kB 0 B
./.nuxt/dist/client/commons/app.modern.js 77.1 kB 0 B
./.nuxt/dist/client/components/loading-icon.js 746 B 0 B
./.nuxt/dist/client/components/loading-icon.modern.js 750 B 0 B
./.nuxt/dist/client/components/table-sort-icon.js 509 B 0 B
./.nuxt/dist/client/components/table-sort-icon.modern.js 513 B 0 B
./.nuxt/dist/client/components/v-all-results-grid.js 5.14 kB 0 B
./.nuxt/dist/client/components/v-all-results-grid.modern.js 5.01 kB 0 B
./.nuxt/dist/client/components/v-audio-cell.js 357 B 0 B
./.nuxt/dist/client/components/v-audio-cell.modern.js 360 B 0 B
./.nuxt/dist/client/components/v-audio-details.js 1.81 kB 0 B
./.nuxt/dist/client/components/v-audio-details.modern.js 1.79 kB +1 B (0%)
./.nuxt/dist/client/components/v-audio-track-skeleton.js 1.01 kB 0 B
./.nuxt/dist/client/components/v-audio-track-skeleton.modern.js 1.01 kB 0 B
./.nuxt/dist/client/components/v-audio-track.js 5.13 kB +2 B (0%)
./.nuxt/dist/client/components/v-audio-track.modern.js 5.07 kB +3 B (0%)
./.nuxt/dist/client/components/v-back-to-search-results-link.js 537 B 0 B
./.nuxt/dist/client/components/v-back-to-search-results-link.modern.js 542 B 0 B
./.nuxt/dist/client/components/v-bone.js 684 B 0 B
./.nuxt/dist/client/components/v-bone.modern.js 689 B 0 B
./.nuxt/dist/client/components/v-box-layout.js 1.2 kB -1 B (0%)
./.nuxt/dist/client/components/v-box-layout.modern.js 1.2 kB 0 B
./.nuxt/dist/client/components/v-content-link.js 1.11 kB 0 B
./.nuxt/dist/client/components/v-content-link.modern.js 1.09 kB 0 B
./.nuxt/dist/client/components/v-content-page.js 467 B 0 B
./.nuxt/dist/client/components/v-content-page.modern.js 471 B 0 B
./.nuxt/dist/client/components/v-content-report-button.js 778 B 0 B
./.nuxt/dist/client/components/v-content-report-button.modern.js 782 B 0 B
./.nuxt/dist/client/components/v-content-report-form.js 3.75 kB 0 B
./.nuxt/dist/client/components/v-content-report-form.modern.js 3.56 kB 0 B
./.nuxt/dist/client/components/v-content-report-popover.js 4.41 kB 0 B
./.nuxt/dist/client/components/v-content-report-popover.modern.js 4.22 kB 0 B
./.nuxt/dist/client/components/v-copy-button.js 3.99 kB 0 B
./.nuxt/dist/client/components/v-copy-button.modern.js 4 kB 0 B
./.nuxt/dist/client/components/v-copy-license.js 999 B 0 B
./.nuxt/dist/client/components/v-copy-license.modern.js 1 kB 0 B
./.nuxt/dist/client/components/v-copy-license/components/v-error-image/components/v-media-reuse/components/v-search-grid/09090664.js 9.5 kB 0 B
./.nuxt/dist/client/components/v-copy-license/components/v-error-image/components/v-media-reuse/components/v-search-grid/09090664.modern.js 9.47 kB 0 B
./.nuxt/dist/client/components/v-dmca-notice.js 747 B 0 B
./.nuxt/dist/client/components/v-dmca-notice.modern.js 754 B 0 B
./.nuxt/dist/client/components/v-error-image.js 1.69 kB 0 B
./.nuxt/dist/client/components/v-error-image.modern.js 1.68 kB 0 B
./.nuxt/dist/client/components/v-error-section.js 372 B 0 B
./.nuxt/dist/client/components/v-error-section.modern.js 376 B 0 B
./.nuxt/dist/client/components/v-external-search-form.js 3.09 kB 0 B
./.nuxt/dist/client/components/v-external-search-form.modern.js 3.06 kB 0 B
./.nuxt/dist/client/components/v-external-source-list.js 2.54 kB 0 B
./.nuxt/dist/client/components/v-external-source-list.modern.js 2.52 kB 0 B
./.nuxt/dist/client/components/v-full-layout.js 1.49 kB 0 B
./.nuxt/dist/client/components/v-full-layout.modern.js 1.49 kB +1 B (0%)
./.nuxt/dist/client/components/v-grid-skeleton.js 1.61 kB 0 B
./.nuxt/dist/client/components/v-grid-skeleton.modern.js 1.61 kB 0 B
./.nuxt/dist/client/components/v-image-cell-square.js 1.02 kB 0 B
./.nuxt/dist/client/components/v-image-cell-square.modern.js 1.02 kB 0 B
./.nuxt/dist/client/components/v-image-cell.js 1.43 kB 0 B
./.nuxt/dist/client/components/v-image-cell.modern.js 1.42 kB 0 B
./.nuxt/dist/client/components/v-image-details.js 1.44 kB 0 B
./.nuxt/dist/client/components/v-image-details.modern.js 1.44 kB 0 B
./.nuxt/dist/client/components/v-image-grid.js 2.54 kB -1 B (0%)
./.nuxt/dist/client/components/v-image-grid.modern.js 2.41 kB -1 B (0%)
./.nuxt/dist/client/components/v-license-tab-panel.js 521 B 0 B
./.nuxt/dist/client/components/v-license-tab-panel.modern.js 525 B 0 B
./.nuxt/dist/client/components/v-load-more.js 790 B 0 B
./.nuxt/dist/client/components/v-load-more.modern.js 682 B 0 B
./.nuxt/dist/client/components/v-media-license.js 800 B 0 B
./.nuxt/dist/client/components/v-media-license.modern.js 808 B 0 B
./.nuxt/dist/client/components/v-media-reuse.js 1.62 kB 0 B
./.nuxt/dist/client/components/v-media-reuse.modern.js 1.61 kB 0 B
./.nuxt/dist/client/components/v-media-tag.js 430 B 0 B
./.nuxt/dist/client/components/v-media-tag.modern.js 434 B 0 B
./.nuxt/dist/client/components/v-no-results.js 2.75 kB 0 B
./.nuxt/dist/client/components/v-no-results.modern.js 2.72 kB 0 B
./.nuxt/dist/client/components/v-radio.js 1.51 kB 0 B
./.nuxt/dist/client/components/v-radio.modern.js 1.47 kB 0 B
./.nuxt/dist/client/components/v-related-audio.js 1.23 kB 0 B
./.nuxt/dist/client/components/v-related-audio.modern.js 1.23 kB 0 B
./.nuxt/dist/client/components/v-related-images.js 3.1 kB 0 B
./.nuxt/dist/client/components/v-related-images.modern.js 2.98 kB 0 B
./.nuxt/dist/client/components/v-report-desc-form.js 966 B 0 B
./.nuxt/dist/client/components/v-report-desc-form.modern.js 963 B 0 B
./.nuxt/dist/client/components/v-row-layout.js 1.7 kB 0 B
./.nuxt/dist/client/components/v-row-layout.modern.js 1.71 kB 0 B
./.nuxt/dist/client/components/v-scroll-button.js 812 B 0 B
./.nuxt/dist/client/components/v-scroll-button.modern.js 819 B 0 B
./.nuxt/dist/client/components/v-search-grid.js 5.43 kB 0 B
./.nuxt/dist/client/components/v-search-grid.modern.js 5.38 kB 0 B
./.nuxt/dist/client/components/v-search-results-title.js 658 B 0 B
./.nuxt/dist/client/components/v-search-results-title.modern.js 653 B 0 B
./.nuxt/dist/client/components/v-search-type-radio.js 794 B 0 B
./.nuxt/dist/client/components/v-search-type-radio.modern.js 771 B 0 B
./.nuxt/dist/client/components/v-server-timeout.js 299 B 0 B
./.nuxt/dist/client/components/v-server-timeout.modern.js 303 B 0 B
./.nuxt/dist/client/components/v-sidebar-target.js 318 B 0 B
./.nuxt/dist/client/components/v-sidebar-target.modern.js 321 B 0 B
./.nuxt/dist/client/components/v-sketch-fab-viewer.js 996 B 0 B
./.nuxt/dist/client/components/v-sketch-fab-viewer.modern.js 895 B 0 B
./.nuxt/dist/client/components/v-skip-to-content-container.js 887 B 0 B
./.nuxt/dist/client/components/v-skip-to-content-container.modern.js 894 B 0 B
./.nuxt/dist/client/components/v-snackbar.js 1.18 kB 0 B
./.nuxt/dist/client/components/v-snackbar.modern.js 1.19 kB 0 B
./.nuxt/dist/client/components/v-sources-table.js 15.8 kB 0 B
./.nuxt/dist/client/components/v-sources-table.modern.js 15.8 kB +1 B (0%)
./.nuxt/dist/client/components/v-warning-suppressor.js 298 B 0 B
./.nuxt/dist/client/components/v-warning-suppressor.modern.js 303 B 0 B
./.nuxt/dist/client/pages/about.js 1.14 kB -5 B (0%)
./.nuxt/dist/client/pages/about.modern.js 1.14 kB -1 B (0%)
./.nuxt/dist/client/pages/audio/_id.js 4.9 kB -1 B (0%)
./.nuxt/dist/client/pages/audio/_id.modern.js 4.72 kB -1 B (0%)
./.nuxt/dist/client/pages/external-sources.js 1.52 kB 0 B
./.nuxt/dist/client/pages/external-sources.modern.js 1.53 kB 0 B
./.nuxt/dist/client/pages/feedback.js 1.31 kB 0 B
./.nuxt/dist/client/pages/feedback.modern.js 1.31 kB +1 B (0%)
./.nuxt/dist/client/pages/image/_id.js 5.3 kB -1 B (0%)
./.nuxt/dist/client/pages/image/_id.modern.js 7.25 kB -1 B (0%)
./.nuxt/dist/client/pages/index.js 5.03 kB -2 B (0%)
./.nuxt/dist/client/pages/index.modern.js 4.93 kB 0 B
./.nuxt/dist/client/pages/preferences.js 1.22 kB 0 B
./.nuxt/dist/client/pages/preferences.modern.js 1.2 kB +1 B (0%)
./.nuxt/dist/client/pages/search-help.js 1.62 kB 0 B
./.nuxt/dist/client/pages/search-help.modern.js 1.61 kB 0 B
./.nuxt/dist/client/pages/search.js 2.72 kB +2 B (0%)
./.nuxt/dist/client/pages/search.modern.js 2.57 kB +1 B (0%)
./.nuxt/dist/client/pages/search/audio.js 3.81 kB 0 B
./.nuxt/dist/client/pages/search/audio.modern.js 3.7 kB +1 B (0%)
./.nuxt/dist/client/pages/search/image.js 2.85 kB -1 B (0%)
./.nuxt/dist/client/pages/search/image.modern.js 2.73 kB 0 B
./.nuxt/dist/client/pages/search/index.js 542 B 0 B
./.nuxt/dist/client/pages/search/index.modern.js 548 B +1 B (0%)
./.nuxt/dist/client/pages/search/model-3d.js 243 B -1 B (0%)
./.nuxt/dist/client/pages/search/model-3d.modern.js 246 B 0 B
./.nuxt/dist/client/pages/search/search-page.types.js 266 B +1 B (0%)
./.nuxt/dist/client/pages/search/search-page.types.modern.js 271 B 0 B
./.nuxt/dist/client/pages/search/video.js 240 B 0 B
./.nuxt/dist/client/pages/search/video.modern.js 243 B 0 B
./.nuxt/dist/client/pages/sources.js 1.52 kB -1 B (0%)
./.nuxt/dist/client/pages/sources.modern.js 1.51 kB 0 B
./.nuxt/dist/client/vendors/app.js 62.2 kB 0 B
./.nuxt/dist/client/vendors/app.modern.js 61.9 kB 0 B

compressed-size-action

@sarayourfriend
Copy link
Contributor

There are several arrays in the /types now that are not really types, and they are used to create types like typeof something[number]. Would it make sense to extract them to models so that when you can safely use import type {something} when you import something from /types? Or is it better to keep related items in the same file, even if they are type and non-type values (as is here)?

My sense of this is to complicate this issue too much. If a type is derived directly from a constant, have it exported from wherever the constant is exported. They're likely used in tandem. Whether they're in types or constants or elsewhere, as long as it is consistent it probably wouldn't cause that much of a headache.

I've also wondered and asked if we'd be able to get rid of a lot of those typeof x[number] style type definitions and remove the usage of const SOMETHING = 'something' style constant definitions. It would simplify this problem as well. It could add some complexity in the "find and replace" refactors if one of those constants, though I'm a little sceptical that that is that big an issue. If you search the application for 'something' as a singular quoted string flag you're not likely to run into false-positives unless the thing is named something very vague or has a collision with another type 🤔

@obulat
Copy link
Contributor Author

obulat commented Nov 22, 2022

We need the constants to use in Vue prop validators: validate: (val)=> sizes.includes(val). Since the validators work at runtime, they cannot use types, right?

@sarayourfriend
Copy link
Contributor

@obulat I think a while ago we'd discussed doing away with validators when we have TS-ified every usage and prop-site of those particular instances. But you're right, we would need them when we don't have TS (is much left of that, though?)

I wish I could find where we discussed this, I think it was in a PR several months ago...

@obulat
Copy link
Contributor Author

obulat commented Nov 24, 2022

@obulat I think a while ago we'd discussed doing away with validators when we have TS-ified every usage and prop-site of those particular instances. But you're right, we would need them when we don't have TS (is much left of that, though?)

I wish I could find where we discussed this, I think it was in a PR several months ago...

We have decided to do away with validators, but then we've had problems with the peaks values for Audio being invalid, and debugging was easier because we had runtime validators: #1148 .

The way I understand it now, for values that come from the API, having validators that run at runtime is still important.

For other values, just using TS without unnecessary type assertions (not using as Type when not necessary, using type guards or something else safe instead) should be a better solution.

@sarayourfriend
Copy link
Contributor

I see, that makes sense! I wonder if running expectations validations on the data as it comes back from the API rather than in the components is another option then, so that you're not having to keep track of what is API data and what isn't when you're writing components. Even the peak normalisation that is happening in the PR you linked, it seems like something that is more suited to the API response transformations that we already maintain rather than munging that should happen in the components themselves 🤔

That way we can do away with validators but still have expectations proven/enforced against the data coming back from the API... though, I don't wonder if in our case, given we control both, we'd be better off auditing the frontend expectations and making sure they match the APIs...

I don't know, no concrete suggestions here, just thinking out loud 🙂 Thanks for reminding me about the occasional benefits of the validators.

@openverse-bot
Copy link
Contributor

Based on the low urgency of this PR, the following reviewers are being gently reminded to review this PR:

@zackkrida
@dhruvkb
This reminder is being automatically generated due to the urgency configuration.

Excluding weekend1 days, this PR was updated 5 day(s) ago. PRs labelled with low urgency are expected to be reviewed within 5 weekday(s)2.

@obulat, if this PR is not ready for a review, please draft it to prevent reviewers from getting further unnecessary pings.

Footnotes

  1. Specifically, Saturday and Sunday.

  2. For the purpose of these reminders we treat Monday - Friday as weekdays. Please note that the that generates these reminders runs at midnight UTC on Monday - Friday. This means that depending on your timezone, you may be pinged outside of the expected range.

Copy link
Member

@dhruvkb dhruvkb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice! Having types split between types/ and models/ was not nice.

@obulat obulat merged commit 751e671 into main Dec 6, 2022
@obulat obulat deleted the move_models_to_types branch December 6, 2022 15:51
github-actions bot pushed a commit that referenced this pull request Dec 6, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
🤖 aspect: dx Concerns developers' experience with the codebase 🧰 goal: internal improvement Improvement that benefits maintainers, not users 🟩 priority: low Low priority and doesn't need to be rushed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Create a ~/types directory to store shared types and move types out of ~/models into the new directory
5 participants