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.

Sign up for GitHub

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

Jump to bottom

feat(cli): add tsx support #1021

Merged
merged 2 commits into from
Aug 31, 2024
Merged

feat(cli): add tsx support #1021

merged 2 commits into from
Aug 31, 2024

Conversation

remidewitte
Copy link
Contributor

Happy to see Shinigami92 taking care of this tool ! Thanks.

The PR is far for complete but it is a minimal working patch to use tsx instead of ts-node.

It might not be wanted but it makes the -j ts argument not required.

@Shinigami92 Shinigami92 added the c: feature Request for new feature label Mar 7, 2024
@Shinigami92 Shinigami92 modified the milestones: v7.0, v7.x Mar 7, 2024
@Shinigami92 Shinigami92 added the p: 1-normal Nothing urgent label Mar 7, 2024
@Shinigami92
Copy link
Collaborator

It is indeed planned to support tsx 😃
But I would also like to allow ts-node as well

However, you should implement it in that way, that tsx takes preference over ts-node

Please note that I'm currently mostly in the migration process of adding coverage tests. Also I want to migrate the cli to a TypeScript file that is also covered by unit-tests (which is not right now ⚠️)

@Shinigami92 Shinigami92 changed the title Use tsx instead of ts-node feat(cli): add tsx support Mar 7, 2024
@Shinigami92 Shinigami92 mentioned this pull request Mar 8, 2024
Open
@Shinigami92 Shinigami92 added the needs rebase There is a merge conflict label Apr 5, 2024
@Shinigami92
Copy link
Collaborator

Hey @remidewitte
I refactored the bin/node-pg-migrate.ts file a bit and it is now checked with TypeScript.
Please rebase your work and try to keep ts-node alongside tsx.

@remidewitte
Copy link
Contributor Author

Hey @remidewitte I refactored the bin/node-pg-migrate.ts file a bit and it is now checked with TypeScript. Please rebase your work and try to keep ts-node alongside tsx.

I just realized I missed your reply. I will have a look soon.

@Shinigami92
Copy link
Collaborator

@remidewitte do you want to develop this further? Or should I try on my own?

@github-actions GitHub Actions
Copy link

github-actions bot commented Aug 28, 2024 •
edited
Loading

Coverage Report

