From f13972b81410cb808bf8017628226dade432b041 Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Tue, 7 Oct 2025 00:37:01 -0400 Subject: [PATCH] update megalodon to the new templates --- packages/megalodon/jest.config.ts | 8 +++--- packages/megalodon/package.json | 11 +++++--- packages/megalodon/src/{ => lib}/axios.d.ts | 0 packages/megalodon/src/{ => lib}/cancel.ts | 0 packages/megalodon/src/{ => lib}/converter.ts | 0 packages/megalodon/src/{ => lib}/default.ts | 0 packages/megalodon/src/{ => lib}/detector.ts | 0 .../src/{ => lib}/entities/account.ts | 0 .../src/{ => lib}/entities/activity.ts | 0 .../src/{ => lib}/entities/announcement.ts | 0 .../src/{ => lib}/entities/application.ts | 0 .../{ => lib}/entities/async_attachment.ts | 0 .../src/{ => lib}/entities/attachment.ts | 0 .../megalodon/src/{ => lib}/entities/card.ts | 0 .../src/{ => lib}/entities/context.ts | 0 .../src/{ => lib}/entities/conversation.ts | 0 .../megalodon/src/{ => lib}/entities/emoji.ts | 0 .../src/{ => lib}/entities/featured_tag.ts | 0 .../megalodon/src/{ => lib}/entities/field.ts | 0 .../src/{ => lib}/entities/filter.ts | 0 .../src/{ => lib}/entities/follow_request.ts | 0 .../src/{ => lib}/entities/history.ts | 0 .../src/{ => lib}/entities/identity_proof.ts | 0 .../src/{ => lib}/entities/instance.ts | 0 .../megalodon/src/{ => lib}/entities/list.ts | 0 .../src/{ => lib}/entities/marker.ts | 0 .../src/{ => lib}/entities/mention.ts | 0 .../src/{ => lib}/entities/notification.ts | 0 .../megalodon/src/{ => lib}/entities/poll.ts | 0 .../src/{ => lib}/entities/poll_option.ts | 0 .../src/{ => lib}/entities/preferences.ts | 0 .../{ => lib}/entities/push_subscription.ts | 0 .../src/{ => lib}/entities/reaction.ts | 0 .../src/{ => lib}/entities/relationship.ts | 0 .../src/{ => lib}/entities/report.ts | 0 .../src/{ => lib}/entities/results.ts | 0 .../megalodon/src/{ => lib}/entities/role.ts | 0 .../{ => lib}/entities/scheduled_status.ts | 0 .../src/{ => lib}/entities/source.ts | 0 .../megalodon/src/{ => lib}/entities/stats.ts | 0 .../src/{ => lib}/entities/status.ts | 0 .../src/{ => lib}/entities/status_edit.ts | 0 .../src/{ => lib}/entities/status_params.ts | 0 .../src/{ => lib}/entities/status_source.ts | 0 .../megalodon/src/{ => lib}/entities/tag.ts | 0 .../megalodon/src/{ => lib}/entities/token.ts | 0 .../megalodon/src/{ => lib}/entities/urls.ts | 0 packages/megalodon/src/{ => lib}/entity.ts | 0 .../megalodon/src/{ => lib}/filter_context.ts | 0 packages/megalodon/src/{ => lib}/index.ts | 0 .../{ => lib}/mastodon/entities/account.ts | 0 .../{ => lib}/mastodon/entities/activity.ts | 0 .../mastodon/entities/announcement.ts | 0 .../mastodon/entities/application.ts | 0 .../mastodon/entities/async_attachment.ts | 0 .../{ => lib}/mastodon/entities/attachment.ts | 0 .../src/{ => lib}/mastodon/entities/card.ts | 0 .../{ => lib}/mastodon/entities/context.ts | 0 .../mastodon/entities/conversation.ts | 0 .../src/{ => lib}/mastodon/entities/emoji.ts | 0 .../mastodon/entities/featured_tag.ts | 0 .../src/{ => lib}/mastodon/entities/field.ts | 0 .../src/{ => lib}/mastodon/entities/filter.ts | 0 .../{ => lib}/mastodon/entities/history.ts | 0 .../mastodon/entities/identity_proof.ts | 0 .../{ => lib}/mastodon/entities/instance.ts | 0 .../src/{ => lib}/mastodon/entities/list.ts | 0 .../src/{ => lib}/mastodon/entities/marker.ts | 0 .../{ => lib}/mastodon/entities/mention.ts | 0 .../mastodon/entities/notification.ts | 0 .../src/{ => lib}/mastodon/entities/poll.ts | 0 .../mastodon/entities/poll_option.ts | 0 .../mastodon/entities/preferences.ts | 0 .../mastodon/entities/push_subscription.ts | 0 .../{ => lib}/mastodon/entities/reaction.ts | 0 .../mastodon/entities/relationship.ts | 0 .../src/{ => lib}/mastodon/entities/report.ts | 0 .../{ => lib}/mastodon/entities/results.ts | 0 .../src/{ => lib}/mastodon/entities/role.ts | 0 .../mastodon/entities/scheduled_status.ts | 0 .../src/{ => lib}/mastodon/entities/source.ts | 0 .../src/{ => lib}/mastodon/entities/stats.ts | 0 .../src/{ => lib}/mastodon/entities/status.ts | 0 .../mastodon/entities/status_params.ts | 0 .../mastodon/entities/status_source.ts | 0 .../src/{ => lib}/mastodon/entities/tag.ts | 0 .../src/{ => lib}/mastodon/entities/token.ts | 0 .../src/{ => lib}/mastodon/entities/urls.ts | 0 .../src/{ => lib}/mastodon/entity.ts | 0 .../src/{ => lib}/mastodon/notification.ts | 0 packages/megalodon/src/{ => lib}/megalodon.ts | 0 packages/megalodon/src/{ => lib}/misskey.ts | 5 ++-- .../src/{ => lib}/misskey/api_client.ts | 0 .../src/{ => lib}/misskey/entities/GetAll.ts | 0 .../misskey/entities/announcement.ts | 0 .../src/{ => lib}/misskey/entities/app.ts | 0 .../{ => lib}/misskey/entities/blocking.ts | 0 .../{ => lib}/misskey/entities/createdNote.ts | 0 .../src/{ => lib}/misskey/entities/emoji.ts | 0 .../{ => lib}/misskey/entities/favorite.ts | 0 .../src/{ => lib}/misskey/entities/field.ts | 0 .../src/{ => lib}/misskey/entities/file.ts | 0 .../misskey/entities/followRequest.ts | 0 .../{ => lib}/misskey/entities/follower.ts | 0 .../{ => lib}/misskey/entities/following.ts | 0 .../src/{ => lib}/misskey/entities/hashtag.ts | 0 .../src/{ => lib}/misskey/entities/list.ts | 0 .../src/{ => lib}/misskey/entities/meta.ts | 0 .../src/{ => lib}/misskey/entities/mute.ts | 0 .../src/{ => lib}/misskey/entities/note.ts | 0 .../misskey/entities/notification.ts | 0 .../src/{ => lib}/misskey/entities/poll.ts | 0 .../{ => lib}/misskey/entities/reaction.ts | 0 .../{ => lib}/misskey/entities/relation.ts | 0 .../src/{ => lib}/misskey/entities/session.ts | 0 .../src/{ => lib}/misskey/entities/stats.ts | 0 .../src/{ => lib}/misskey/entities/user.ts | 0 .../{ => lib}/misskey/entities/userDetail.ts | 0 .../src/{ => lib}/misskey/entities/userkey.ts | 0 .../megalodon/src/{ => lib}/misskey/entity.ts | 0 .../src/{ => lib}/misskey/notification.ts | 0 .../megalodon/src/{ => lib}/notification.ts | 0 packages/megalodon/src/{ => lib}/oauth.ts | 0 packages/megalodon/src/{ => lib}/parser.ts | 0 packages/megalodon/src/{ => lib}/response.ts | 0 packages/megalodon/src/lib/tsconfig.json | 11 ++++++++ .../test/integration/misskey.spec.ts | 10 ++++---- packages/megalodon/src/test/tsconfig.json | 14 +++++++++++ .../test/unit/misskey/api_client.spec.ts | 10 ++++---- .../{ => src}/test/unit/parser.spec.ts | 4 +-- packages/megalodon/tsconfig.json | 25 +++++-------------- packages/megalodon/tsconfig.scripts.json | 8 ++++++ 132 files changed, 64 insertions(+), 42 deletions(-) rename packages/megalodon/src/{ => lib}/axios.d.ts (100%) rename packages/megalodon/src/{ => lib}/cancel.ts (100%) rename packages/megalodon/src/{ => lib}/converter.ts (100%) rename packages/megalodon/src/{ => lib}/default.ts (100%) rename packages/megalodon/src/{ => lib}/detector.ts (100%) rename packages/megalodon/src/{ => lib}/entities/account.ts (100%) rename packages/megalodon/src/{ => lib}/entities/activity.ts (100%) rename packages/megalodon/src/{ => lib}/entities/announcement.ts (100%) rename packages/megalodon/src/{ => lib}/entities/application.ts (100%) rename packages/megalodon/src/{ => lib}/entities/async_attachment.ts (100%) rename packages/megalodon/src/{ => lib}/entities/attachment.ts (100%) rename packages/megalodon/src/{ => lib}/entities/card.ts (100%) rename packages/megalodon/src/{ => lib}/entities/context.ts (100%) rename packages/megalodon/src/{ => lib}/entities/conversation.ts (100%) rename packages/megalodon/src/{ => lib}/entities/emoji.ts (100%) rename packages/megalodon/src/{ => lib}/entities/featured_tag.ts (100%) rename packages/megalodon/src/{ => lib}/entities/field.ts (100%) rename packages/megalodon/src/{ => lib}/entities/filter.ts (100%) rename packages/megalodon/src/{ => lib}/entities/follow_request.ts (100%) rename packages/megalodon/src/{ => lib}/entities/history.ts (100%) rename packages/megalodon/src/{ => lib}/entities/identity_proof.ts (100%) rename packages/megalodon/src/{ => lib}/entities/instance.ts (100%) rename packages/megalodon/src/{ => lib}/entities/list.ts (100%) rename packages/megalodon/src/{ => lib}/entities/marker.ts (100%) rename packages/megalodon/src/{ => lib}/entities/mention.ts (100%) rename packages/megalodon/src/{ => lib}/entities/notification.ts (100%) rename packages/megalodon/src/{ => lib}/entities/poll.ts (100%) rename packages/megalodon/src/{ => lib}/entities/poll_option.ts (100%) rename packages/megalodon/src/{ => lib}/entities/preferences.ts (100%) rename packages/megalodon/src/{ => lib}/entities/push_subscription.ts (100%) rename packages/megalodon/src/{ => lib}/entities/reaction.ts (100%) rename packages/megalodon/src/{ => lib}/entities/relationship.ts (100%) rename packages/megalodon/src/{ => lib}/entities/report.ts (100%) rename packages/megalodon/src/{ => lib}/entities/results.ts (100%) rename packages/megalodon/src/{ => lib}/entities/role.ts (100%) rename packages/megalodon/src/{ => lib}/entities/scheduled_status.ts (100%) rename packages/megalodon/src/{ => lib}/entities/source.ts (100%) rename packages/megalodon/src/{ => lib}/entities/stats.ts (100%) rename packages/megalodon/src/{ => lib}/entities/status.ts (100%) rename packages/megalodon/src/{ => lib}/entities/status_edit.ts (100%) rename packages/megalodon/src/{ => lib}/entities/status_params.ts (100%) rename packages/megalodon/src/{ => lib}/entities/status_source.ts (100%) rename packages/megalodon/src/{ => lib}/entities/tag.ts (100%) rename packages/megalodon/src/{ => lib}/entities/token.ts (100%) rename packages/megalodon/src/{ => lib}/entities/urls.ts (100%) rename packages/megalodon/src/{ => lib}/entity.ts (100%) rename packages/megalodon/src/{ => lib}/filter_context.ts (100%) rename packages/megalodon/src/{ => lib}/index.ts (100%) rename packages/megalodon/src/{ => lib}/mastodon/entities/account.ts (100%) rename packages/megalodon/src/{ => lib}/mastodon/entities/activity.ts (100%) rename packages/megalodon/src/{ => lib}/mastodon/entities/announcement.ts (100%) rename packages/megalodon/src/{ => lib}/mastodon/entities/application.ts (100%) rename packages/megalodon/src/{ => lib}/mastodon/entities/async_attachment.ts (100%) rename packages/megalodon/src/{ => lib}/mastodon/entities/attachment.ts (100%) rename packages/megalodon/src/{ => lib}/mastodon/entities/card.ts (100%) rename packages/megalodon/src/{ => lib}/mastodon/entities/context.ts (100%) rename packages/megalodon/src/{ => lib}/mastodon/entities/conversation.ts (100%) rename packages/megalodon/src/{ => lib}/mastodon/entities/emoji.ts (100%) rename packages/megalodon/src/{ => lib}/mastodon/entities/featured_tag.ts (100%) rename packages/megalodon/src/{ => lib}/mastodon/entities/field.ts (100%) rename packages/megalodon/src/{ => lib}/mastodon/entities/filter.ts (100%) rename packages/megalodon/src/{ => lib}/mastodon/entities/history.ts (100%) rename packages/megalodon/src/{ => lib}/mastodon/entities/identity_proof.ts (100%) rename packages/megalodon/src/{ => lib}/mastodon/entities/instance.ts (100%) rename packages/megalodon/src/{ => lib}/mastodon/entities/list.ts (100%) rename packages/megalodon/src/{ => lib}/mastodon/entities/marker.ts (100%) rename packages/megalodon/src/{ => lib}/mastodon/entities/mention.ts (100%) rename packages/megalodon/src/{ => lib}/mastodon/entities/notification.ts (100%) rename packages/megalodon/src/{ => lib}/mastodon/entities/poll.ts (100%) rename packages/megalodon/src/{ => lib}/mastodon/entities/poll_option.ts (100%) rename packages/megalodon/src/{ => lib}/mastodon/entities/preferences.ts (100%) rename packages/megalodon/src/{ => lib}/mastodon/entities/push_subscription.ts (100%) rename packages/megalodon/src/{ => lib}/mastodon/entities/reaction.ts (100%) rename packages/megalodon/src/{ => lib}/mastodon/entities/relationship.ts (100%) rename packages/megalodon/src/{ => lib}/mastodon/entities/report.ts (100%) rename packages/megalodon/src/{ => lib}/mastodon/entities/results.ts (100%) rename packages/megalodon/src/{ => lib}/mastodon/entities/role.ts (100%) rename packages/megalodon/src/{ => lib}/mastodon/entities/scheduled_status.ts (100%) rename packages/megalodon/src/{ => lib}/mastodon/entities/source.ts (100%) rename packages/megalodon/src/{ => lib}/mastodon/entities/stats.ts (100%) rename packages/megalodon/src/{ => lib}/mastodon/entities/status.ts (100%) rename packages/megalodon/src/{ => lib}/mastodon/entities/status_params.ts (100%) rename packages/megalodon/src/{ => lib}/mastodon/entities/status_source.ts (100%) rename packages/megalodon/src/{ => lib}/mastodon/entities/tag.ts (100%) rename packages/megalodon/src/{ => lib}/mastodon/entities/token.ts (100%) rename packages/megalodon/src/{ => lib}/mastodon/entities/urls.ts (100%) rename packages/megalodon/src/{ => lib}/mastodon/entity.ts (100%) rename packages/megalodon/src/{ => lib}/mastodon/notification.ts (100%) rename packages/megalodon/src/{ => lib}/megalodon.ts (100%) rename packages/megalodon/src/{ => lib}/misskey.ts (99%) rename packages/megalodon/src/{ => lib}/misskey/api_client.ts (100%) rename packages/megalodon/src/{ => lib}/misskey/entities/GetAll.ts (100%) rename packages/megalodon/src/{ => lib}/misskey/entities/announcement.ts (100%) rename packages/megalodon/src/{ => lib}/misskey/entities/app.ts (100%) rename packages/megalodon/src/{ => lib}/misskey/entities/blocking.ts (100%) rename packages/megalodon/src/{ => lib}/misskey/entities/createdNote.ts (100%) rename packages/megalodon/src/{ => lib}/misskey/entities/emoji.ts (100%) rename packages/megalodon/src/{ => lib}/misskey/entities/favorite.ts (100%) rename packages/megalodon/src/{ => lib}/misskey/entities/field.ts (100%) rename packages/megalodon/src/{ => lib}/misskey/entities/file.ts (100%) rename packages/megalodon/src/{ => lib}/misskey/entities/followRequest.ts (100%) rename packages/megalodon/src/{ => lib}/misskey/entities/follower.ts (100%) rename packages/megalodon/src/{ => lib}/misskey/entities/following.ts (100%) rename packages/megalodon/src/{ => lib}/misskey/entities/hashtag.ts (100%) rename packages/megalodon/src/{ => lib}/misskey/entities/list.ts (100%) rename packages/megalodon/src/{ => lib}/misskey/entities/meta.ts (100%) rename packages/megalodon/src/{ => lib}/misskey/entities/mute.ts (100%) rename packages/megalodon/src/{ => lib}/misskey/entities/note.ts (100%) rename packages/megalodon/src/{ => lib}/misskey/entities/notification.ts (100%) rename packages/megalodon/src/{ => lib}/misskey/entities/poll.ts (100%) rename packages/megalodon/src/{ => lib}/misskey/entities/reaction.ts (100%) rename packages/megalodon/src/{ => lib}/misskey/entities/relation.ts (100%) rename packages/megalodon/src/{ => lib}/misskey/entities/session.ts (100%) rename packages/megalodon/src/{ => lib}/misskey/entities/stats.ts (100%) rename packages/megalodon/src/{ => lib}/misskey/entities/user.ts (100%) rename packages/megalodon/src/{ => lib}/misskey/entities/userDetail.ts (100%) rename packages/megalodon/src/{ => lib}/misskey/entities/userkey.ts (100%) rename packages/megalodon/src/{ => lib}/misskey/entity.ts (100%) rename packages/megalodon/src/{ => lib}/misskey/notification.ts (100%) rename packages/megalodon/src/{ => lib}/notification.ts (100%) rename packages/megalodon/src/{ => lib}/oauth.ts (100%) rename packages/megalodon/src/{ => lib}/parser.ts (100%) rename packages/megalodon/src/{ => lib}/response.ts (100%) create mode 100644 packages/megalodon/src/lib/tsconfig.json rename packages/megalodon/{ => src}/test/integration/misskey.spec.ts (94%) create mode 100644 packages/megalodon/src/test/tsconfig.json rename packages/megalodon/{ => src}/test/unit/misskey/api_client.spec.ts (97%) rename packages/megalodon/{ => src}/test/unit/parser.spec.ts (97%) create mode 100644 packages/megalodon/tsconfig.scripts.json diff --git a/packages/megalodon/jest.config.ts b/packages/megalodon/jest.config.ts index 1aaa88a347..fae4d82b6e 100644 --- a/packages/megalodon/jest.config.ts +++ b/packages/megalodon/jest.config.ts @@ -7,7 +7,7 @@ import { createDefaultEsmPreset, type JestConfigWithTsJest } from 'ts-jest'; const presetConfig = createDefaultEsmPreset({ - tsconfig: '/tsconfig.json' + tsconfig: '/src/test/tsconfig.json' }); export default { @@ -29,7 +29,7 @@ export default { // collectCoverage: false, // An array of glob patterns indicating a set of files for which coverage information should be collected - collectCoverageFrom: ['src/**/*.ts'], + collectCoverageFrom: ['src/lib/**/*.ts'], // The directory where Jest should output its coverage files coverageDirectory: "coverage", @@ -143,7 +143,7 @@ export default { // A list of paths to directories that Jest should use to search for files in roots: [ - "/test" + "/src/test" ], // Allows you to use a custom runner instead of Jest's default test runner @@ -172,7 +172,7 @@ export default { // The glob patterns Jest uses to detect test files testMatch: [ - "/test/**/*.spec.ts" + "/src/test/**/*.spec.ts" ], // An array of regexp pattern strings that are matched against all test paths, matched tests are skipped diff --git a/packages/megalodon/package.json b/packages/megalodon/package.json index 7fc07a09f7..e1350d0795 100644 --- a/packages/megalodon/package.json +++ b/packages/megalodon/package.json @@ -4,11 +4,14 @@ "version": "7.0.1", "private": true, "description": "Mastodon API client for node.js and browser", - "main": "./lib/src/index.js", - "typings": "./lib/src/index.d.ts", + "main": "./built/lib/index.js", + "typings": "./built/lib/index.d.ts", "scripts": { - "build": "tsc -p tsconfig.json", - "typecheck": "tsc -p tsconfig.json --noEmit", + "build": "tsc -p src/lib/tsconfig.json", + "typecheck-all": "pnpm run --no-bail typecheck:lib && pnpm run --no-bail typecheck:test", + "typecheck": "pnpm run typecheck:lib && pnpm run typecheck:test", + "typecheck:lib": "tsc -p src/lib/tsconfig.json --noEmit", + "typecheck:test": "tsc -p src/test/tsconfig.json --noEmit", "lint": "pnpm run typecheck", "jest": "cross-env NODE_ENV=test node --no-experimental-require-module --experimental-vm-modules --experimental-import-meta-resolve node_modules/jest/bin/jest.js --coverage --detectOpenHandles", "test": "pnpm run jest" diff --git a/packages/megalodon/src/axios.d.ts b/packages/megalodon/src/lib/axios.d.ts similarity index 100% rename from packages/megalodon/src/axios.d.ts rename to packages/megalodon/src/lib/axios.d.ts diff --git a/packages/megalodon/src/cancel.ts b/packages/megalodon/src/lib/cancel.ts similarity index 100% rename from packages/megalodon/src/cancel.ts rename to packages/megalodon/src/lib/cancel.ts diff --git a/packages/megalodon/src/converter.ts b/packages/megalodon/src/lib/converter.ts similarity index 100% rename from packages/megalodon/src/converter.ts rename to packages/megalodon/src/lib/converter.ts diff --git a/packages/megalodon/src/default.ts b/packages/megalodon/src/lib/default.ts similarity index 100% rename from packages/megalodon/src/default.ts rename to packages/megalodon/src/lib/default.ts diff --git a/packages/megalodon/src/detector.ts b/packages/megalodon/src/lib/detector.ts similarity index 100% rename from packages/megalodon/src/detector.ts rename to packages/megalodon/src/lib/detector.ts diff --git a/packages/megalodon/src/entities/account.ts b/packages/megalodon/src/lib/entities/account.ts similarity index 100% rename from packages/megalodon/src/entities/account.ts rename to packages/megalodon/src/lib/entities/account.ts diff --git a/packages/megalodon/src/entities/activity.ts b/packages/megalodon/src/lib/entities/activity.ts similarity index 100% rename from packages/megalodon/src/entities/activity.ts rename to packages/megalodon/src/lib/entities/activity.ts diff --git a/packages/megalodon/src/entities/announcement.ts b/packages/megalodon/src/lib/entities/announcement.ts similarity index 100% rename from packages/megalodon/src/entities/announcement.ts rename to packages/megalodon/src/lib/entities/announcement.ts diff --git a/packages/megalodon/src/entities/application.ts b/packages/megalodon/src/lib/entities/application.ts similarity index 100% rename from packages/megalodon/src/entities/application.ts rename to packages/megalodon/src/lib/entities/application.ts diff --git a/packages/megalodon/src/entities/async_attachment.ts b/packages/megalodon/src/lib/entities/async_attachment.ts similarity index 100% rename from packages/megalodon/src/entities/async_attachment.ts rename to packages/megalodon/src/lib/entities/async_attachment.ts diff --git a/packages/megalodon/src/entities/attachment.ts b/packages/megalodon/src/lib/entities/attachment.ts similarity index 100% rename from packages/megalodon/src/entities/attachment.ts rename to packages/megalodon/src/lib/entities/attachment.ts diff --git a/packages/megalodon/src/entities/card.ts b/packages/megalodon/src/lib/entities/card.ts similarity index 100% rename from packages/megalodon/src/entities/card.ts rename to packages/megalodon/src/lib/entities/card.ts diff --git a/packages/megalodon/src/entities/context.ts b/packages/megalodon/src/lib/entities/context.ts similarity index 100% rename from packages/megalodon/src/entities/context.ts rename to packages/megalodon/src/lib/entities/context.ts diff --git a/packages/megalodon/src/entities/conversation.ts b/packages/megalodon/src/lib/entities/conversation.ts similarity index 100% rename from packages/megalodon/src/entities/conversation.ts rename to packages/megalodon/src/lib/entities/conversation.ts diff --git a/packages/megalodon/src/entities/emoji.ts b/packages/megalodon/src/lib/entities/emoji.ts similarity index 100% rename from packages/megalodon/src/entities/emoji.ts rename to packages/megalodon/src/lib/entities/emoji.ts diff --git a/packages/megalodon/src/entities/featured_tag.ts b/packages/megalodon/src/lib/entities/featured_tag.ts similarity index 100% rename from packages/megalodon/src/entities/featured_tag.ts rename to packages/megalodon/src/lib/entities/featured_tag.ts diff --git a/packages/megalodon/src/entities/field.ts b/packages/megalodon/src/lib/entities/field.ts similarity index 100% rename from packages/megalodon/src/entities/field.ts rename to packages/megalodon/src/lib/entities/field.ts diff --git a/packages/megalodon/src/entities/filter.ts b/packages/megalodon/src/lib/entities/filter.ts similarity index 100% rename from packages/megalodon/src/entities/filter.ts rename to packages/megalodon/src/lib/entities/filter.ts diff --git a/packages/megalodon/src/entities/follow_request.ts b/packages/megalodon/src/lib/entities/follow_request.ts similarity index 100% rename from packages/megalodon/src/entities/follow_request.ts rename to packages/megalodon/src/lib/entities/follow_request.ts diff --git a/packages/megalodon/src/entities/history.ts b/packages/megalodon/src/lib/entities/history.ts similarity index 100% rename from packages/megalodon/src/entities/history.ts rename to packages/megalodon/src/lib/entities/history.ts diff --git a/packages/megalodon/src/entities/identity_proof.ts b/packages/megalodon/src/lib/entities/identity_proof.ts similarity index 100% rename from packages/megalodon/src/entities/identity_proof.ts rename to packages/megalodon/src/lib/entities/identity_proof.ts diff --git a/packages/megalodon/src/entities/instance.ts b/packages/megalodon/src/lib/entities/instance.ts similarity index 100% rename from packages/megalodon/src/entities/instance.ts rename to packages/megalodon/src/lib/entities/instance.ts diff --git a/packages/megalodon/src/entities/list.ts b/packages/megalodon/src/lib/entities/list.ts similarity index 100% rename from packages/megalodon/src/entities/list.ts rename to packages/megalodon/src/lib/entities/list.ts diff --git a/packages/megalodon/src/entities/marker.ts b/packages/megalodon/src/lib/entities/marker.ts similarity index 100% rename from packages/megalodon/src/entities/marker.ts rename to packages/megalodon/src/lib/entities/marker.ts diff --git a/packages/megalodon/src/entities/mention.ts b/packages/megalodon/src/lib/entities/mention.ts similarity index 100% rename from packages/megalodon/src/entities/mention.ts rename to packages/megalodon/src/lib/entities/mention.ts diff --git a/packages/megalodon/src/entities/notification.ts b/packages/megalodon/src/lib/entities/notification.ts similarity index 100% rename from packages/megalodon/src/entities/notification.ts rename to packages/megalodon/src/lib/entities/notification.ts diff --git a/packages/megalodon/src/entities/poll.ts b/packages/megalodon/src/lib/entities/poll.ts similarity index 100% rename from packages/megalodon/src/entities/poll.ts rename to packages/megalodon/src/lib/entities/poll.ts diff --git a/packages/megalodon/src/entities/poll_option.ts b/packages/megalodon/src/lib/entities/poll_option.ts similarity index 100% rename from packages/megalodon/src/entities/poll_option.ts rename to packages/megalodon/src/lib/entities/poll_option.ts diff --git a/packages/megalodon/src/entities/preferences.ts b/packages/megalodon/src/lib/entities/preferences.ts similarity index 100% rename from packages/megalodon/src/entities/preferences.ts rename to packages/megalodon/src/lib/entities/preferences.ts diff --git a/packages/megalodon/src/entities/push_subscription.ts b/packages/megalodon/src/lib/entities/push_subscription.ts similarity index 100% rename from packages/megalodon/src/entities/push_subscription.ts rename to packages/megalodon/src/lib/entities/push_subscription.ts diff --git a/packages/megalodon/src/entities/reaction.ts b/packages/megalodon/src/lib/entities/reaction.ts similarity index 100% rename from packages/megalodon/src/entities/reaction.ts rename to packages/megalodon/src/lib/entities/reaction.ts diff --git a/packages/megalodon/src/entities/relationship.ts b/packages/megalodon/src/lib/entities/relationship.ts similarity index 100% rename from packages/megalodon/src/entities/relationship.ts rename to packages/megalodon/src/lib/entities/relationship.ts diff --git a/packages/megalodon/src/entities/report.ts b/packages/megalodon/src/lib/entities/report.ts similarity index 100% rename from packages/megalodon/src/entities/report.ts rename to packages/megalodon/src/lib/entities/report.ts diff --git a/packages/megalodon/src/entities/results.ts b/packages/megalodon/src/lib/entities/results.ts similarity index 100% rename from packages/megalodon/src/entities/results.ts rename to packages/megalodon/src/lib/entities/results.ts diff --git a/packages/megalodon/src/entities/role.ts b/packages/megalodon/src/lib/entities/role.ts similarity index 100% rename from packages/megalodon/src/entities/role.ts rename to packages/megalodon/src/lib/entities/role.ts diff --git a/packages/megalodon/src/entities/scheduled_status.ts b/packages/megalodon/src/lib/entities/scheduled_status.ts similarity index 100% rename from packages/megalodon/src/entities/scheduled_status.ts rename to packages/megalodon/src/lib/entities/scheduled_status.ts diff --git a/packages/megalodon/src/entities/source.ts b/packages/megalodon/src/lib/entities/source.ts similarity index 100% rename from packages/megalodon/src/entities/source.ts rename to packages/megalodon/src/lib/entities/source.ts diff --git a/packages/megalodon/src/entities/stats.ts b/packages/megalodon/src/lib/entities/stats.ts similarity index 100% rename from packages/megalodon/src/entities/stats.ts rename to packages/megalodon/src/lib/entities/stats.ts diff --git a/packages/megalodon/src/entities/status.ts b/packages/megalodon/src/lib/entities/status.ts similarity index 100% rename from packages/megalodon/src/entities/status.ts rename to packages/megalodon/src/lib/entities/status.ts diff --git a/packages/megalodon/src/entities/status_edit.ts b/packages/megalodon/src/lib/entities/status_edit.ts similarity index 100% rename from packages/megalodon/src/entities/status_edit.ts rename to packages/megalodon/src/lib/entities/status_edit.ts diff --git a/packages/megalodon/src/entities/status_params.ts b/packages/megalodon/src/lib/entities/status_params.ts similarity index 100% rename from packages/megalodon/src/entities/status_params.ts rename to packages/megalodon/src/lib/entities/status_params.ts diff --git a/packages/megalodon/src/entities/status_source.ts b/packages/megalodon/src/lib/entities/status_source.ts similarity index 100% rename from packages/megalodon/src/entities/status_source.ts rename to packages/megalodon/src/lib/entities/status_source.ts diff --git a/packages/megalodon/src/entities/tag.ts b/packages/megalodon/src/lib/entities/tag.ts similarity index 100% rename from packages/megalodon/src/entities/tag.ts rename to packages/megalodon/src/lib/entities/tag.ts diff --git a/packages/megalodon/src/entities/token.ts b/packages/megalodon/src/lib/entities/token.ts similarity index 100% rename from packages/megalodon/src/entities/token.ts rename to packages/megalodon/src/lib/entities/token.ts diff --git a/packages/megalodon/src/entities/urls.ts b/packages/megalodon/src/lib/entities/urls.ts similarity index 100% rename from packages/megalodon/src/entities/urls.ts rename to packages/megalodon/src/lib/entities/urls.ts diff --git a/packages/megalodon/src/entity.ts b/packages/megalodon/src/lib/entity.ts similarity index 100% rename from packages/megalodon/src/entity.ts rename to packages/megalodon/src/lib/entity.ts diff --git a/packages/megalodon/src/filter_context.ts b/packages/megalodon/src/lib/filter_context.ts similarity index 100% rename from packages/megalodon/src/filter_context.ts rename to packages/megalodon/src/lib/filter_context.ts diff --git a/packages/megalodon/src/index.ts b/packages/megalodon/src/lib/index.ts similarity index 100% rename from packages/megalodon/src/index.ts rename to packages/megalodon/src/lib/index.ts diff --git a/packages/megalodon/src/mastodon/entities/account.ts b/packages/megalodon/src/lib/mastodon/entities/account.ts similarity index 100% rename from packages/megalodon/src/mastodon/entities/account.ts rename to packages/megalodon/src/lib/mastodon/entities/account.ts diff --git a/packages/megalodon/src/mastodon/entities/activity.ts b/packages/megalodon/src/lib/mastodon/entities/activity.ts similarity index 100% rename from packages/megalodon/src/mastodon/entities/activity.ts rename to packages/megalodon/src/lib/mastodon/entities/activity.ts diff --git a/packages/megalodon/src/mastodon/entities/announcement.ts b/packages/megalodon/src/lib/mastodon/entities/announcement.ts similarity index 100% rename from packages/megalodon/src/mastodon/entities/announcement.ts rename to packages/megalodon/src/lib/mastodon/entities/announcement.ts diff --git a/packages/megalodon/src/mastodon/entities/application.ts b/packages/megalodon/src/lib/mastodon/entities/application.ts similarity index 100% rename from packages/megalodon/src/mastodon/entities/application.ts rename to packages/megalodon/src/lib/mastodon/entities/application.ts diff --git a/packages/megalodon/src/mastodon/entities/async_attachment.ts b/packages/megalodon/src/lib/mastodon/entities/async_attachment.ts similarity index 100% rename from packages/megalodon/src/mastodon/entities/async_attachment.ts rename to packages/megalodon/src/lib/mastodon/entities/async_attachment.ts diff --git a/packages/megalodon/src/mastodon/entities/attachment.ts b/packages/megalodon/src/lib/mastodon/entities/attachment.ts similarity index 100% rename from packages/megalodon/src/mastodon/entities/attachment.ts rename to packages/megalodon/src/lib/mastodon/entities/attachment.ts diff --git a/packages/megalodon/src/mastodon/entities/card.ts b/packages/megalodon/src/lib/mastodon/entities/card.ts similarity index 100% rename from packages/megalodon/src/mastodon/entities/card.ts rename to packages/megalodon/src/lib/mastodon/entities/card.ts diff --git a/packages/megalodon/src/mastodon/entities/context.ts b/packages/megalodon/src/lib/mastodon/entities/context.ts similarity index 100% rename from packages/megalodon/src/mastodon/entities/context.ts rename to packages/megalodon/src/lib/mastodon/entities/context.ts diff --git a/packages/megalodon/src/mastodon/entities/conversation.ts b/packages/megalodon/src/lib/mastodon/entities/conversation.ts similarity index 100% rename from packages/megalodon/src/mastodon/entities/conversation.ts rename to packages/megalodon/src/lib/mastodon/entities/conversation.ts diff --git a/packages/megalodon/src/mastodon/entities/emoji.ts b/packages/megalodon/src/lib/mastodon/entities/emoji.ts similarity index 100% rename from packages/megalodon/src/mastodon/entities/emoji.ts rename to packages/megalodon/src/lib/mastodon/entities/emoji.ts diff --git a/packages/megalodon/src/mastodon/entities/featured_tag.ts b/packages/megalodon/src/lib/mastodon/entities/featured_tag.ts similarity index 100% rename from packages/megalodon/src/mastodon/entities/featured_tag.ts rename to packages/megalodon/src/lib/mastodon/entities/featured_tag.ts diff --git a/packages/megalodon/src/mastodon/entities/field.ts b/packages/megalodon/src/lib/mastodon/entities/field.ts similarity index 100% rename from packages/megalodon/src/mastodon/entities/field.ts rename to packages/megalodon/src/lib/mastodon/entities/field.ts diff --git a/packages/megalodon/src/mastodon/entities/filter.ts b/packages/megalodon/src/lib/mastodon/entities/filter.ts similarity index 100% rename from packages/megalodon/src/mastodon/entities/filter.ts rename to packages/megalodon/src/lib/mastodon/entities/filter.ts diff --git a/packages/megalodon/src/mastodon/entities/history.ts b/packages/megalodon/src/lib/mastodon/entities/history.ts similarity index 100% rename from packages/megalodon/src/mastodon/entities/history.ts rename to packages/megalodon/src/lib/mastodon/entities/history.ts diff --git a/packages/megalodon/src/mastodon/entities/identity_proof.ts b/packages/megalodon/src/lib/mastodon/entities/identity_proof.ts similarity index 100% rename from packages/megalodon/src/mastodon/entities/identity_proof.ts rename to packages/megalodon/src/lib/mastodon/entities/identity_proof.ts diff --git a/packages/megalodon/src/mastodon/entities/instance.ts b/packages/megalodon/src/lib/mastodon/entities/instance.ts similarity index 100% rename from packages/megalodon/src/mastodon/entities/instance.ts rename to packages/megalodon/src/lib/mastodon/entities/instance.ts diff --git a/packages/megalodon/src/mastodon/entities/list.ts b/packages/megalodon/src/lib/mastodon/entities/list.ts similarity index 100% rename from packages/megalodon/src/mastodon/entities/list.ts rename to packages/megalodon/src/lib/mastodon/entities/list.ts diff --git a/packages/megalodon/src/mastodon/entities/marker.ts b/packages/megalodon/src/lib/mastodon/entities/marker.ts similarity index 100% rename from packages/megalodon/src/mastodon/entities/marker.ts rename to packages/megalodon/src/lib/mastodon/entities/marker.ts diff --git a/packages/megalodon/src/mastodon/entities/mention.ts b/packages/megalodon/src/lib/mastodon/entities/mention.ts similarity index 100% rename from packages/megalodon/src/mastodon/entities/mention.ts rename to packages/megalodon/src/lib/mastodon/entities/mention.ts diff --git a/packages/megalodon/src/mastodon/entities/notification.ts b/packages/megalodon/src/lib/mastodon/entities/notification.ts similarity index 100% rename from packages/megalodon/src/mastodon/entities/notification.ts rename to packages/megalodon/src/lib/mastodon/entities/notification.ts diff --git a/packages/megalodon/src/mastodon/entities/poll.ts b/packages/megalodon/src/lib/mastodon/entities/poll.ts similarity index 100% rename from packages/megalodon/src/mastodon/entities/poll.ts rename to packages/megalodon/src/lib/mastodon/entities/poll.ts diff --git a/packages/megalodon/src/mastodon/entities/poll_option.ts b/packages/megalodon/src/lib/mastodon/entities/poll_option.ts similarity index 100% rename from packages/megalodon/src/mastodon/entities/poll_option.ts rename to packages/megalodon/src/lib/mastodon/entities/poll_option.ts diff --git a/packages/megalodon/src/mastodon/entities/preferences.ts b/packages/megalodon/src/lib/mastodon/entities/preferences.ts similarity index 100% rename from packages/megalodon/src/mastodon/entities/preferences.ts rename to packages/megalodon/src/lib/mastodon/entities/preferences.ts diff --git a/packages/megalodon/src/mastodon/entities/push_subscription.ts b/packages/megalodon/src/lib/mastodon/entities/push_subscription.ts similarity index 100% rename from packages/megalodon/src/mastodon/entities/push_subscription.ts rename to packages/megalodon/src/lib/mastodon/entities/push_subscription.ts diff --git a/packages/megalodon/src/mastodon/entities/reaction.ts b/packages/megalodon/src/lib/mastodon/entities/reaction.ts similarity index 100% rename from packages/megalodon/src/mastodon/entities/reaction.ts rename to packages/megalodon/src/lib/mastodon/entities/reaction.ts diff --git a/packages/megalodon/src/mastodon/entities/relationship.ts b/packages/megalodon/src/lib/mastodon/entities/relationship.ts similarity index 100% rename from packages/megalodon/src/mastodon/entities/relationship.ts rename to packages/megalodon/src/lib/mastodon/entities/relationship.ts diff --git a/packages/megalodon/src/mastodon/entities/report.ts b/packages/megalodon/src/lib/mastodon/entities/report.ts similarity index 100% rename from packages/megalodon/src/mastodon/entities/report.ts rename to packages/megalodon/src/lib/mastodon/entities/report.ts diff --git a/packages/megalodon/src/mastodon/entities/results.ts b/packages/megalodon/src/lib/mastodon/entities/results.ts similarity index 100% rename from packages/megalodon/src/mastodon/entities/results.ts rename to packages/megalodon/src/lib/mastodon/entities/results.ts diff --git a/packages/megalodon/src/mastodon/entities/role.ts b/packages/megalodon/src/lib/mastodon/entities/role.ts similarity index 100% rename from packages/megalodon/src/mastodon/entities/role.ts rename to packages/megalodon/src/lib/mastodon/entities/role.ts diff --git a/packages/megalodon/src/mastodon/entities/scheduled_status.ts b/packages/megalodon/src/lib/mastodon/entities/scheduled_status.ts similarity index 100% rename from packages/megalodon/src/mastodon/entities/scheduled_status.ts rename to packages/megalodon/src/lib/mastodon/entities/scheduled_status.ts diff --git a/packages/megalodon/src/mastodon/entities/source.ts b/packages/megalodon/src/lib/mastodon/entities/source.ts similarity index 100% rename from packages/megalodon/src/mastodon/entities/source.ts rename to packages/megalodon/src/lib/mastodon/entities/source.ts diff --git a/packages/megalodon/src/mastodon/entities/stats.ts b/packages/megalodon/src/lib/mastodon/entities/stats.ts similarity index 100% rename from packages/megalodon/src/mastodon/entities/stats.ts rename to packages/megalodon/src/lib/mastodon/entities/stats.ts diff --git a/packages/megalodon/src/mastodon/entities/status.ts b/packages/megalodon/src/lib/mastodon/entities/status.ts similarity index 100% rename from packages/megalodon/src/mastodon/entities/status.ts rename to packages/megalodon/src/lib/mastodon/entities/status.ts diff --git a/packages/megalodon/src/mastodon/entities/status_params.ts b/packages/megalodon/src/lib/mastodon/entities/status_params.ts similarity index 100% rename from packages/megalodon/src/mastodon/entities/status_params.ts rename to packages/megalodon/src/lib/mastodon/entities/status_params.ts diff --git a/packages/megalodon/src/mastodon/entities/status_source.ts b/packages/megalodon/src/lib/mastodon/entities/status_source.ts similarity index 100% rename from packages/megalodon/src/mastodon/entities/status_source.ts rename to packages/megalodon/src/lib/mastodon/entities/status_source.ts diff --git a/packages/megalodon/src/mastodon/entities/tag.ts b/packages/megalodon/src/lib/mastodon/entities/tag.ts similarity index 100% rename from packages/megalodon/src/mastodon/entities/tag.ts rename to packages/megalodon/src/lib/mastodon/entities/tag.ts diff --git a/packages/megalodon/src/mastodon/entities/token.ts b/packages/megalodon/src/lib/mastodon/entities/token.ts similarity index 100% rename from packages/megalodon/src/mastodon/entities/token.ts rename to packages/megalodon/src/lib/mastodon/entities/token.ts diff --git a/packages/megalodon/src/mastodon/entities/urls.ts b/packages/megalodon/src/lib/mastodon/entities/urls.ts similarity index 100% rename from packages/megalodon/src/mastodon/entities/urls.ts rename to packages/megalodon/src/lib/mastodon/entities/urls.ts diff --git a/packages/megalodon/src/mastodon/entity.ts b/packages/megalodon/src/lib/mastodon/entity.ts similarity index 100% rename from packages/megalodon/src/mastodon/entity.ts rename to packages/megalodon/src/lib/mastodon/entity.ts diff --git a/packages/megalodon/src/mastodon/notification.ts b/packages/megalodon/src/lib/mastodon/notification.ts similarity index 100% rename from packages/megalodon/src/mastodon/notification.ts rename to packages/megalodon/src/lib/mastodon/notification.ts diff --git a/packages/megalodon/src/megalodon.ts b/packages/megalodon/src/lib/megalodon.ts similarity index 100% rename from packages/megalodon/src/megalodon.ts rename to packages/megalodon/src/lib/megalodon.ts diff --git a/packages/megalodon/src/misskey.ts b/packages/megalodon/src/lib/misskey.ts similarity index 99% rename from packages/megalodon/src/misskey.ts rename to packages/megalodon/src/lib/misskey.ts index f7f69b9168..2a206fbf75 100644 --- a/packages/megalodon/src/misskey.ts +++ b/packages/megalodon/src/lib/misskey.ts @@ -1,5 +1,4 @@ import FormData from 'form-data' -import fs from 'fs'; import * as MisskeyAPI from './misskey/api_client.js' import { DEFAULT_UA } from './default.js' import * as OAuth from './oauth.js' @@ -1531,9 +1530,9 @@ export default class Misskey implements MegalodonInterface { /** * POST /api/drive/files/create */ - public async uploadMedia(file: { filepath: fs.PathLike, mimetype: string, filename: string }, _options?: { description?: string; focus?: string }): Promise> { + public async uploadMedia(file: { stream: ReadableStream, mimetype: string, filename: string }, _options?: { description?: string; focus?: string }): Promise> { const formData = new FormData() - formData.append('file', fs.createReadStream(file.filepath), { + formData.append('file', file.stream, { contentType: file.mimetype, }); diff --git a/packages/megalodon/src/misskey/api_client.ts b/packages/megalodon/src/lib/misskey/api_client.ts similarity index 100% rename from packages/megalodon/src/misskey/api_client.ts rename to packages/megalodon/src/lib/misskey/api_client.ts diff --git a/packages/megalodon/src/misskey/entities/GetAll.ts b/packages/megalodon/src/lib/misskey/entities/GetAll.ts similarity index 100% rename from packages/megalodon/src/misskey/entities/GetAll.ts rename to packages/megalodon/src/lib/misskey/entities/GetAll.ts diff --git a/packages/megalodon/src/misskey/entities/announcement.ts b/packages/megalodon/src/lib/misskey/entities/announcement.ts similarity index 100% rename from packages/megalodon/src/misskey/entities/announcement.ts rename to packages/megalodon/src/lib/misskey/entities/announcement.ts diff --git a/packages/megalodon/src/misskey/entities/app.ts b/packages/megalodon/src/lib/misskey/entities/app.ts similarity index 100% rename from packages/megalodon/src/misskey/entities/app.ts rename to packages/megalodon/src/lib/misskey/entities/app.ts diff --git a/packages/megalodon/src/misskey/entities/blocking.ts b/packages/megalodon/src/lib/misskey/entities/blocking.ts similarity index 100% rename from packages/megalodon/src/misskey/entities/blocking.ts rename to packages/megalodon/src/lib/misskey/entities/blocking.ts diff --git a/packages/megalodon/src/misskey/entities/createdNote.ts b/packages/megalodon/src/lib/misskey/entities/createdNote.ts similarity index 100% rename from packages/megalodon/src/misskey/entities/createdNote.ts rename to packages/megalodon/src/lib/misskey/entities/createdNote.ts diff --git a/packages/megalodon/src/misskey/entities/emoji.ts b/packages/megalodon/src/lib/misskey/entities/emoji.ts similarity index 100% rename from packages/megalodon/src/misskey/entities/emoji.ts rename to packages/megalodon/src/lib/misskey/entities/emoji.ts diff --git a/packages/megalodon/src/misskey/entities/favorite.ts b/packages/megalodon/src/lib/misskey/entities/favorite.ts similarity index 100% rename from packages/megalodon/src/misskey/entities/favorite.ts rename to packages/megalodon/src/lib/misskey/entities/favorite.ts diff --git a/packages/megalodon/src/misskey/entities/field.ts b/packages/megalodon/src/lib/misskey/entities/field.ts similarity index 100% rename from packages/megalodon/src/misskey/entities/field.ts rename to packages/megalodon/src/lib/misskey/entities/field.ts diff --git a/packages/megalodon/src/misskey/entities/file.ts b/packages/megalodon/src/lib/misskey/entities/file.ts similarity index 100% rename from packages/megalodon/src/misskey/entities/file.ts rename to packages/megalodon/src/lib/misskey/entities/file.ts diff --git a/packages/megalodon/src/misskey/entities/followRequest.ts b/packages/megalodon/src/lib/misskey/entities/followRequest.ts similarity index 100% rename from packages/megalodon/src/misskey/entities/followRequest.ts rename to packages/megalodon/src/lib/misskey/entities/followRequest.ts diff --git a/packages/megalodon/src/misskey/entities/follower.ts b/packages/megalodon/src/lib/misskey/entities/follower.ts similarity index 100% rename from packages/megalodon/src/misskey/entities/follower.ts rename to packages/megalodon/src/lib/misskey/entities/follower.ts diff --git a/packages/megalodon/src/misskey/entities/following.ts b/packages/megalodon/src/lib/misskey/entities/following.ts similarity index 100% rename from packages/megalodon/src/misskey/entities/following.ts rename to packages/megalodon/src/lib/misskey/entities/following.ts diff --git a/packages/megalodon/src/misskey/entities/hashtag.ts b/packages/megalodon/src/lib/misskey/entities/hashtag.ts similarity index 100% rename from packages/megalodon/src/misskey/entities/hashtag.ts rename to packages/megalodon/src/lib/misskey/entities/hashtag.ts diff --git a/packages/megalodon/src/misskey/entities/list.ts b/packages/megalodon/src/lib/misskey/entities/list.ts similarity index 100% rename from packages/megalodon/src/misskey/entities/list.ts rename to packages/megalodon/src/lib/misskey/entities/list.ts diff --git a/packages/megalodon/src/misskey/entities/meta.ts b/packages/megalodon/src/lib/misskey/entities/meta.ts similarity index 100% rename from packages/megalodon/src/misskey/entities/meta.ts rename to packages/megalodon/src/lib/misskey/entities/meta.ts diff --git a/packages/megalodon/src/misskey/entities/mute.ts b/packages/megalodon/src/lib/misskey/entities/mute.ts similarity index 100% rename from packages/megalodon/src/misskey/entities/mute.ts rename to packages/megalodon/src/lib/misskey/entities/mute.ts diff --git a/packages/megalodon/src/misskey/entities/note.ts b/packages/megalodon/src/lib/misskey/entities/note.ts similarity index 100% rename from packages/megalodon/src/misskey/entities/note.ts rename to packages/megalodon/src/lib/misskey/entities/note.ts diff --git a/packages/megalodon/src/misskey/entities/notification.ts b/packages/megalodon/src/lib/misskey/entities/notification.ts similarity index 100% rename from packages/megalodon/src/misskey/entities/notification.ts rename to packages/megalodon/src/lib/misskey/entities/notification.ts diff --git a/packages/megalodon/src/misskey/entities/poll.ts b/packages/megalodon/src/lib/misskey/entities/poll.ts similarity index 100% rename from packages/megalodon/src/misskey/entities/poll.ts rename to packages/megalodon/src/lib/misskey/entities/poll.ts diff --git a/packages/megalodon/src/misskey/entities/reaction.ts b/packages/megalodon/src/lib/misskey/entities/reaction.ts similarity index 100% rename from packages/megalodon/src/misskey/entities/reaction.ts rename to packages/megalodon/src/lib/misskey/entities/reaction.ts diff --git a/packages/megalodon/src/misskey/entities/relation.ts b/packages/megalodon/src/lib/misskey/entities/relation.ts similarity index 100% rename from packages/megalodon/src/misskey/entities/relation.ts rename to packages/megalodon/src/lib/misskey/entities/relation.ts diff --git a/packages/megalodon/src/misskey/entities/session.ts b/packages/megalodon/src/lib/misskey/entities/session.ts similarity index 100% rename from packages/megalodon/src/misskey/entities/session.ts rename to packages/megalodon/src/lib/misskey/entities/session.ts diff --git a/packages/megalodon/src/misskey/entities/stats.ts b/packages/megalodon/src/lib/misskey/entities/stats.ts similarity index 100% rename from packages/megalodon/src/misskey/entities/stats.ts rename to packages/megalodon/src/lib/misskey/entities/stats.ts diff --git a/packages/megalodon/src/misskey/entities/user.ts b/packages/megalodon/src/lib/misskey/entities/user.ts similarity index 100% rename from packages/megalodon/src/misskey/entities/user.ts rename to packages/megalodon/src/lib/misskey/entities/user.ts diff --git a/packages/megalodon/src/misskey/entities/userDetail.ts b/packages/megalodon/src/lib/misskey/entities/userDetail.ts similarity index 100% rename from packages/megalodon/src/misskey/entities/userDetail.ts rename to packages/megalodon/src/lib/misskey/entities/userDetail.ts diff --git a/packages/megalodon/src/misskey/entities/userkey.ts b/packages/megalodon/src/lib/misskey/entities/userkey.ts similarity index 100% rename from packages/megalodon/src/misskey/entities/userkey.ts rename to packages/megalodon/src/lib/misskey/entities/userkey.ts diff --git a/packages/megalodon/src/misskey/entity.ts b/packages/megalodon/src/lib/misskey/entity.ts similarity index 100% rename from packages/megalodon/src/misskey/entity.ts rename to packages/megalodon/src/lib/misskey/entity.ts diff --git a/packages/megalodon/src/misskey/notification.ts b/packages/megalodon/src/lib/misskey/notification.ts similarity index 100% rename from packages/megalodon/src/misskey/notification.ts rename to packages/megalodon/src/lib/misskey/notification.ts diff --git a/packages/megalodon/src/notification.ts b/packages/megalodon/src/lib/notification.ts similarity index 100% rename from packages/megalodon/src/notification.ts rename to packages/megalodon/src/lib/notification.ts diff --git a/packages/megalodon/src/oauth.ts b/packages/megalodon/src/lib/oauth.ts similarity index 100% rename from packages/megalodon/src/oauth.ts rename to packages/megalodon/src/lib/oauth.ts diff --git a/packages/megalodon/src/parser.ts b/packages/megalodon/src/lib/parser.ts similarity index 100% rename from packages/megalodon/src/parser.ts rename to packages/megalodon/src/lib/parser.ts diff --git a/packages/megalodon/src/response.ts b/packages/megalodon/src/lib/response.ts similarity index 100% rename from packages/megalodon/src/response.ts rename to packages/megalodon/src/lib/response.ts diff --git a/packages/megalodon/src/lib/tsconfig.json b/packages/megalodon/src/lib/tsconfig.json new file mode 100644 index 0000000000..506fa2c8bf --- /dev/null +++ b/packages/megalodon/src/lib/tsconfig.json @@ -0,0 +1,11 @@ +{ + "$schema": "https://json.schemastore.org/tsconfig", + "extends": "../../../shared/tsconfig.lib.jsonc", + "compilerOptions": { + "outDir": "../../built/lib", + "rootDir": "./", + }, + "include": [ + "**/*.ts", + ] +} diff --git a/packages/megalodon/test/integration/misskey.spec.ts b/packages/megalodon/src/test/integration/misskey.spec.ts similarity index 94% rename from packages/megalodon/test/integration/misskey.spec.ts rename to packages/megalodon/src/test/integration/misskey.spec.ts index f4115eeb50..0ce22a4a86 100644 --- a/packages/megalodon/test/integration/misskey.spec.ts +++ b/packages/megalodon/src/test/integration/misskey.spec.ts @@ -1,8 +1,8 @@ -import * as MisskeyEntity from '../../src/misskey/entity.js' -import * as MisskeyNotificationType from '../../src/misskey/notification.js' -import * as Misskey from '../../src/misskey.js' -import * as MegalodonNotificationType from '../../src/notification.js' -import * as Entity from '../../src/entity.js' +import * as MisskeyEntity from '../../lib/misskey/entity.js' +import * as MisskeyNotificationType from '../../lib/misskey/notification.js' +import * as Misskey from '../../lib/misskey.js' +import * as MegalodonNotificationType from '../../lib/notification.js' +import * as Entity from '../../lib/entity.js' import axios, { AxiosHeaders, type AxiosResponse, diff --git a/packages/megalodon/src/test/tsconfig.json b/packages/megalodon/src/test/tsconfig.json new file mode 100644 index 0000000000..fc47ec7f5a --- /dev/null +++ b/packages/megalodon/src/test/tsconfig.json @@ -0,0 +1,14 @@ +{ + "$schema": "https://json.schemastore.org/tsconfig", + "extends": "../../../shared/tsconfig.node.jsonc", + "compilerOptions": { + "outDir": "../../built/test", + "rootDir": "./", + }, + "include": [ + "**/*.ts", + ], + "references": [ + { "path": "../lib/tsconfig.json" } + ] +} diff --git a/packages/megalodon/test/unit/misskey/api_client.spec.ts b/packages/megalodon/src/test/unit/misskey/api_client.spec.ts similarity index 97% rename from packages/megalodon/test/unit/misskey/api_client.spec.ts rename to packages/megalodon/src/test/unit/misskey/api_client.spec.ts index 672f6325b6..8c0868c8e0 100644 --- a/packages/megalodon/test/unit/misskey/api_client.spec.ts +++ b/packages/megalodon/src/test/unit/misskey/api_client.spec.ts @@ -1,8 +1,8 @@ -import * as MisskeyAPI from '../../../src/misskey/api_client.js' -import * as MegalodonEntity from '../../../src/entity.js' -import * as MisskeyEntity from '../../../src/misskey/entity.js' -import * as MegalodonNotificationType from '../../../src/notification.js' -import * as MisskeyNotificationType from '../../../src/misskey/notification.js' +import * as MisskeyAPI from '../../../lib/misskey/api_client.js' +import * as MegalodonEntity from '../../../lib/entity.js' +import * as MisskeyEntity from '../../../lib/misskey/entity.js' +import * as MegalodonNotificationType from '../../../lib/notification.js' +import * as MisskeyNotificationType from '../../../lib/misskey/notification.js' const user: MisskeyEntity.User = { id: '1', diff --git a/packages/megalodon/test/unit/parser.spec.ts b/packages/megalodon/src/test/unit/parser.spec.ts similarity index 97% rename from packages/megalodon/test/unit/parser.spec.ts rename to packages/megalodon/src/test/unit/parser.spec.ts index 503776fd50..bb984d5270 100644 --- a/packages/megalodon/test/unit/parser.spec.ts +++ b/packages/megalodon/src/test/unit/parser.spec.ts @@ -1,5 +1,5 @@ -import { Parser } from '../../src/parser.js' -import * as Entity from '../../src/entity.js' +import { Parser } from '../../lib/parser.js' +import * as Entity from '../../lib/entity.js' import { jest } from '@jest/globals'; const account: Entity.Account = { diff --git a/packages/megalodon/tsconfig.json b/packages/megalodon/tsconfig.json index bd6dede2e4..e6c99e7408 100644 --- a/packages/megalodon/tsconfig.json +++ b/packages/megalodon/tsconfig.json @@ -1,23 +1,10 @@ { "$schema": "https://json.schemastore.org/tsconfig", - "extends": "../shared/tsconfig.node.json", - "compilerOptions": { - "types": ["node", "jest"], - "declaration": true, - "declarationMap": true, - "sourceMap": true, - "inlineSources": true, - "removeComments": false, - "outDir": "./lib", - "rootDir": "./", - }, - "include": [ - "./src", - "./test", - "./jest.config.ts" - ], - "exclude": [ - "node_modules", - "./lib" + "files": [], + // WebStorm only reads one tsconfig per directory, so this tricks it into loading both. + "references": [ + { "path": "src/lib/tsconfig.json" }, + { "path": "src/test/tsconfig.json" }, + { "path": "./tsconfig.scripts.json" } ] } diff --git a/packages/megalodon/tsconfig.scripts.json b/packages/megalodon/tsconfig.scripts.json new file mode 100644 index 0000000000..a479a70325 --- /dev/null +++ b/packages/megalodon/tsconfig.scripts.json @@ -0,0 +1,8 @@ +{ + "$schema": "https://json.schemastore.org/tsconfig", + "extends": "../shared/tsconfig.scripts.jsonc", + "include": [ + "*.js", + "*.ts" + ] +}