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

Move changes to main #131

Merged
merged 8 commits into from
Mar 11, 2025
Merged

Move changes to main #131

merged 8 commits into from
Mar 11, 2025

Conversation

becky-gilbert
Copy link
Contributor

@becky-gilbert becky-gilbert commented Jan 30, 2025

This PR moves recent changes on the develop branch into main:

Copy link

changeset-bot bot commented Jan 30, 2025

🦋 Changeset detected

Latest commit: 9f9647a

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 2 packages
Name Type
@lookit/record Patch
@lookit/lookit-initjspsych Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

* add jspsych as dependency for lookit-initjspsych
* extend TrialDescription type from jsPsych to create ChsTrialDescription type and replace Timeline type
* extend JsPsychPlugin to include chsData and use that type in dependent types/interfaces (trial description, timeline description, timeline array)
* modify UndefinedTrialType error to return element instead of index (because of recursive search in timeline)
* add new UndefinedTimelineError for other timeline array/node cases
* remove nth function (used for returning timeline array index in error, no longer used)
* add TestPlugin class for testing
* ignore TestPlugin in test coverage
* add import mapping for jspsych src files for Jest tests
* recursively search the jspsych timeline for objects with a type key for processing, import the TimelineArray type from jspsych src, custom CHS types and additional error
* update and add tests
* invoke rollup log handler to log anything other than the circular dependencies in data package
* update package-lock
* extend jsPsych interface to overwrite argument types in jsPsych.run
* use extended jsPsych interface to fix types in jspsych.run, add type assertions
* use ChsJsPsych and ChsTimelineArray types in tests
* remove unknown type assertions
* mark type imports with import type
* Fixed TS errors in spec file
---------
Co-authored-by: CJ Green <[email protected]>
@becky-gilbert becky-gilbert self-assigned this Feb 28, 2025
@becky-gilbert becky-gilbert marked this pull request as ready for review February 28, 2025 18:09
@becky-gilbert
Copy link
Contributor Author

@okaycj @mekline I would like to publish these jsPsych changes and then add the corresponding version updates to the lookit-api when we do that release. Is that ok?

@mekline
Copy link

mekline commented Mar 11, 2025

Just catching up - fine to release this whenever you're ready!!!

@becky-gilbert becky-gilbert merged commit 153a3d3 into main Mar 11, 2025
2 checks passed
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.

3 participants