Status Category Percentage Covered / Total
🟢 Lines 92.03% (🎯 90%)
🟰 ±0%		 3164 / 3438
🟢 Statements 92.03% (🎯 90%)
🟰 ±0%		 3164 / 3438
🟢 Functions 95.84% (🎯 90%)
🟰 ±0%		 254 / 265
🟢 Branches 90.03% (🎯 85%)
🟰 ±0%		 813 / 903
File Coverage
File Stmts % Branch % Funcs % Lines Uncovered Lines
Unchanged Files
src/db.ts 84.29% 89.28% 87.5% 84.29% 75-77, 107, 110-119, 121-122, 162-164
src/index.ts 100% 100% 100% 100%
src/migration.ts 69.48% 78.57% 61.53% 69.48% 64, 67-69, 71-83, 112-118, 123-127, 130, 132-136, 138-145, 148, 151-156, 158-159, 216-217, 243-245, 253-254, 271-274, 303-304
src/migrationBuilder.ts 95.43% 92.85% 88.88% 95.43% 354-358, 497-499, 501-502, 526-527
src/runner.ts 75.69% 61.4% 90% 75.69% 42, 70-71, 80-81, 130-131, 173-176, 185-189, 202, 206-207, 209-211, 213-219, 238, 240-246, 249, 262, 274, 276-282, 284-287, 290-293, 303-304, 313-315, 324, 326, 328-335
src/sqlMigration.ts 90% 100% 80% 90% 45-46, 48-49
src/types.ts 100% 100% 100% 100%
src/operations/sql.ts 100% 100% 100% 100%
src/operations/casts/createCast.ts 100% 100% 100% 100%
src/operations/casts/dropCast.ts 100% 100% 100% 100%
src/operations/casts/index.ts 100% 100% 100% 100%
src/operations/domains/alterDomain.ts 100% 100% 100% 100%
src/operations/domains/createDomain.ts 100% 100% 100% 100%
src/operations/domains/dropDomain.ts 100% 100% 100% 100%
src/operations/domains/index.ts 100% 100% 100% 100%
src/operations/domains/renameDomain.ts 100% 100% 100% 100%
src/operations/domains/shared.ts 100% 100% 100% 100%
src/operations/extensions/createExtension.ts 100% 100% 100% 100%
src/operations/extensions/dropExtension.ts 100% 100% 100% 100%
src/operations/extensions/index.ts 100% 100% 100% 100%
src/operations/extensions/shared.ts 100% 100% 100% 100%
src/operations/functions/createFunction.ts 95.58% 94.44% 100% 95.58% 71-73
src/operations/functions/dropFunction.ts 100% 100% 100% 100%
src/operations/functions/index.ts 100% 100% 100% 100%
src/operations/functions/renameFunction.ts 100% 100% 100% 100%
src/operations/functions/shared.ts 100% 100% 100% 100%
src/operations/grants/grantOnSchemas.ts 100% 100% 100% 100%
src/operations/grants/grantOnTables.ts 100% 100% 100% 100%
src/operations/grants/grantRoles.ts 100% 100% 100% 100%
src/operations/grants/index.ts 100% 100% 100% 100%
src/operations/grants/revokeOnSchemas.ts 100% 100% 100% 100%
src/operations/grants/revokeOnTables.ts 100% 100% 100% 100%
src/operations/grants/revokeRoles.ts 100% 100% 100% 100%
src/operations/grants/shared.ts 95.65% 85.71% 100% 95.65% 71
src/operations/indexes/createIndex.ts 96.29% 95.23% 100% 96.29% 74-75
src/operations/indexes/dropIndex.ts 100% 100% 100% 100%
src/operations/indexes/index.ts 100% 100% 100% 100%
src/operations/indexes/shared.ts 88% 86.95% 100% 88% 22, 32-35, 47
src/operations/materializedViews/alterMaterializedView.ts 100% 100% 100% 100%
src/operations/materializedViews/createMaterializedView.ts 100% 100% 100% 100%
src/operations/materializedViews/dropMaterializedView.ts 100% 100% 100% 100%
src/operations/materializedViews/index.ts 100% 100% 100% 100%
src/operations/materializedViews/refreshMaterializedView.ts 100% 100% 100% 100%
src/operations/materializedViews/renameMaterializedView.ts 100% 100% 100% 100%
src/operations/materializedViews/renameMaterializedViewColumn.ts 100% 100% 100% 100%
src/operations/materializedViews/shared.ts 100% 87.5% 100% 100%
src/operations/operators/addToOperatorFamily.ts 100% 100% 100% 100%
src/operations/operators/createOperator.ts 100% 100% 100% 100%
src/operations/operators/createOperatorClass.ts 100% 83.33% 100% 100%
src/operations/operators/createOperatorFamily.ts 100% 100% 100% 100%
src/operations/operators/dropOperator.ts 100% 100% 100% 100%
src/operations/operators/dropOperatorClass.ts 100% 100% 100% 100%
src/operations/operators/dropOperatorFamily.ts 100% 100% 100% 100%
src/operations/operators/index.ts 100% 100% 100% 100%
src/operations/operators/removeFromOperatorFamily.ts 100% 100% 100% 100%
src/operations/operators/renameOperatorClass.ts 100% 100% 100% 100%
src/operations/operators/renameOperatorFamily.ts 100% 100% 100% 100%
src/operations/operators/shared.ts 85.71% 75% 100% 85.71% 24-25, 38
src/operations/policies/alterPolicy.ts 100% 100% 100% 100%
src/operations/policies/createPolicy.ts 100% 100% 100% 100%
src/operations/policies/dropPolicy.ts 100% 100% 100% 100%
src/operations/policies/index.ts 100% 100% 100% 100%
src/operations/policies/renamePolicy.ts 100% 100% 100% 100%
src/operations/policies/shared.ts 100% 100% 100% 100%
src/operations/roles/alterRole.ts 100% 100% 100% 100%
src/operations/roles/createRole.ts 100% 75% 100% 100%
src/operations/roles/dropRole.ts 100% 100% 100% 100%
src/operations/roles/index.ts 100% 100% 100% 100%
src/operations/roles/renameRole.ts 100% 100% 100% 100%
src/operations/roles/shared.ts 98.07% 76.92% 100% 98.07% 78
src/operations/schemas/createSchema.ts 100% 100% 100% 100%
src/operations/schemas/dropSchema.ts 100% 100% 100% 100%
src/operations/schemas/index.ts 100% 100% 100% 100%
src/operations/schemas/renameSchema.ts 100% 100% 100% 100%
src/operations/sequences/alterSequence.ts 94.11% 75% 100% 94.11% 23
src/operations/sequences/createSequence.ts 100% 100% 100% 100%
src/operations/sequences/dropSequence.ts 100% 100% 100% 100%
src/operations/sequences/index.ts 100% 100% 100% 100%
src/operations/sequences/renameSequence.ts 100% 100% 100% 100%
src/operations/sequences/shared.ts 78.57% 68.75% 100% 78.57% 41, 43-44, 49-50, 63-64, 69-70
src/operations/tables/addColumns.ts 100% 80% 100% 100%
src/operations/tables/addConstraint.ts 100% 100% 100% 100%
src/operations/tables/alterColumn.ts 88.57% 76.47% 100% 88.57% 75, 82-85, 87-89
src/operations/tables/alterTable.ts 100% 100% 100% 100%
src/operations/tables/createTable.ts 86.2% 66.66% 100% 86.2% 44-48, 65, 75-76
src/operations/tables/dropColumns.ts 100% 100% 100% 100%
src/operations/tables/dropConstraint.ts 100% 100% 100% 100%
src/operations/tables/dropTable.ts 100% 100% 100% 100%
src/operations/tables/index.ts 100% 100% 100% 100%
src/operations/tables/renameColumn.ts 100% 100% 100% 100%
src/operations/tables/renameConstraint.ts 100% 100% 100% 100%
src/operations/tables/renameTable.ts 100% 100% 100% 100%
src/operations/tables/shared.ts 82.31% 78.46% 80% 82.31% 137-138, 141-142, 195-199, 224, 228-229, 248-249, 274-275, 278-285, 288-289, 426-431, 433-436, 438-448, 450-451
src/operations/triggers/createTrigger.ts 86.41% 68.18% 100% 86.41% 53-54, 66-67, 70-71, 74-77, 113
src/operations/triggers/dropTrigger.ts 100% 100% 100% 100%
src/operations/triggers/index.ts 100% 100% 100% 100%
src/operations/triggers/renameTrigger.ts 100% 100% 100% 100%
src/operations/triggers/shared.ts 100% 100% 100% 100%
src/operations/types/addTypeAttribute.ts 100% 100% 100% 100%
src/operations/types/addTypeValue.ts 100% 100% 100% 100%
src/operations/types/createType.ts 100% 100% 100% 100%
src/operations/types/dropType.ts 100% 100% 100% 100%
src/operations/types/dropTypeAttribute.ts 100% 100% 100% 100%
src/operations/types/index.ts 100% 100% 100% 100%
src/operations/types/renameType.ts 100% 100% 100% 100%
src/operations/types/renameTypeAttribute.ts 100% 100% 100% 100%
src/operations/types/renameTypeValue.ts 100% 100% 100% 100%
src/operations/types/setTypeAttribute.ts 100% 100% 100% 100%
src/operations/views/alterView.ts 100% 100% 100% 100%
src/operations/views/alterViewColumn.ts 100% 100% 100% 100%
src/operations/views/createView.ts 100% 100% 100% 100%
src/operations/views/dropView.ts 100% 100% 100% 100%
src/operations/views/index.ts 100% 100% 100% 100%
src/operations/views/renameView.ts 100% 100% 100% 100%
src/operations/views/shared.ts 100% 66.66% 100% 100%
src/utils/PgLiteral.ts 88.88% 100% 75% 88.88% 37-38
src/utils/StringIdGenerator.ts 100% 100% 100% 100%
src/utils/createSchemalize.ts 100% 100% 100% 100%
src/utils/createTransformer.ts 100% 100% 100% 100%
src/utils/decamelize.ts 100% 100% 100% 100%
src/utils/escapeValue.ts 100% 100% 100% 100%
src/utils/formatLines.ts 100% 100% 100% 100%
src/utils/formatParams.ts 100% 100% 100% 100%
src/utils/getMigrationTableSchema.ts 100% 100% 100% 100%
src/utils/getSchemas.ts 100% 100% 100% 100%
src/utils/identity.ts 100% 100% 100% 100%
src/utils/index.ts 100% 100% 100% 100%
src/utils/intersection.ts 100% 100% 100% 100%
src/utils/makeComment.ts 100% 100% 100% 100%
src/utils/quote.ts 100% 100% 100% 100%
src/utils/toArray.ts 100% 100% 100% 100%
src/utils/types.ts 100% 100% 100% 100%
Generated in workflow #1115

@Shinigami92 Shinigami92 force-pushed the patch-1 branch 2 times, most recently from 6a4d0c0 to f33952c Compare August 28, 2024 18:30
@Shinigami92 Shinigami92 marked this pull request as draft August 28, 2024 18:30
@Shinigami92 Shinigami92 removed the needs rebase There is a merge conflict label Aug 28, 2024
@Shinigami92 Shinigami92 force-pushed the patch-1 branch 2 times, most recently from e8625a5 to 6b3c046 Compare August 28, 2024 20:57
@Shinigami92 Shinigami92 marked this pull request as ready for review August 28, 2024 20:59
@Shinigami92
Copy link
Collaborator

@remidewitte please have a look if this suites your needs

@osdiab please do a review 😸

osdiab
osdiab previously approved these changes Aug 29, 2024
View reviewed changes
Copy link
Collaborator

@osdiab osdiab left a comment

Choose a reason for hiding this comment

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

makes sense!

package.json Show resolved Hide resolved
remidewitte
remidewitte commented Aug 29, 2024
View reviewed changes
Copy link
Contributor Author

@remidewitte remidewitte left a comment

Choose a reason for hiding this comment

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

Thanks for taking this.

bin/node-pg-migrate.ts Show resolved Hide resolved
bin/node-pg-migrate.ts Show resolved Hide resolved
bin/node-pg-migrate.ts Show resolved Hide resolved
@remidewitte remidewitte removed their assignment Aug 29, 2024
@Shinigami92 Shinigami92 marked this pull request as draft August 29, 2024 16:33
@Shinigami92 Shinigami92 marked this pull request as ready for review August 31, 2024 09:03
@Shinigami92 Shinigami92 merged commit c1513e5 into salsita:main Aug 31, 2024
34 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@osdiab osdiab osdiab left review comments

@Shinigami92 Shinigami92 Awaiting requested review from Shinigami92 Shinigami92 is a code owner

Assignees

@remidewitte remidewitte

@Shinigami92 Shinigami92

Labels
c: feature Request for new feature p: 1-normal Nothing urgent
Projects
None yet
Milestone
v7.x
Development

Successfully merging this pull request may close these issues.
3 participants
@remidewitte @Shinigami92 @osdiab