From 04abdf2c9727a852a0930f7f8889dab4b2e2caf6 Mon Sep 17 00:00:00 2001 From: Bingbing Date: Tue, 31 Mar 2026 14:27:44 +0800 Subject: [PATCH] feat: make insomnia-data as a package --- eslint.config.mjs | 10 +- package-lock.json | 11 +- package.json | 1 + packages/insomnia-api/tsconfig.json | 2 +- .../src => }/insomnia-data/README.md | 12 +- packages/insomnia-data/__mocks__/uuid.ts | 188 ++++++++++++++++++ .../insomnia-data/common-src/constants.ts | 30 +++ .../insomnia-data/common-src/hotkeys.ts | 0 .../insomnia-data/common-src/index.ts | 2 +- .../insomnia-data/common-src/invariant.ts | 0 .../insomnia-data/common-src/keyboard-keys.ts | 0 .../src => }/insomnia-data/common-src/misc.ts | 0 .../insomnia-data/common-src/ndjson.test.ts | 0 .../insomnia-data/common-src/ndjson.ts | 0 .../insomnia-data/common-src/platform.ts | 7 + .../insomnia-data/common-src/preview-mode.ts | 0 .../insomnia-data/common-src/querystring.ts | 0 .../insomnia-data/common-src/settings.ts | 0 .../insomnia-data/common-src/strings.ts | 0 .../insomnia-data/common-src/tsconfig.json | 8 + .../src => }/insomnia-data/common-src/type.ts | 0 .../node-src/database/database-nedb.ts | 5 +- .../node-src/database/database.test.ts | 81 ++++---- .../node-src/database/repair-database.ts | 2 +- .../src => }/insomnia-data/node-src/index.ts | 0 .../node-src/services/api-spec.ts | 2 +- .../node-src/services/ca-certificate.ts | 2 +- .../node-src/services/client-certificate.ts | 2 +- .../node-src/services/cloud-credential.ts | 2 +- .../node-src/services/cookie-jar.ts | 2 +- .../node-src/services/environment.ts | 2 +- .../node-src/services/git-credentials.ts | 2 +- .../node-src/services/git-repository.ts | 2 +- .../node-src/services/grpc-request-meta.ts | 2 +- .../node-src/services/grpc-request.ts | 2 +- .../helpers/__tests__/is-model.test.ts | 19 +- .../query-all-workspace-urls.test.ts | 3 +- .../node-src/services/helpers/index.ts | 0 .../helpers/query-all-workspace-urls.ts | 6 +- .../services/helpers/request-operations.ts | 2 +- .../services/helpers/response-operations.ts | 4 +- .../insomnia-data/node-src/services/index.ts | 0 .../node-src/services/mcp-payload.ts | 0 .../node-src/services/mcp-request.ts | 2 +- .../node-src/services/mcp-response.ts | 2 +- .../node-src/services/mock-route.ts | 2 +- .../node-src/services/mock-server.ts | 2 +- .../node-src/services/o-auth-2-token.ts | 2 +- .../node-src/services/plugin-data.ts | 2 +- .../node-src/services/project.ts | 2 +- .../node-src/services/proto-directory.ts | 2 +- .../node-src/services/proto-file.ts | 2 +- .../node-src/services/request-group-meta.ts | 2 +- .../node-src/services/request-group.ts | 2 +- .../node-src/services/request-meta.ts | 2 +- .../node-src/services/request-version.ts | 3 +- .../node-src/services/request.ts | 2 +- .../node-src/services/response.ts | 2 +- .../node-src/services/runner-test-result.ts | 2 +- .../node-src/services/settings.ts | 2 +- .../node-src/services/socket-io-payload.ts | 2 +- .../node-src/services/socket-io-request.ts | 2 +- .../node-src/services/socket-io-response.ts | 2 +- .../insomnia-data/node-src/services/stats.ts | 2 +- .../node-src/services/unit-test-result.ts | 2 +- .../node-src/services/unit-test-suite.ts | 2 +- .../node-src/services/unit-test.ts | 2 +- .../node-src/services/user-session.ts | 2 +- .../node-src/services/websocket-payload.ts | 2 +- .../node-src/services/websocket-request.ts | 2 +- .../node-src/services/websocket-response.ts | 2 +- .../node-src/services/workspace-meta.ts | 2 +- .../node-src/services/workspace.ts | 2 +- packages/insomnia-data/node-src/tsconfig.json | 8 + .../insomnia-data/node-src/types.d.ts | 0 .../insomnia-data/node-src/utils/index.ts | 6 +- .../node-src/utils/migrate/request.ts | 4 +- .../node-src/utils/migrate/response.ts | 2 +- .../node-src/utils/migrate/settings.ts | 2 +- .../node-src/utils/migrate/workspace.ts | 5 +- packages/insomnia-data/package.json | 37 ++++ packages/insomnia-data/setup-vitest.ts | 12 ++ .../src}/__tests__/git-credentials.test.ts | 3 +- .../src}/__tests__/grpc-request-meta.test.ts | 3 +- .../src}/__tests__/grpc-request.test.ts | 3 +- .../src}/__tests__/index.test.ts | 3 +- .../src/__tests__/project.test.ts | 24 +++ .../src}/__tests__/proto-file.test.ts | 3 +- .../src}/__tests__/request-meta.test.ts | 3 +- .../src}/__tests__/request.test.ts | 4 +- .../src}/__tests__/response.test.ts | 16 +- .../src}/__tests__/workspace.test.ts | 21 +- .../insomnia-data/src/database/index.ts | 2 +- .../insomnia-data/src/database/types.ts | 0 .../src => }/insomnia-data/src/index.ts | 0 .../insomnia-data/src/models/api-spec.ts | 2 +- .../insomnia-data/src/models/base-types.ts | 0 .../src/models/ca-certificate.ts | 0 .../src/models/client-certificate.ts | 0 .../src/models/cloud-credential.ts | 0 .../insomnia-data/src/models/cookie-jar.ts | 0 .../insomnia-data/src/models/environment.ts | 0 .../src/models/git-credentials.ts | 0 .../src/models/git-repository.ts | 0 .../src/models/grpc-request-meta.ts | 0 .../insomnia-data/src/models/grpc-request.ts | 0 .../insomnia-data/src/models/index.ts | 0 .../insomnia-data/src/models/mcp-payload.ts | 0 .../insomnia-data/src/models/mcp-request.ts | 0 .../insomnia-data/src/models/mcp-response.ts | 0 .../insomnia-data/src/models/mock-route.ts | 0 .../insomnia-data/src/models/mock-server.ts | 2 +- .../src/models/o-auth-2-token.ts | 0 .../insomnia-data/src/models/organization.ts | 0 .../insomnia-data/src/models/plugin-data.ts | 0 .../insomnia-data/src/models/project.ts | 3 +- .../src/models/proto-directory.ts | 2 +- .../insomnia-data/src/models/proto-file.ts | 0 .../src/models/request-group-meta.ts | 0 .../insomnia-data/src/models/request-group.ts | 0 .../insomnia-data/src/models/request-meta.ts | 2 +- .../src/models/request-version.ts | 0 .../insomnia-data/src/models/request.ts | 5 +- .../insomnia-data/src/models/response.ts | 0 .../src/models/runner-test-result.ts | 0 .../insomnia-data/src/models/settings.ts | 12 +- .../src/models/socket-io-payload.ts | 3 +- .../src/models/socket-io-request.ts | 0 .../src/models/socket-io-response.ts | 0 .../insomnia-data/src/models/stats.ts | 0 .../insomnia-data/src/models/types.ts | 2 +- .../src/models/unit-test-result.ts | 0 .../src/models/unit-test-suite.ts | 0 .../insomnia-data/src/models/unit-test.ts | 0 .../insomnia-data/src/models/user-session.ts | 9 +- .../utils/replace-ids-in-fields.test.ts | 0 .../src/models/utils/replace-ids-in-fields.ts | 0 .../src/models/websocket-payload.ts | 0 .../src/models/websocket-request.ts | 0 .../src/models/websocket-response.ts | 0 .../src/models/workspace-meta.ts | 0 .../insomnia-data/src/models/workspace.ts | 2 +- .../insomnia-data/src/services/index.ts | 0 packages/insomnia-data/src/tsconfig.json | 8 + packages/insomnia-data/tsconfig.base.json | 22 ++ packages/insomnia-data/vitest.config.ts | 13 ++ packages/insomnia-inso/src/analytics.ts | 3 +- packages/insomnia-inso/src/cli.ts | 17 +- .../commands/run-collection/result-report.ts | 4 +- packages/insomnia-inso/src/db/types.ts | 2 +- packages/insomnia-inso/src/reporter/index.ts | 3 +- .../src/objects/auth.ts | 5 +- .../src/objects/cookies.ts | 3 +- .../src/objects/insomnia.ts | 3 +- .../src/objects/interfaces.ts | 3 +- .../src/objects/request.ts | 2 +- .../src/objects/response.ts | 3 +- .../src/objects/send-request.ts | 3 +- .../src/objects/test.ts | 2 +- packages/insomnia/config/config.json | 3 - packages/insomnia/setup-vitest.ts | 5 +- .../src/__tests__/install-plugin.test.ts | 2 +- packages/insomnia/src/account/crypt.ts | 8 +- packages/insomnia/src/account/session.ts | 9 +- .../src/common/__fixtures__/nestedfolders.ts | 2 +- .../src/common/__tests__/constants.test.ts | 5 +- .../insomnia/src/common/__tests__/har.test.ts | 3 +- .../src/common/__tests__/import.test.ts | 3 +- .../src/common/__tests__/insomnia-v5.test.ts | 3 +- .../src/common/__tests__/render.test.ts | 3 +- .../src/common/__tests__/sorting.test.ts | 3 +- .../src/common/__tests__/strings.test.ts | 5 +- .../insomnia/src/common/common-headers.ts | 2 +- packages/insomnia/src/common/constants.ts | 27 ++- packages/insomnia/src/common/cookies.ts | 3 +- packages/insomnia/src/common/database.ts | 2 +- .../src/common/get-workspace-label.ts | 5 +- packages/insomnia/src/common/har.ts | 5 +- packages/insomnia/src/common/import.ts | 8 +- packages/insomnia/src/common/insomnia-v5.ts | 14 +- packages/insomnia/src/common/render.ts | 7 +- packages/insomnia/src/common/send-request.ts | 6 +- packages/insomnia/src/common/sorting.ts | 2 +- packages/insomnia/src/entry.client.tsx | 2 +- .../src/entry.hidden-window-preload.ts | 3 +- packages/insomnia/src/entry.main.ts | 10 +- packages/insomnia/src/entry.preload.ts | 2 +- .../insomnia-data/__tests__/project.test.ts | 21 -- .../src/insomnia-data/common-src/request.ts | 10 - packages/insomnia/src/insomnia-data/common.ts | 1 - packages/insomnia/src/insomnia-data/index.ts | 1 - packages/insomnia/src/insomnia-data/node.ts | 1 - .../main/__tests__/llm-config-service.test.ts | 5 +- packages/insomnia/src/main/analytics.ts | 5 +- packages/insomnia/src/main/api.protocol.ts | 3 +- .../src/main/authorize-user-in-window.ts | 3 +- packages/insomnia/src/main/backup.ts | 2 +- packages/insomnia/src/main/database.main.ts | 5 +- packages/insomnia/src/main/git-service.ts | 2 +- .../insomnia/src/main/importers/entities.ts | 3 +- .../src/main/importers/importers/curl.ts | 3 +- .../src/main/importers/importers/postman.ts | 2 +- packages/insomnia/src/main/install-plugin.ts | 2 +- packages/insomnia/src/main/ipc/grpc.ts | 5 +- packages/insomnia/src/main/ipc/main.ts | 2 +- .../insomnia/src/main/llm-config-service.ts | 2 +- packages/insomnia/src/main/mcp/common.ts | 2 +- .../src/main/mcp/oauth-client-provider.ts | 4 +- .../insomnia/src/main/mcp/transport-stdio.ts | 2 +- .../src/main/mcp/transport-streamable-http.ts | 4 +- packages/insomnia/src/main/mcp/types.ts | 5 +- packages/insomnia/src/main/network/curl.ts | 4 +- .../src/main/network/libcurl-promise.ts | 5 +- packages/insomnia/src/main/network/mcp.ts | 2 +- .../insomnia/src/main/network/multipart.ts | 3 +- .../src/main/network/parse-header-strings.ts | 3 +- .../insomnia/src/main/network/socket-io.ts | 12 +- .../insomnia/src/main/network/websocket.ts | 14 +- packages/insomnia/src/main/proxy.ts | 3 +- .../insomnia/src/main/secure-read-file.ts | 2 +- packages/insomnia/src/main/sentry.ts | 3 +- .../src/main/templating-worker-database.ts | 8 +- packages/insomnia/src/main/updates.ts | 3 +- packages/insomnia/src/main/window-utils.ts | 3 +- .../src/network/__tests__/certificate.test.ts | 3 +- .../src/network/__tests__/network.test.ts | 5 +- .../insomnia/src/network/authentication.ts | 3 +- .../src/network/basic-auth/get-header.ts | 2 +- .../src/network/bearer-auth/get-header.ts | 2 +- packages/insomnia/src/network/certificate.ts | 2 +- packages/insomnia/src/network/concurrency.ts | 3 +- .../grpc/__tests__/write-proto-file.test.ts | 3 +- .../network/grpc/proto-directory-loader.tsx | 2 +- .../src/network/grpc/write-proto-file.ts | 2 +- packages/insomnia/src/network/network.ts | 8 +- .../src/network/o-auth-1/get-token.ts | 3 +- .../src/network/o-auth-2/get-token.ts | 6 +- .../insomnia/src/network/set-cookie-util.ts | 2 +- .../insomnia/src/network/unit-test-feature.ts | 2 +- .../plugins/context/__tests__/request.test.ts | 3 +- .../context/__tests__/response.test.ts | 3 +- packages/insomnia/src/plugins/context/app.ts | 3 +- packages/insomnia/src/plugins/context/data.ts | 2 +- .../insomnia/src/plugins/context/network.ts | 3 +- .../insomnia/src/plugins/context/request.ts | 2 +- .../insomnia/src/plugins/context/response.ts | 2 +- .../insomnia/src/plugins/context/store.ts | 2 +- packages/insomnia/src/plugins/index.ts | 5 +- packages/insomnia/src/plugins/misc.ts | 5 +- packages/insomnia/src/root.tsx | 4 +- .../insomnia/src/routes/auth.authorize.tsx | 2 +- .../src/routes/auth.clear-vault-key.tsx | 2 +- packages/insomnia/src/routes/auth.login.tsx | 2 +- .../src/routes/auth.update-vault-salt.tsx | 2 +- .../src/routes/auth.validate-vault-key.tsx | 2 +- ...d-credentials.$cloudCredentialId.delete.ts | 2 +- ...d-credentials.$cloudCredentialId.update.ts | 2 +- .../src/routes/cloud-credentials.create.tsx | 2 +- packages/insomnia/src/routes/commands.tsx | 2 +- .../src/routes/git-credentials.$id.delete.tsx | 2 +- .../git-credentials.$id.related-projects.tsx | 2 +- .../src/routes/git-credentials.$id.update.tsx | 2 +- .../git-credentials.complete-sign-in.tsx | 2 +- .../src/routes/git-credentials.create.tsx | 2 +- .../insomnia/src/routes/git-credentials.tsx | 2 +- .../routes/git-credentials.update-sign-in.tsx | 2 +- .../src/routes/git.all-connected-repos.tsx | 2 +- .../insomnia/src/routes/import.resources.tsx | 2 +- ...ganizationId.collaborators-check-seats.tsx | 2 +- ...n.$organizationId.collaborators-search.tsx | 2 +- ...orators.invites.$invitationId.reinvite.tsx | 2 +- ...Id.collaborators.invites.$invitationId.tsx | 2 +- ...nization.$organizationId.collaborators.tsx | 2 +- ...ationId.insomnia-sync.pull-remote-file.tsx | 2 +- ....$organizationId.members.$userId.roles.tsx | 2 +- ...ganization.$organizationId.permissions.tsx | 2 +- ...ganizationId.project.$projectId._index.tsx | 2 +- ...ganizationId.project.$projectId.delete.tsx | 2 +- ...nId.project.$projectId.list-workspaces.tsx | 2 +- ...onId.project.$projectId.move-workspace.tsx | 2 +- ...organizationId.project.$projectId.move.tsx | 2 +- ...ion.$organizationId.project.$projectId.tsx | 2 +- ...ganizationId.project.$projectId.update.tsx | 2 +- ...d.workspace.$workspaceId.cacert.delete.tsx | 2 +- ...ctId.workspace.$workspaceId.cacert.new.tsx | 2 +- ...d.workspace.$workspaceId.cacert.update.tsx | 2 +- ...rkspace.$workspaceId.clientcert.delete.tsx | 2 +- ....workspace.$workspaceId.clientcert.new.tsx | 2 +- ...rkspace.$workspaceId.clientcert.update.tsx | 2 +- ...d.workspace.$workspaceId.debug.reorder.tsx | 2 +- ...Id.debug.request-group.$requestGroupId.tsx | 2 +- ...uest-group.$requestGroupId.update-meta.tsx | 2 +- ...g.request-group.$requestGroupId.update.tsx | 2 +- ...workspaceId.debug.request-group.delete.tsx | 2 +- ...kspaceId.debug.request-group.duplicate.tsx | 2 +- ...e.$workspaceId.debug.request-group.new.tsx | 2 +- ...aceId.debug.request.$requestId.connect.tsx | 4 +- ...eId.debug.request.$requestId.duplicate.tsx | 2 +- ....debug.request.$requestId.grant-access.tsx | 4 +- ...request.$requestId.response.delete-all.tsx | 2 +- ...bug.request.$requestId.response.delete.tsx | 2 +- ...kspaceId.debug.request.$requestId.send.tsx | 12 +- ....$workspaceId.debug.request.$requestId.tsx | 8 +- ...d.debug.request.$requestId.update-meta.tsx | 2 +- ...ebug.request.$requestId.update-payload.tsx | 2 +- ...paceId.debug.request.$requestId.update.tsx | 2 +- ...pace.$workspaceId.debug.request.delete.tsx | 2 +- ...orkspaceId.debug.request.new-mock-send.tsx | 2 +- ...rkspace.$workspaceId.debug.request.new.tsx | 4 +- ...Id.workspace.$workspaceId.debug.runner.tsx | 16 +- ...projectId.workspace.$workspaceId.debug.tsx | 26 +-- ...kspace.$workspaceId.environment.create.tsx | 2 +- ...kspace.$workspaceId.environment.delete.tsx | 2 +- ...ace.$workspaceId.environment.duplicate.tsx | 2 +- ...kspaceId.environment.set-active-global.tsx | 2 +- ...ce.$workspaceId.environment.set-active.tsx | 2 +- ...tId.workspace.$workspaceId.environment.tsx | 2 +- ...kspace.$workspaceId.environment.update.tsx | 2 +- ...kspaceId.insomnia-sync.branch.checkout.tsx | 2 +- ...orkspaceId.insomnia-sync.branch.delete.tsx | 2 +- ...kspaceId.insomnia-sync.create-snapshot.tsx | 2 +- ...space.$workspaceId.insomnia-sync.fetch.tsx | 2 +- ...kspace.$workspaceId.insomnia-sync.pull.tsx | 2 +- ...kspace.$workspaceId.insomnia-sync.push.tsx | 2 +- ...ace.$workspaceId.insomnia-sync.restore.tsx | 2 +- ...ce.$workspaceId.insomnia-sync.rollback.tsx | 2 +- ...e.$workspaceId.insomnia-sync.sync-data.tsx | 2 +- ...d.workspace.$workspaceId.insomnia-sync.tsx | 2 +- ....$projectId.workspace.$workspaceId.mcp.tsx | 2 +- ...ock-server.generate-request-collection.tsx | 2 +- ...-server.mock-route.$mockRouteId.delete.tsx | 2 +- ...Id.mock-server.mock-route.$mockRouteId.tsx | 18 +- ...-server.mock-route.$mockRouteId.update.tsx | 2 +- ...workspaceId.mock-server.mock-route.new.tsx | 2 +- ...tId.workspace.$workspaceId.mock-server.tsx | 2 +- ...aceId.spec.generate-request-collection.tsx | 2 +- ...$projectId.workspace.$workspaceId.spec.tsx | 2 +- ...tId.workspace.$workspaceId.spec.update.tsx | 2 +- ...tId.workspace.$workspaceId.test._index.tsx | 3 +- ...Id.test.test-suite.$testSuiteId._index.tsx | 2 +- ...Id.test.test-suite.$testSuiteId.delete.tsx | 2 +- ....test-suite.$testSuiteId.run-all-tests.tsx | 2 +- ...$testSuiteId.test-result.$testResultId.tsx | 2 +- ...-suite.$testSuiteId.test-result._index.tsx | 2 +- ...suite.$testSuiteId.test.$testId.delete.tsx | 2 +- ...st-suite.$testSuiteId.test.$testId.run.tsx | 2 +- ...suite.$testSuiteId.test.$testId.update.tsx | 2 +- ....test.test-suite.$testSuiteId.test.new.tsx | 2 +- ...rkspaceId.test.test-suite.$testSuiteId.tsx | 2 +- ...Id.test.test-suite.$testSuiteId.update.tsx | 2 +- ...space.$workspaceId.test.test-suite.new.tsx | 2 +- ...$projectId.workspace.$workspaceId.test.tsx | 2 +- ...rkspace.$workspaceId.toggle-expand-all.tsx | 2 +- ...ject.$projectId.workspace.$workspaceId.tsx | 4 +- ...rkspace.$workspaceId.update-cookie-jar.tsx | 2 +- ...tId.workspace.$workspaceId.update-meta.tsx | 2 +- ...Id.project.$projectId.workspace.delete.tsx | 2 +- ...onId.project.$projectId.workspace.move.tsx | 2 +- ...ionId.project.$projectId.workspace.new.tsx | 4 +- ...Id.project.$projectId.workspace.update.tsx | 2 +- ...ization.$organizationId.project._index.tsx | 2 +- ...ganization.$organizationId.project.new.tsx | 2 +- .../src/routes/organization._index.tsx | 2 +- ...zation.sync-organizations-and-projects.tsx | 2 +- .../insomnia/src/routes/organization.sync.tsx | 3 +- packages/insomnia/src/routes/organization.tsx | 2 +- packages/insomnia/src/routes/remote-files.tsx | 2 +- .../insomnia/src/routes/resource.usage.tsx | 2 +- .../insomnia/src/routes/settings.update.tsx | 3 +- packages/insomnia/src/routes/trial.check.tsx | 2 +- packages/insomnia/src/routes/trial.start.tsx | 2 +- .../src/routes/untracked-projects.tsx | 2 +- .../src/sync/__schemas__/model-schemas.ts | 3 +- .../sync/git/__tests__/ne-db-client.test.ts | 3 +- .../sync/git/__tests__/parse-git-path.test.ts | 3 +- .../src/sync/git/get-oauth2-format-name.ts | 2 +- packages/insomnia/src/sync/git/git-vcs.ts | 2 +- packages/insomnia/src/sync/git/migrations.ts | 3 +- .../insomnia/src/sync/git/ne-db-client.ts | 3 +- .../insomnia/src/sync/git/parse-git-path.ts | 2 +- .../src/sync/git/project-ne-db-client.ts | 3 +- .../insomnia/src/sync/git/providers/custom.ts | 3 +- .../insomnia/src/sync/git/providers/github.ts | 4 +- .../insomnia/src/sync/git/providers/gitlab.ts | 4 +- .../insomnia/src/sync/git/providers/index.ts | 4 +- .../src/sync/git/providers/registry.ts | 2 +- .../insomnia/src/sync/git/providers/types.ts | 3 +- .../insomnia/src/sync/git/shallow-clone.ts | 3 +- packages/insomnia/src/sync/git/utils.ts | 2 +- packages/insomnia/src/sync/ignore-keys.ts | 2 +- .../src/sync/store/drivers/graceful-rename.ts | 2 +- packages/insomnia/src/sync/types.ts | 2 +- .../sync/vcs/initialize-backend-project.ts | 2 +- .../vcs/migrate-projects-into-organization.ts | 2 +- .../src/sync/vcs/pull-backend-project.ts | 2 +- packages/insomnia/src/sync/vcs/util.ts | 5 +- packages/insomnia/src/sync/vcs/vcs.ts | 2 +- .../src/templating/base-extension-worker.ts | 2 +- .../insomnia/src/templating/base-extension.ts | 2 +- packages/insomnia/src/templating/types.ts | 5 +- packages/insomnia/src/templating/utils.ts | 2 +- .../.client/codemirror/code-editor.tsx | 2 +- .../codemirror/extensions/autocomplete.ts | 2 +- .../.client/codemirror/one-line-editor.tsx | 2 +- .../base/dropdown/dropdown-hint.tsx | 2 +- .../components/base/dropdown/item-content.tsx | 3 +- .../src/ui/components/command-palette.tsx | 4 +- .../ui/components/dropdowns/auth-dropdown.tsx | 3 +- .../dropdowns/content-type-dropdown.tsx | 5 +- .../dropdowns/git-project-sync-dropdown.tsx | 2 +- .../dropdowns/git-sync-dropdown.tsx | 2 +- .../dropdowns/mcp-actions-dropdown.tsx | 4 +- .../dropdowns/preview-mode-dropdown.tsx | 5 +- .../components/dropdowns/project-dropdown.tsx | 2 +- .../dropdowns/request-actions-dropdown.tsx | 12 +- .../request-group-actions-dropdown.tsx | 4 +- .../dropdowns/response-history-dropdown.tsx | 12 +- .../ui/components/dropdowns/sync-dropdown.tsx | 2 +- .../dropdowns/workspace-card-dropdown.tsx | 2 +- .../dropdowns/workspace-dropdown.tsx | 4 +- .../dropdowns/workspace-sync-dropdown.tsx | 2 +- .../components/editors/auth/auth-wrapper.tsx | 2 +- .../auth/components/auth-accordion.tsx | 2 +- .../auth/components/auth-select-row.tsx | 2 +- .../components/editors/auth/o-auth-1-auth.tsx | 3 +- .../components/editors/auth/o-auth-2-auth.tsx | 3 +- .../components/editors/body/body-editor.tsx | 5 +- .../editors/body/graph-ql-editor.tsx | 2 +- .../components/editors/environment-editor.tsx | 2 +- .../key-value-editor.tsx | 2 +- .../editors/mock-response-extractor.tsx | 2 +- .../editors/mock-response-headers-editor.tsx | 2 +- .../editors/request-headers-editor.tsx | 2 +- .../editors/request-parameters-editor.tsx | 2 +- .../editors/request-script-editor.tsx | 2 +- .../src/ui/components/environment-picker.tsx | 2 +- .../git-custom-credential-form.tsx | 2 +- .../src/ui/components/git/connection-info.tsx | 2 +- .../components/git/git-oauth-auth-banner.tsx | 2 +- .../ui/components/git/git-oauth-auth-utils.ts | 5 +- .../ui/components/github-app-config-link.tsx | 3 +- .../insomnia/src/ui/components/hotkey.tsx | 5 +- .../src/ui/components/keydown-binder.ts | 4 +- .../src/ui/components/mcp/event-view.tsx | 11 +- .../src/ui/components/mcp/mcp-pane.tsx | 2 +- .../ui/components/mcp/mcp-request-pane.tsx | 4 +- .../src/ui/components/mcp/mcp-roots-panel.tsx | 2 +- .../src/ui/components/mcp/mcp-url-bar.tsx | 4 +- .../insomnia/src/ui/components/mcp/types.ts | 3 +- .../components/mocks/mock-response-pane.tsx | 6 +- .../src/ui/components/mocks/mock-url-bar.tsx | 2 +- .../modals/__tests__/import-export.test.ts | 3 +- .../modals/add-key-combination-modal.tsx | 5 +- .../add-request-to-collection-modal.tsx | 4 +- .../aws-credential-form.tsx | 9 +- .../cloud-credential-modal.tsx | 2 +- .../gcp-credential-form.tsx | 3 +- .../hashicorp-credential-form.tsx | 7 +- .../ui/components/modals/cookies-modal.tsx | 2 +- .../modals/export-requests-modal.tsx | 3 +- .../components/modals/generate-code-modal.tsx | 2 +- .../modals/git-project-migration-modal.tsx | 2 +- .../git-repository-settings-modal.tsx | 2 +- .../modals/import-modal/import-modal.tsx | 2 +- .../import-modal/import-projects-modal.tsx | 2 +- .../modals/input-vault-key-modal.tsx | 2 +- .../modals/invite-modal/invite-form.tsx | 2 +- .../ui/components/modals/mock-route-modal.tsx | 2 +- .../components/modals/new-workspace-modal.tsx | 2 +- .../ui/components/modals/nunjucks-modal.tsx | 3 +- .../ui/components/modals/paste-curl-modal.tsx | 2 +- .../ui/components/modals/project-modal.tsx | 2 +- .../components/modals/proto-files-modal.tsx | 3 +- .../modals/request-group-settings-modal.tsx | 2 +- .../modals/request-render-error-modal.tsx | 5 +- .../modals/request-settings-modal.tsx | 12 +- .../modals/response-debug-modal.tsx | 3 +- .../components/modals/sync-delete-modal.tsx | 3 +- .../components/modals/sync-staging-modal.tsx | 2 +- .../modals/workspace-certificates-modal.tsx | 4 +- .../modals/workspace-duplicate-modal.tsx | 4 +- .../workspace-environments-edit-modal.tsx | 2 +- .../modals/workspace-settings-modal.tsx | 2 +- .../ui/components/panes/grpc-request-pane.tsx | 4 +- .../panes/placeholder-response-pane.tsx | 2 +- .../components/panes/request-group-pane.tsx | 2 +- .../src/ui/components/panes/request-pane.tsx | 6 +- .../panes/request-test-result-pane.tsx | 3 +- .../src/ui/components/panes/response-pane.tsx | 4 +- .../panes/runner-result-history-pane.tsx | 3 +- .../panes/runner-test-result-pane.tsx | 3 +- .../ui/components/project/git-repo-form.tsx | 2 +- .../project/project-create-form.tsx | 2 +- .../project/project-list-sidebar.tsx | 2 +- .../project/project-settings-form.tsx | 2 +- .../project/project-type-warning.tsx | 2 +- .../components/proto-file/proto-file-list.tsx | 3 +- .../ui/components/rendered-query-string.tsx | 8 +- .../src/ui/components/request-url-bar.tsx | 2 +- .../components/settings/boolean-setting.tsx | 2 +- .../settings/cloud-service-credentials.tsx | 2 +- .../ui/components/settings/credentials.tsx | 14 +- .../ui/components/settings/enum-setting.tsx | 2 +- .../src/ui/components/settings/general.tsx | 2 +- .../ui/components/settings/import-export.tsx | 4 +- .../ui/components/settings/masked-setting.tsx | 2 +- .../ui/components/settings/number-setting.tsx | 2 +- .../src/ui/components/settings/shortcuts.tsx | 10 +- .../settings/text-array-setting.tsx | 2 +- .../ui/components/settings/text-setting.tsx | 2 +- .../ui/components/socket-io/body-tab-pane.tsx | 2 +- .../components/socket-io/event-tab-pane.tsx | 3 +- .../ui/components/socket-io/event-view.tsx | 3 +- .../ui/components/socket-io/request-pane.tsx | 4 +- .../src/ui/components/tabs/tab-list.tsx | 2 +- .../insomnia/src/ui/components/tabs/tab.tsx | 3 +- .../src/ui/components/tags/method-tag.tsx | 5 +- .../external-vault/external-vault-form.tsx | 3 +- .../external-vault/hashicorp-vault-form.tsx | 2 +- .../templating/tag-editor-arg-sub-form.tsx | 3 +- .../ui/components/templating/tag-editor.tsx | 10 +- .../components/templating/variable-editor.tsx | 3 +- .../viewers/response-headers-viewer.tsx | 3 +- .../viewers/response-multipart-viewer.tsx | 2 +- .../viewers/response-timeline-viewer.tsx | 2 +- .../ui/components/viewers/response-viewer.tsx | 2 +- .../ui/components/websockets/action-bar.tsx | 2 +- .../websockets/disconnect-button.tsx | 3 +- .../ui/components/websockets/event-view.tsx | 2 +- .../websockets/realtime-response-pane.tsx | 16 +- .../websockets/websocket-preview-dropdown.tsx | 5 +- .../websockets/websocket-request-pane.tsx | 4 +- .../ui/context/app/insomnia-tab-context.tsx | 2 +- packages/insomnia/src/ui/database.client.ts | 4 +- packages/insomnia/src/ui/hooks/theme.ts | 2 +- .../src/ui/hooks/use-close-connection.ts | 3 +- .../src/ui/hooks/use-filtered-requests.ts | 3 +- .../insomnia/src/ui/hooks/use-insomnia-tab.ts | 12 +- .../ui/hooks/use-organization-features.tsx | 2 +- packages/insomnia/src/ui/hooks/use-plan.tsx | 2 +- packages/insomnia/src/ui/hooks/use-request.ts | 8 +- .../src/ui/hooks/use-runner-request-list.tsx | 2 +- .../ui/hooks/use-toggle-environment-type.tsx | 2 +- .../insomnia/src/ui/organization-utils.ts | 2 +- .../insomnia/src/ui/renderer-listeners.ts | 3 +- packages/insomnia/src/ui/sync-utils.ts | 5 +- packages/insomnia/src/ui/utils.ts | 3 +- packages/insomnia/src/ui/vault-key.client.ts | 3 +- .../src/utils/environment-utils.test.ts | 3 +- .../insomnia/src/utils/environment-utils.ts | 3 +- packages/insomnia/src/utils/invariant.ts | 2 +- packages/insomnia/src/utils/router.ts | 3 +- .../insomnia/src/utils/try-interpolate.ts | 4 +- .../src/utils/url/querystring.test.ts | 3 +- .../insomnia/src/utils/url/querystring.ts | 2 +- packages/insomnia/src/utils/vault.ts | 4 +- packages/insomnia/types/codemirror.d.ts | 2 +- packages/insomnia/types/global.d.ts | 2 +- packages/insomnia/vite.config.ts | 130 ++++++++++-- 559 files changed, 1282 insertions(+), 960 deletions(-) rename packages/{insomnia/src => }/insomnia-data/README.md (89%) create mode 100644 packages/insomnia-data/__mocks__/uuid.ts create mode 100644 packages/insomnia-data/common-src/constants.ts rename packages/{insomnia/src => }/insomnia-data/common-src/hotkeys.ts (100%) rename packages/{insomnia/src => }/insomnia-data/common-src/index.ts (92%) rename packages/{insomnia/src => }/insomnia-data/common-src/invariant.ts (100%) rename packages/{insomnia/src => }/insomnia-data/common-src/keyboard-keys.ts (100%) rename packages/{insomnia/src => }/insomnia-data/common-src/misc.ts (100%) rename packages/{insomnia/src => }/insomnia-data/common-src/ndjson.test.ts (100%) rename packages/{insomnia/src => }/insomnia-data/common-src/ndjson.ts (100%) rename packages/{insomnia/src => }/insomnia-data/common-src/platform.ts (87%) rename packages/{insomnia/src => }/insomnia-data/common-src/preview-mode.ts (100%) rename packages/{insomnia/src => }/insomnia-data/common-src/querystring.ts (100%) rename packages/{insomnia/src => }/insomnia-data/common-src/settings.ts (100%) rename packages/{insomnia/src => }/insomnia-data/common-src/strings.ts (100%) create mode 100644 packages/insomnia-data/common-src/tsconfig.json rename packages/{insomnia/src => }/insomnia-data/common-src/type.ts (100%) rename packages/{insomnia/src => }/insomnia-data/node-src/database/database-nedb.ts (99%) rename packages/{insomnia/src => }/insomnia-data/node-src/database/database.test.ts (92%) rename packages/{insomnia/src => }/insomnia-data/node-src/database/repair-database.ts (99%) rename packages/{insomnia/src => }/insomnia-data/node-src/index.ts (100%) rename packages/{insomnia/src => }/insomnia-data/node-src/services/api-spec.ts (92%) rename packages/{insomnia/src => }/insomnia-data/node-src/services/ca-certificate.ts (94%) rename packages/{insomnia/src => }/insomnia-data/node-src/services/client-certificate.ts (97%) rename packages/{insomnia/src => }/insomnia-data/node-src/services/cloud-credential.ts (94%) rename packages/{insomnia/src => }/insomnia-data/node-src/services/cookie-jar.ts (97%) rename packages/{insomnia/src => }/insomnia-data/node-src/services/environment.ts (98%) rename packages/{insomnia/src => }/insomnia-data/node-src/services/git-credentials.ts (96%) rename packages/{insomnia/src => }/insomnia-data/node-src/services/git-repository.ts (90%) rename packages/{insomnia/src => }/insomnia-data/node-src/services/grpc-request-meta.ts (94%) rename packages/{insomnia/src => }/insomnia-data/node-src/services/grpc-request.ts (95%) rename packages/{insomnia/src => }/insomnia-data/node-src/services/helpers/__tests__/is-model.test.ts (86%) rename packages/{insomnia/src => }/insomnia-data/node-src/services/helpers/__tests__/query-all-workspace-urls.test.ts (98%) rename packages/{insomnia/src => }/insomnia-data/node-src/services/helpers/index.ts (100%) rename packages/{insomnia/src => }/insomnia-data/node-src/services/helpers/query-all-workspace-urls.ts (79%) rename packages/{insomnia/src => }/insomnia-data/node-src/services/helpers/request-operations.ts (99%) rename packages/{insomnia/src => }/insomnia-data/node-src/services/helpers/response-operations.ts (98%) rename packages/{insomnia/src => }/insomnia-data/node-src/services/index.ts (100%) rename packages/{insomnia/src => }/insomnia-data/node-src/services/mcp-payload.ts (100%) rename packages/{insomnia/src => }/insomnia-data/node-src/services/mcp-request.ts (95%) rename packages/{insomnia/src => }/insomnia-data/node-src/services/mcp-response.ts (97%) rename packages/{insomnia/src => }/insomnia-data/node-src/services/mock-route.ts (91%) rename packages/{insomnia/src => }/insomnia-data/node-src/services/mock-server.ts (95%) rename packages/{insomnia/src => }/insomnia-data/node-src/services/o-auth-2-token.ts (91%) rename packages/{insomnia/src => }/insomnia-data/node-src/services/plugin-data.ts (92%) rename packages/{insomnia/src => }/insomnia-data/node-src/services/project.ts (91%) rename packages/{insomnia/src => }/insomnia-data/node-src/services/proto-directory.ts (89%) rename packages/{insomnia/src => }/insomnia-data/node-src/services/proto-file.ts (91%) rename packages/{insomnia/src => }/insomnia-data/node-src/services/request-group-meta.ts (88%) rename packages/{insomnia/src => }/insomnia-data/node-src/services/request-group.ts (95%) rename packages/{insomnia/src => }/insomnia-data/node-src/services/request-meta.ts (93%) rename packages/{insomnia/src => }/insomnia-data/node-src/services/request-version.ts (99%) rename packages/{insomnia/src => }/insomnia-data/node-src/services/request.ts (96%) rename packages/{insomnia/src => }/insomnia-data/node-src/services/response.ts (99%) rename packages/{insomnia/src => }/insomnia-data/node-src/services/runner-test-result.ts (91%) rename packages/{insomnia/src => }/insomnia-data/node-src/services/settings.ts (92%) rename packages/{insomnia/src => }/insomnia-data/node-src/services/socket-io-payload.ts (95%) rename packages/{insomnia/src => }/insomnia-data/node-src/services/socket-io-request.ts (95%) rename packages/{insomnia/src => }/insomnia-data/node-src/services/socket-io-response.ts (96%) rename packages/{insomnia/src => }/insomnia-data/node-src/services/stats.ts (97%) rename packages/{insomnia/src => }/insomnia-data/node-src/services/unit-test-result.ts (89%) rename packages/{insomnia/src => }/insomnia-data/node-src/services/unit-test-suite.ts (91%) rename packages/{insomnia/src => }/insomnia-data/node-src/services/unit-test.ts (89%) rename packages/{insomnia/src => }/insomnia-data/node-src/services/user-session.ts (92%) rename packages/{insomnia/src => }/insomnia-data/node-src/services/websocket-payload.ts (94%) rename packages/{insomnia/src => }/insomnia-data/node-src/services/websocket-request.ts (95%) rename packages/{insomnia/src => }/insomnia-data/node-src/services/websocket-response.ts (99%) rename packages/{insomnia/src => }/insomnia-data/node-src/services/workspace-meta.ts (93%) rename packages/{insomnia/src => }/insomnia-data/node-src/services/workspace.ts (93%) create mode 100644 packages/insomnia-data/node-src/tsconfig.json rename packages/{insomnia/src => }/insomnia-data/node-src/types.d.ts (100%) rename packages/{insomnia/src => }/insomnia-data/node-src/utils/index.ts (92%) rename packages/{insomnia/src => }/insomnia-data/node-src/utils/migrate/request.ts (96%) rename packages/{insomnia/src => }/insomnia-data/node-src/utils/migrate/response.ts (87%) rename packages/{insomnia/src => }/insomnia-data/node-src/utils/migrate/settings.ts (95%) rename packages/{insomnia/src => }/insomnia-data/node-src/utils/migrate/workspace.ts (96%) create mode 100644 packages/insomnia-data/package.json create mode 100644 packages/insomnia-data/setup-vitest.ts rename packages/{insomnia/src/insomnia-data => insomnia-data/src}/__tests__/git-credentials.test.ts (99%) rename packages/{insomnia/src/insomnia-data => insomnia-data/src}/__tests__/grpc-request-meta.test.ts (96%) rename packages/{insomnia/src/insomnia-data => insomnia-data/src}/__tests__/grpc-request.test.ts (97%) rename packages/{insomnia/src/insomnia-data => insomnia-data/src}/__tests__/index.test.ts (94%) create mode 100644 packages/insomnia-data/src/__tests__/project.test.ts rename packages/{insomnia/src/insomnia-data => insomnia-data/src}/__tests__/proto-file.test.ts (95%) rename packages/{insomnia/src/insomnia-data => insomnia-data/src}/__tests__/request-meta.test.ts (92%) rename packages/{insomnia/src/insomnia-data => insomnia-data/src}/__tests__/request.test.ts (99%) rename packages/{insomnia/src/insomnia-data => insomnia-data/src}/__tests__/response.test.ts (78%) rename packages/{insomnia/src/insomnia-data => insomnia-data/src}/__tests__/workspace.test.ts (81%) rename packages/{insomnia/src => }/insomnia-data/src/database/index.ts (94%) rename packages/{insomnia/src => }/insomnia-data/src/database/types.ts (100%) rename packages/{insomnia/src => }/insomnia-data/src/index.ts (100%) rename packages/{insomnia/src => }/insomnia-data/src/models/api-spec.ts (92%) rename packages/{insomnia/src => }/insomnia-data/src/models/base-types.ts (100%) rename packages/{insomnia/src => }/insomnia-data/src/models/ca-certificate.ts (100%) rename packages/{insomnia/src => }/insomnia-data/src/models/client-certificate.ts (100%) rename packages/{insomnia/src => }/insomnia-data/src/models/cloud-credential.ts (100%) rename packages/{insomnia/src => }/insomnia-data/src/models/cookie-jar.ts (100%) rename packages/{insomnia/src => }/insomnia-data/src/models/environment.ts (100%) rename packages/{insomnia/src => }/insomnia-data/src/models/git-credentials.ts (100%) rename packages/{insomnia/src => }/insomnia-data/src/models/git-repository.ts (100%) rename packages/{insomnia/src => }/insomnia-data/src/models/grpc-request-meta.ts (100%) rename packages/{insomnia/src => }/insomnia-data/src/models/grpc-request.ts (100%) rename packages/{insomnia/src => }/insomnia-data/src/models/index.ts (100%) rename packages/{insomnia/src => }/insomnia-data/src/models/mcp-payload.ts (100%) rename packages/{insomnia/src => }/insomnia-data/src/models/mcp-request.ts (100%) rename packages/{insomnia/src => }/insomnia-data/src/models/mcp-response.ts (100%) rename packages/{insomnia/src => }/insomnia-data/src/models/mock-route.ts (100%) rename packages/{insomnia/src => }/insomnia-data/src/models/mock-server.ts (94%) rename packages/{insomnia/src => }/insomnia-data/src/models/o-auth-2-token.ts (100%) rename packages/{insomnia/src => }/insomnia-data/src/models/organization.ts (100%) rename packages/{insomnia/src => }/insomnia-data/src/models/plugin-data.ts (100%) rename packages/{insomnia/src => }/insomnia-data/src/models/project.ts (98%) rename packages/{insomnia/src => }/insomnia-data/src/models/proto-directory.ts (91%) rename packages/{insomnia/src => }/insomnia-data/src/models/proto-file.ts (100%) rename packages/{insomnia/src => }/insomnia-data/src/models/request-group-meta.ts (100%) rename packages/{insomnia/src => }/insomnia-data/src/models/request-group.ts (100%) rename packages/{insomnia/src => }/insomnia-data/src/models/request-meta.ts (93%) rename packages/{insomnia/src => }/insomnia-data/src/models/request-version.ts (100%) rename packages/{insomnia/src => }/insomnia-data/src/models/request.ts (98%) rename packages/{insomnia/src => }/insomnia-data/src/models/response.ts (100%) rename packages/{insomnia/src => }/insomnia-data/src/models/runner-test-result.ts (100%) rename packages/{insomnia/src => }/insomnia-data/src/models/settings.ts (90%) rename packages/{insomnia/src => }/insomnia-data/src/models/socket-io-payload.ts (95%) rename packages/{insomnia/src => }/insomnia-data/src/models/socket-io-request.ts (100%) rename packages/{insomnia/src => }/insomnia-data/src/models/socket-io-response.ts (100%) rename packages/{insomnia/src => }/insomnia-data/src/models/stats.ts (100%) rename packages/{insomnia/src => }/insomnia-data/src/models/types.ts (98%) rename packages/{insomnia/src => }/insomnia-data/src/models/unit-test-result.ts (100%) rename packages/{insomnia/src => }/insomnia-data/src/models/unit-test-suite.ts (100%) rename packages/{insomnia/src => }/insomnia-data/src/models/unit-test.ts (100%) rename packages/{insomnia/src => }/insomnia-data/src/models/user-session.ts (91%) rename packages/{insomnia/src => }/insomnia-data/src/models/utils/replace-ids-in-fields.test.ts (100%) rename packages/{insomnia/src => }/insomnia-data/src/models/utils/replace-ids-in-fields.ts (100%) rename packages/{insomnia/src => }/insomnia-data/src/models/websocket-payload.ts (100%) rename packages/{insomnia/src => }/insomnia-data/src/models/websocket-request.ts (100%) rename packages/{insomnia/src => }/insomnia-data/src/models/websocket-response.ts (100%) rename packages/{insomnia/src => }/insomnia-data/src/models/workspace-meta.ts (100%) rename packages/{insomnia/src => }/insomnia-data/src/models/workspace.ts (97%) rename packages/{insomnia/src => }/insomnia-data/src/services/index.ts (100%) create mode 100644 packages/insomnia-data/src/tsconfig.json create mode 100644 packages/insomnia-data/tsconfig.base.json create mode 100644 packages/insomnia-data/vitest.config.ts delete mode 100644 packages/insomnia/src/insomnia-data/__tests__/project.test.ts delete mode 100644 packages/insomnia/src/insomnia-data/common-src/request.ts delete mode 100644 packages/insomnia/src/insomnia-data/common.ts delete mode 100644 packages/insomnia/src/insomnia-data/index.ts delete mode 100644 packages/insomnia/src/insomnia-data/node.ts diff --git a/eslint.config.mjs b/eslint.config.mjs index 0b222bc867..bb44bc2498 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -156,13 +156,13 @@ export default defineConfig([ }, // Block relative paths to insomnia-data { - group: ['./**/insomnia-data', './**/insomnia-data/**', '../**/insomnia-data', '../**/insomnia-data/**'], - message: "Please use '~/insomnia-data' instead of relative paths", + group: ['**/*/insomnia-data/**'], + message: "Please use 'insomnia-data' instead of relative paths", }, - // Only allow ~/insomnia-data, ~/insomnia-data/node and ~/insomnia-data/common + // Only allow insomnia-data, insomnia-data/node and insomnia-data/common { - regex: '^~/insomnia-data/(?!node($|/)|common($|/)).+', - message: "Only '~/insomnia-data', '~/insomnia-data/node' and '~/insomnia-data/common' are allowed", + regex: '^insomnia-data/(?!node($|/)|common($|/)).+', + message: "Only 'insomnia-data', 'insomnia-data/node' and 'insomnia-data/common' are allowed", }, ], }, diff --git a/package-lock.json b/package-lock.json index da96975f2a..d9f4449781 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,8 +11,8 @@ "license": "Apache-2.0", "workspaces": [ "packages/insomnia-testing", - "packages/insomnia-common", "packages/insomnia", + "packages/insomnia-data", "packages/insomnia-api", "packages/insomnia-inso", "packages/insomnia-smoke-test", @@ -20239,8 +20239,8 @@ "resolved": "packages/insomnia-api", "link": true }, - "node_modules/insomnia-common": { - "resolved": "packages/insomnia-common", + "node_modules/insomnia-data": { + "resolved": "packages/insomnia-data", "link": true }, "node_modules/insomnia-inso": { @@ -31407,6 +31407,11 @@ "license": "Apache-2.0" }, "packages/insomnia-common": { + "version": "12.4.0", + "extraneous": true, + "license": "Apache-2.0" + }, + "packages/insomnia-data": { "version": "12.4.0", "license": "Apache-2.0" }, diff --git a/package.json b/package.json index c20658c5d6..95c03098d5 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "workspaces": [ "packages/insomnia-testing", "packages/insomnia", + "packages/insomnia-data", "packages/insomnia-api", "packages/insomnia-inso", "packages/insomnia-smoke-test", diff --git a/packages/insomnia-api/tsconfig.json b/packages/insomnia-api/tsconfig.json index 1cf9c3d3a3..150bb9a7c3 100644 --- a/packages/insomnia-api/tsconfig.json +++ b/packages/insomnia-api/tsconfig.json @@ -11,7 +11,7 @@ "sourceMap": true, "baseUrl": ".", "rootDirs": ["."], - "lib": ["ES2023", "DOM"], + "lib": ["ES2023", "WebWorker"], "types": [], "strict": true, "noImplicitReturns": true, diff --git a/packages/insomnia/src/insomnia-data/README.md b/packages/insomnia-data/README.md similarity index 89% rename from packages/insomnia/src/insomnia-data/README.md rename to packages/insomnia-data/README.md index 4dd576235b..ae12a9578d 100644 --- a/packages/insomnia/src/insomnia-data/README.md +++ b/packages/insomnia-data/README.md @@ -95,9 +95,9 @@ Renderer services path: ### Main ```ts -import { initDatabase, initServices } from '~/insomnia-data'; +import { initDatabase, initServices } from 'insomnia-data'; import { mainDatabase } from '~/main/database.main'; -import { servicesNodeImpl } from '~/insomnia-data/node'; +import { servicesNodeImpl } from 'insomnia-data/node'; await initDatabase(mainDatabase); initServices(servicesNodeImpl); @@ -106,7 +106,7 @@ initServices(servicesNodeImpl); ### Renderer ```ts -import { initDatabase, initServices } from '~/insomnia-data'; +import { initDatabase, initServices } from 'insomnia-data'; import { clientDatabase } from '~/ui/database.client'; await initDatabase(clientDatabase); @@ -116,8 +116,8 @@ initServices(window._dataServices); ### Inso / Node ```ts -import { initDatabase, initServices } from '~/insomnia-data'; -import { createNedbDatabase, servicesNodeImpl } from '~/insomnia-data/node'; +import { initDatabase, initServices } from 'insomnia-data'; +import { createNedbDatabase, servicesNodeImpl } from 'insomnia-data/node'; await initDatabase(createNedbDatabase()); initServices(servicesNodeImpl); @@ -126,7 +126,7 @@ initServices(servicesNodeImpl); ### Consuming ```ts -import { services, models, type Request } from '~/insomnia-data'; +import { services, models, type Request } from 'insomnia-data'; const mcpRequest = await services.mcpRequest.create({ url: 'http://localhost:3000' }); const all = await services.mcpRequest.all(); diff --git a/packages/insomnia-data/__mocks__/uuid.ts b/packages/insomnia-data/__mocks__/uuid.ts new file mode 100644 index 0000000000..ac2147de9b --- /dev/null +++ b/packages/insomnia-data/__mocks__/uuid.ts @@ -0,0 +1,188 @@ +let v4Counter = 0; + +const v4UUIDs = [ + 'cc1dd2ca-4275-747a-a881-99e8efd42403', + 'dd2ccc1a-2745-477a-881a-9e8ef9d42403', + 'e3e96e5f-dd68-4229-8b66-dee1f0940f3d', + 'a262d22b-5fa8-491c-9bd9-58fba03e301e', + '2e7c2688-09ee-44b8-900d-5cbbaa7d3a19', + 'e7d698c4-c7d2-409c-90c6-22bcc94ba4ab', + 'fcef5ff8-4f78-4f16-bad4-9bdddc1c3daf', + '7cc5b3e1-3333-4419-b370-6fcaa05c15ab', + 'd911be1d-69f6-4cb1-8312-2c3b7f0c647c', + 'ac47b0b9-aded-4968-b569-239598b7d7d1', + '4093d252-02b6-464f-a723-494a35a7b862', + '6d233089-e303-450b-9f1a-f6f6e6869e27', + '874d55b5-2526-4476-8964-85f7cd685705', + 'e2a5848c-f908-4a0e-8b0a-727edbcafe89', + '67884e55-155e-43fc-a7ad-97d23e853241', + '130929e6-4953-45a5-9a25-b3df6fa8dca8', + 'd854aa77-5389-4690-be5e-52fd3c5c0551', + 'a5218a75-61c1-4f86-8f09-09c5c1831e7b', + '5fd86b39-825e-4b12-a163-6dd5592b8172', + '8c4b90c5-1cf7-4c28-a60b-ec156be97a7f', + '3f913e38-c08e-4839-95f6-32788141951f', + '884b5a86-5e6d-49ef-8bea-b5dcb7564cdc', + '2fea36e5-4e92-4da6-8088-2821f580cf20', + '1e310193-7209-430d-9ed2-f8d73ec932b5', + '9996a7f7-ff6a-414e-9a75-2adadbde88a9', + '562f0a86-0d2a-4137-b9c7-ff92b70939b4', + 'c62e98f8-def0-4560-bcb6-59ac1d64ac61', + '548b6bbb-b224-408f-9f38-215b0c40bd71', + 'e2ee0259-98ca-4c0e-a7c4-3b29beae901c', + '782c08cd-e725-4089-8023-ffce72d1c853', + '9b176a7f-1e50-4ebd-8758-2d4c3197fb24', + 'e29ffcfc-d277-4302-92bf-d279e4b8d03f', + 'f6b81add-3e80-49dc-86ef-f2f43ad13f9d', + 'a5a9bb1e-67f4-4cfe-a3cd-cdf802378eb9', + '95b2f335-87f7-4257-b069-197242408660', + '9b5ad4fc-0b14-4d13-8d01-7e6fde1b48b7', + 'a37d9af3-1f60-47c0-a114-4ae345d3005c', + 'e5540caa-f250-42f7-b5a5-c4d60963569f', + '7ea6be14-582f-4105-9905-a30f2be72ad8', + '9fc10ee2-6135-454d-9aa8-b2a82b766c03', + '40492eb7-a9c1-4d67-b49b-c7c6be8d9ccd', + 'c939099b-6b8c-4acd-9738-883c409b713c', + 'ed9adb1e-e27f-484c-9d32-3f351759c757', + '73781cfd-6d55-47b2-8735-8e90ee8d8320', + 'd983abdb-ab5a-44f8-888a-2d98c123db54', + '8acca410-43ec-4d75-b553-97ea0de8735f', + '8a5a2550-1289-4bef-903c-9ce3c9c9d5c5', + '041462ba-dbfc-4381-b34b-1d03c043f10e', + 'f7dd76f2-efd8-439b-a2d3-89f09570bea8', + '9e4ccefd-5968-4dc2-83e3-b9a8e1815a1b', + '9654696e-747c-4116-b197-94e31d2daaff', + 'eba603bc-a93c-4fa6-86d0-01a6dfccb3bd', + '9d1b76df-8a02-4d86-ae0c-0423cf41e097', + '38511ada-296b-4353-8fca-131b67283016', + 'f1a6d808-8b2b-4502-b42a-5ca4fcfa5b51', + 'a6d670f1-bbbd-45fa-8834-ffccb4292ee1', + 'c8a35834-c4a3-4950-915b-8ec0af8a957a', + '23fcf651-d24e-4a5d-8631-f5f7d54143c5', + '5d0dc5e0-a827-4b1a-b787-4050ab15deba', + '32a1b905-15c5-48b3-b9a3-59c9f4f14b27', + '97a340b2-91e3-4c9e-9040-e751291e533e', + 'c352d95b-c77a-4192-9e52-2b43e5d45c75', + '65c46c7b-d7f9-4367-84af-51018a68beec', + '304a7d57-9d08-4b8f-983f-14d69c49f8fe', + '817124d8-e40b-400e-8165-ee6cb4459ffe', + '033caad7-5765-426a-ac55-7d95f63550b6', + '395177a1-b026-49c1-abf0-e95bcde88c3b', + 'af8642aa-ff28-4aca-b32e-02e6772d0399', + '719fd155-a11b-415f-a042-6293c143793f', + '46409dfc-a668-4922-8a6b-245588a363c6', + 'ff89d2bc-6781-4a09-a2fa-4c9fc9d8f539', + '6d6e6070-c192-46dc-ae1a-4b819828fbae', + '650345e6-73c5-49f1-92cc-b16f70dfabf0', + '8d85d153-da68-4123-a3f8-03753be9c7e8', + '185dc090-3fcc-44e3-8a17-4e2fa792f91a', + 'f8e9aae9-1e6f-45c3-923a-74af73f4091e', + '73415a9e-2f83-48c6-814a-7aed39e54247', + 'f2e38b71-2a4a-41e2-bc90-162b0e2cc64f', + 'f8db47d9-cfac-4fd9-8ed0-f510ff0005d0', + 'aabeb013-7093-4d32-ba97-e4e281a7dffd', + '57b034dd-7ac9-4e40-a5ff-9833c1d516fc', + '93375f26-ada3-4490-af12-91f6858b64fc', + '4e819358-b61e-42fa-aa05-286de238f2f6', + 'b61fe05c-a8c3-439e-8c78-7ee52e223e8a', + 'e558ea51-6f7f-4b0e-99d3-46df7ae61a84', + 'acd531c1-9f6c-44ff-ba1b-95f71a37e06b', + '0b3c8769-6048-4dfd-9372-c96da8d10193', + '2fe19a46-e764-4529-9ac4-e37c6b396e1e', + '819a28c7-f967-45b8-b94f-59726d425270', + 'f0135da4-9d86-4eb8-8292-0405fa8cd2c4', + 'd72ac779-4874-48ec-af86-b409a0f8ef31', + '108077e9-7b41-4169-aeed-34b145202efe', + '7aa43e17-9a14-48dc-8c96-c4281abbb332', + '1a509a8f-c213-484a-a85b-389ccb1be529', + '5798513c-be4c-4deb-be4c-9cafa30f4ff8', + 'fac20481-0235-4af5-b2ae-fed135a5e1e2', + '86ef9755-a5bb-4068-9273-a5ca4cef6912', + '850bbe11-da72-407c-ac75-37ba7b9597e3', + '433d68f7-c02f-49b1-9faa-6f40520b9dfe', + 'd14e8023-1bab-49be-b9fe-8b8987f7b489', + 'f78feb38-4aa3-4801-b56d-0e43a9361bfc', + 'd4a187c0-a41a-4ed6-8206-1982c85131d3', + '0baf29de-0f22-47c3-8640-031411ac3acc', + '7881ddc2-c254-4f42-8d8a-3ba546a725b2', + 'f52cb36f-36d2-4b7c-860a-8e8b2b8b1b2d', + '618f9080-765e-44e4-8688-551e57335834', + 'a92a4561-55e7-4cae-b0ad-cfd88c3b8549', + '5d7b9373-8fbf-427c-988b-ab70216eb1a3', + 'f2b2eb42-98fc-4d0c-b76c-82453e7a7ad4', + 'ae9ee599-0361-4a6c-9e28-33769683b91d', + 'eaeb7546-83f4-4364-8775-c5f8c925d152', + '60546de5-bce0-4f1f-9572-3d5a24488126', + '496b2a9b-8082-4a31-829b-9ddaea1b8d72', + 'e86f7fd3-5e55-476e-9d54-88999db045f1', + 'b4df19ab-cee5-400f-a9e1-3d9a1ca60ab4', + '286c5332-3abe-49b4-a94a-b3f74c99a1aa', + '81115d6d-643c-466a-b602-6b6a9e2af463', + 'b9c0d5cd-7b23-4a0f-910f-2d74cdccc46b', + '088c5dc0-5d4c-4a90-840a-f1109013625d', + '46cf7b21-b0f2-483a-a816-d88699f15724', + 'ac7c54c5-4f41-4878-957f-8f5680302ee5', + 'de61c088-b9e3-4975-a3bd-61401d0f34ea', + 'c898f4c8-3611-447f-a59d-c6dc57b20c6f', + '054f8331-8e90-402f-b321-cd9817c9b872', + 'd1f97e08-e66d-4738-a549-7e5ce5684b89', + 'c43a794a-26c4-4de9-96bd-6570ae8901f2', + '8d979e7a-5bb8-4daa-92c0-530c575592e8', + '5ec098a9-b638-4f91-a69c-4c877801df45', + 'a4bdd1cf-9b8c-4914-a728-57a1f5245b2a', + 'dfd687ff-6bdf-4ae2-a364-8f1a8abd29d4', + 'b6324133-b493-45f4-8598-c8c70b0df90e', + '057b64e9-3457-48d7-8368-d58760b6fc92', + '1351c083-0b5a-4fe6-87d3-801239ac42a6', + 'c0292658-18b4-4273-aae3-5af6b523fc65', + '3616f400-4431-423d-b905-1a70904be63d', + 'ae735815-4a74-4af4-bc82-045f43f3d1ca', + '1fd9e4bb-f592-4e5d-829e-2910222ec8c9', + '30f4e69c-40d3-4402-8075-c85a3a801a6a', + '9f3ddbf3-168a-483a-bd9d-1ffade99e816', + 'c777722e-5e72-41bb-a7a5-bbbdfe67e630', + '72a7b8c8-c342-4dd2-b413-1a09f24e70a8', + 'd09c92df-e933-4016-af2f-89a99ce314ac', + '22789e02-6e3e-490b-9c41-5e8a9d161ebc', + '8374dcad-f51d-4c3c-b6ec-04b32644379b', + 'a34c9403-ee6f-4251-a8d3-838df56c33c5', + '1b5165df-40c0-4832-8f9e-b5bc2df40c37', + '2594664b-0eb9-43a1-859f-2726f763b76d', + '86b94bd5-920e-468b-81c8-90bf502b39bb', + 'b394e352-e825-4dd1-b8e4-f03db6f5178d', + '7d7b18f0-279f-4fc6-8fdc-3636d1bb76c8', + '7fe9cc76-513b-4272-b54c-bfd91710b92a', + '0b3cd1d8-994b-4e17-9a0d-2d01462b7bac', + '131123b5-6290-45cb-b0dc-f96d82031f2c', + '20c61fcd-17a4-409e-b53c-d19053b7657c', + 'fe57563b-2817-45a0-a5a6-d6d852824341', + '724cce37-0290-4bb4-a385-e97af88ff308', + '9ed98b9a-4d51-49d2-bdd9-ff983a664bd8', + '321ad5af-fa69-46ca-a1e6-38c43df6c4d1', + 'a7eced90-a8ce-4891-bb4d-6931d2e63c42', + '002f4512-6ab4-4a67-afde-120263f719bf', + '3d888a45-c790-443a-b299-79bdbf180ea9', + '166028e4-4cfd-4749-a898-c452cb4e5e3c', + '596dc54c-34cd-4474-85ca-50c7b2bb4dec', + '837b2e19-2258-47b6-9dd5-44f1729b916b', + '5f5407de-f1bf-4fcc-a8c4-cd48920c5aef', + 'b6f634ea-ffcd-4de1-9669-0031dc689d61', + '4d7494dd-90b6-45e7-8412-2dd554e20ce7', + 'aabf6703-5cb1-4f6c-bda2-bbf9f2137628', + '7d6664fc-cb45-49be-95c9-4642d9fd8e1b', + '3b47c3fb-a0f4-4dbc-8f99-19ed905cadf3', + '2d31a2db-7791-4270-94c6-1653a3775c1a', + '90160273-9bef-442b-aa36-393bdb3fcf38', + '4d02d9bc-d81b-41da-b1e0-2d1ffde96103', + 'f8be054e-651d-4542-a3e4-681a4a2ec9d0', + '966e9995-938a-4a5e-813c-de3691dddb3a', +]; + +export function v4Mock() { + const uuid = v4UUIDs[v4Counter++]; + if (!uuid) { + throw new Error('Not enough mocked v4 UUIDs to go around'); + } + + return uuid; +} diff --git a/packages/insomnia-data/common-src/constants.ts b/packages/insomnia-data/common-src/constants.ts new file mode 100644 index 0000000000..981402bac7 --- /dev/null +++ b/packages/insomnia-data/common-src/constants.ts @@ -0,0 +1,30 @@ +export const CONTENT_TYPE_FORM_URLENCODED = 'application/x-www-form-urlencoded'; +export const CONTENT_TYPE_GRAPHQL = 'application/graphql'; +export const METHOD_GET = 'GET'; +export const CONTENT_TYPE_JSON = 'application/json'; + +export function getContentTypeFromHeaders(headers: any[], defaultValue: string | null = null) { + if (!Array.isArray(headers)) { + return null; + } + + const header = headers.find(({ name }) => name.toLowerCase() === 'content-type'); + return header ? header.value : defaultValue; +} + +// Vite is filtering out process.env variables that are not prefixed with VITE_. +const ENV = 'env'; + +const env = process[ENV]; + +export const getMockServiceURL = () => env.INSOMNIA_MOCK_API_URL || 'https://mock.insomnia.run'; + +export type OAuth1SignatureMethod = 'HMAC-SHA1' | 'RSA-SHA1' | 'HMAC-SHA256' | 'PLAINTEXT'; +export const SIGNATURE_METHOD_HMAC_SHA1: OAuth1SignatureMethod = 'HMAC-SHA1'; +export const SIGNATURE_METHOD_HMAC_SHA256: OAuth1SignatureMethod = 'HMAC-SHA256'; +export const SIGNATURE_METHOD_RSA_SHA1: OAuth1SignatureMethod = 'RSA-SHA1'; +export const SIGNATURE_METHOD_PLAINTEXT: OAuth1SignatureMethod = 'PLAINTEXT'; + +export const getAppDefaultTheme = () => 'default'; +export const getAppDefaultLightTheme = () => 'studio-light'; +export const getAppDefaultDarkTheme = () => 'default'; diff --git a/packages/insomnia/src/insomnia-data/common-src/hotkeys.ts b/packages/insomnia-data/common-src/hotkeys.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/common-src/hotkeys.ts rename to packages/insomnia-data/common-src/hotkeys.ts diff --git a/packages/insomnia/src/insomnia-data/common-src/index.ts b/packages/insomnia-data/common-src/index.ts similarity index 92% rename from packages/insomnia/src/insomnia-data/common-src/index.ts rename to packages/insomnia-data/common-src/index.ts index 98f2817ca6..4be9441f92 100644 --- a/packages/insomnia/src/insomnia-data/common-src/index.ts +++ b/packages/insomnia-data/common-src/index.ts @@ -3,7 +3,7 @@ export * from './invariant'; export * from './ndjson'; export * from './type'; export * from './misc'; -export * from './request'; +export * from './constants'; export * from './preview-mode'; export * from './platform'; export * from './strings'; diff --git a/packages/insomnia/src/insomnia-data/common-src/invariant.ts b/packages/insomnia-data/common-src/invariant.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/common-src/invariant.ts rename to packages/insomnia-data/common-src/invariant.ts diff --git a/packages/insomnia/src/insomnia-data/common-src/keyboard-keys.ts b/packages/insomnia-data/common-src/keyboard-keys.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/common-src/keyboard-keys.ts rename to packages/insomnia-data/common-src/keyboard-keys.ts diff --git a/packages/insomnia/src/insomnia-data/common-src/misc.ts b/packages/insomnia-data/common-src/misc.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/common-src/misc.ts rename to packages/insomnia-data/common-src/misc.ts diff --git a/packages/insomnia/src/insomnia-data/common-src/ndjson.test.ts b/packages/insomnia-data/common-src/ndjson.test.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/common-src/ndjson.test.ts rename to packages/insomnia-data/common-src/ndjson.test.ts diff --git a/packages/insomnia/src/insomnia-data/common-src/ndjson.ts b/packages/insomnia-data/common-src/ndjson.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/common-src/ndjson.ts rename to packages/insomnia-data/common-src/ndjson.ts diff --git a/packages/insomnia/src/insomnia-data/common-src/platform.ts b/packages/insomnia-data/common-src/platform.ts similarity index 87% rename from packages/insomnia/src/insomnia-data/common-src/platform.ts rename to packages/insomnia-data/common-src/platform.ts index dea29997ac..421d882c70 100644 --- a/packages/insomnia/src/insomnia-data/common-src/platform.ts +++ b/packages/insomnia-data/common-src/platform.ts @@ -4,8 +4,15 @@ interface INodeProcess { platform: string; } +declare const window: { + app?: { + process: INodeProcess; + }; +}; + let nodeProcess: INodeProcess | undefined; if ( + // eslint-disable-next-line unicorn/no-typeof-undefined typeof window !== 'undefined' && window.app?.process !== undefined && typeof window.app.process.platform === 'string' diff --git a/packages/insomnia/src/insomnia-data/common-src/preview-mode.ts b/packages/insomnia-data/common-src/preview-mode.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/common-src/preview-mode.ts rename to packages/insomnia-data/common-src/preview-mode.ts diff --git a/packages/insomnia/src/insomnia-data/common-src/querystring.ts b/packages/insomnia-data/common-src/querystring.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/common-src/querystring.ts rename to packages/insomnia-data/common-src/querystring.ts diff --git a/packages/insomnia/src/insomnia-data/common-src/settings.ts b/packages/insomnia-data/common-src/settings.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/common-src/settings.ts rename to packages/insomnia-data/common-src/settings.ts diff --git a/packages/insomnia/src/insomnia-data/common-src/strings.ts b/packages/insomnia-data/common-src/strings.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/common-src/strings.ts rename to packages/insomnia-data/common-src/strings.ts diff --git a/packages/insomnia-data/common-src/tsconfig.json b/packages/insomnia-data/common-src/tsconfig.json new file mode 100644 index 0000000000..564332d319 --- /dev/null +++ b/packages/insomnia-data/common-src/tsconfig.json @@ -0,0 +1,8 @@ +{ + "extends": "../tsconfig.base.json", + "compilerOptions": { + "lib": ["ES2023", "WebWorker"], + "types": [] + }, + "include": ["./**/*.ts"] +} diff --git a/packages/insomnia/src/insomnia-data/common-src/type.ts b/packages/insomnia-data/common-src/type.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/common-src/type.ts rename to packages/insomnia-data/common-src/type.ts diff --git a/packages/insomnia/src/insomnia-data/node-src/database/database-nedb.ts b/packages/insomnia-data/node-src/database/database-nedb.ts similarity index 99% rename from packages/insomnia/src/insomnia-data/node-src/database/database-nedb.ts rename to packages/insomnia-data/node-src/database/database-nedb.ts index f960b7b335..c0ac24cee3 100644 --- a/packages/insomnia/src/insomnia-data/node-src/database/database-nedb.ts +++ b/packages/insomnia-data/node-src/database/database-nedb.ts @@ -5,7 +5,6 @@ import os from 'node:os'; import fsPath from 'node:path'; import NeDB from '@seald-io/nedb'; - import { type AllTypes, type ApiSpec, @@ -25,8 +24,8 @@ import { type Query, type Workspace, type WorkspaceMeta, -} from '~/insomnia-data'; -import { generateId } from '~/insomnia-data/common'; +} from 'insomnia-data'; +import { generateId } from 'insomnia-data/common'; import { initModel } from '../utils'; import { repairDatabase } from './repair-database'; diff --git a/packages/insomnia/src/insomnia-data/node-src/database/database.test.ts b/packages/insomnia-data/node-src/database/database.test.ts similarity index 92% rename from packages/insomnia/src/insomnia-data/node-src/database/database.test.ts rename to packages/insomnia-data/node-src/database/database.test.ts index 5a34b92b09..dd88f45d54 100644 --- a/packages/insomnia/src/insomnia-data/node-src/database/database.test.ts +++ b/packages/insomnia-data/node-src/database/database.test.ts @@ -1,8 +1,8 @@ +import type { BaseModel, ChangeBufferEvent, CookieJar, Environment, Request, Workspace } from 'insomnia-data'; +import { database as db, models, services } from 'insomnia-data'; import { afterEach, assert, beforeEach, describe, expect, it, vi } from 'vitest'; -import type { ChangeBufferEvent } from '../..'; -import { type BaseModel, models, services } from '../..'; -import { database as db } from '../..'; +import * as workspaceMigration from '../utils/migrate/workspace'; import { repairDatabase } from './repair-database'; describe('init()', () => { @@ -26,14 +26,12 @@ describe('onChange()', () => { type: models.request.type, parentId: 'nothing', name: 'foo', - }; - const changesSeen: ChangeBufferEvent[] = []; + } as const; + const changesSeen: ChangeBufferEvent[][] = []; - const callback = change => { + db.onChange(change => { changesSeen.push(change); - }; - - db.onChange(callback); + }); const newDoc = await services.request.create(doc); const updatedDoc = await services.request.update(newDoc, { name: 'bar', @@ -48,14 +46,12 @@ describe('bufferChanges()', () => { type: models.request.type, parentId: 'n/a', name: 'foo', - }; - const changesSeen: ChangeBufferEvent[] = []; + } as const; + const changesSeen: ChangeBufferEvent[][] = []; - const callback = change => { + db.onChange(change => { changesSeen.push(change); - }; - - db.onChange(callback); + }); await db.bufferChanges(); const newDoc = await services.request.create(doc); // @ts-expect-error -- TSCONVERSION appears to be genuine @@ -85,14 +81,12 @@ describe('bufferChanges()', () => { type: models.request.type, parentId: 'n/a', name: 'foo', - }; - const changesSeen: ChangeBufferEvent[] = []; + } as const; + const changesSeen: ChangeBufferEvent[][] = []; - const callback = change => { + db.onChange(change => { changesSeen.push(change); - }; - - db.onChange(callback); + }); await db.bufferChanges(); const newDoc = await services.request.create(doc); // @ts-expect-error -- TSCONVERSION appears to be genuine @@ -112,14 +106,12 @@ describe('bufferChanges()', () => { type: models.request.type, parentId: 'n/a', name: 'foo', - }; - const changesSeen: ChangeBufferEvent[] = []; + } as const; + const changesSeen: ChangeBufferEvent[][] = []; - const callback = change => { + db.onChange(change => { changesSeen.push(change); - }; - - db.onChange(callback); + }); await db.bufferChanges(500); const newDoc = await services.request.create(doc); // @ts-expect-error -- TSCONVERSION appears to be genuine @@ -140,14 +132,12 @@ describe('bufferChangesIndefinitely()', () => { type: models.request.type, parentId: 'n/a', name: 'foo', - }; - const changesSeen: ChangeBufferEvent[] = []; + } as const; + const changesSeen: ChangeBufferEvent[][] = []; - const callback = change => { + db.onChange(change => { changesSeen.push(change); - }; - - db.onChange(callback); + }); await db.bufferChangesIndefinitely(); const newDoc = await services.request.create(doc); // @ts-expect-error -- TSCONVERSION appears to be genuine @@ -261,10 +251,10 @@ describe('_repairDatabase()', async () => { }); // Make sure we have 6 environments and one workspace expect((await db.getWithDescendants(workspace)).length).toBe(7); - const descendants = (await db.getWithDescendants(workspace)).map(d => ({ + const descendants = ((await db.getWithDescendants(workspace)) as (Workspace | Environment)[]).map(d => ({ _id: d._id, parentId: d.parentId, - data: d.data || null, + data: 'data' in d ? d.data || null : null, })); expect(descendants).toEqual([ { @@ -322,10 +312,10 @@ describe('_repairDatabase()', async () => { await repairDatabase(); // Make sure things get adjusted - const descendants2 = (await db.getWithDescendants(workspace)).map(d => ({ + const descendants2 = ((await db.getWithDescendants(workspace)) as (Workspace | Environment)[]).map(d => ({ _id: d._id, parentId: d.parentId, - data: d.data || null, + data: 'data' in d ? d.data || null : null, })); expect(descendants2).toEqual([ { @@ -423,9 +413,9 @@ describe('_repairDatabase()', async () => { }); // Make sure we have 2 cookie jars and one workspace expect((await db.getWithDescendants(workspace)).length).toBe(3); - const descendants = (await db.getWithDescendants(workspace)).map(d => ({ + const descendants = ((await db.getWithDescendants(workspace)) as (Workspace | CookieJar)[]).map(d => ({ _id: d._id, - cookies: d.cookies || null, + cookies: 'cookies' in d ? d.cookies || null : null, parentId: d.parentId, })); expect(descendants).toEqual([ @@ -470,9 +460,9 @@ describe('_repairDatabase()', async () => { // Run the fix algorithm await repairDatabase(); // Make sure things get adjusted - const descendants2 = (await db.getWithDescendants(workspace)).map(d => ({ + const descendants2 = ((await db.getWithDescendants(workspace)) as (Workspace | CookieJar)[]).map(d => ({ _id: d._id, - cookies: d.cookies || null, + cookies: 'cookies' in d ? d.cookies || null : null, parentId: d.parentId, })); expect(descendants2).toEqual([ @@ -598,14 +588,13 @@ describe('duplicate()', () => { }); expect(duplicated._id).not.toEqual(workspace._id); expect(duplicated._id).toMatch(/^wrk_[a-z0-9]{32}$/); - delete workspace._id; - delete duplicated._id; expect(duplicated).toEqual({ ...workspace, description: newDescription, modified: date, created: date, type: models.workspace.type, + _id: expect.any(String), }); }); @@ -613,7 +602,7 @@ describe('duplicate()', () => { const workspace = await services.workspace.create({ name: 'Test Workspace', }); - const spy = vi.spyOn(models.workspace, 'migrate'); + const spy = vi.spyOn(workspaceMigration, 'migrate'); await db.duplicate(workspace); expect(spy).not.toHaveBeenCalled(); }); @@ -651,7 +640,7 @@ describe('duplicate()', () => { expect(dupReq2!.url).toContain("{% response 'body',"); // Original should be unchanged - const originalReq2 = await db.findOne(models.request.type, { _id: req2._id }); + const originalReq2 = await db.findOne(models.request.type, { _id: req2._id }); expect(originalReq2!.url).toContain(req1._id); }); }); @@ -660,7 +649,7 @@ describe('docCreate()', () => { afterEach(() => vi.restoreAllMocks()); it('should call migrate when creating', async () => { - const spy = vi.spyOn(models.workspace, 'migrate'); + const spy = vi.spyOn(workspaceMigration, 'migrate'); await db.docCreate(models.workspace.type, { name: 'Test Workspace', }); diff --git a/packages/insomnia/src/insomnia-data/node-src/database/repair-database.ts b/packages/insomnia-data/node-src/database/repair-database.ts similarity index 99% rename from packages/insomnia/src/insomnia-data/node-src/database/repair-database.ts rename to packages/insomnia-data/node-src/database/repair-database.ts index 99c001c217..f64d90e343 100644 --- a/packages/insomnia/src/insomnia-data/node-src/database/repair-database.ts +++ b/packages/insomnia-data/node-src/database/repair-database.ts @@ -6,7 +6,7 @@ import { models, services, type Workspace, -} from '~/insomnia-data'; +} from 'insomnia-data'; /** * Run various database repair scripts diff --git a/packages/insomnia/src/insomnia-data/node-src/index.ts b/packages/insomnia-data/node-src/index.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/node-src/index.ts rename to packages/insomnia-data/node-src/index.ts diff --git a/packages/insomnia/src/insomnia-data/node-src/services/api-spec.ts b/packages/insomnia-data/node-src/services/api-spec.ts similarity index 92% rename from packages/insomnia/src/insomnia-data/node-src/services/api-spec.ts rename to packages/insomnia-data/node-src/services/api-spec.ts index faa22fe7c2..f99eb6bf90 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/api-spec.ts +++ b/packages/insomnia-data/node-src/services/api-spec.ts @@ -1,4 +1,4 @@ -import { type ApiSpec, database as db, models } from '~/insomnia-data'; +import { type ApiSpec, database as db, models } from 'insomnia-data'; const { type } = models.apiSpec; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/ca-certificate.ts b/packages/insomnia-data/node-src/services/ca-certificate.ts similarity index 94% rename from packages/insomnia/src/insomnia-data/node-src/services/ca-certificate.ts rename to packages/insomnia-data/node-src/services/ca-certificate.ts index a9cca689e3..6e97c0cd8d 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/ca-certificate.ts +++ b/packages/insomnia-data/node-src/services/ca-certificate.ts @@ -1,4 +1,4 @@ -import type { CaCertificate } from '~/insomnia-data'; +import type { CaCertificate } from 'insomnia-data'; import { database as db } from '../../src/database'; import { models } from '../../src/models'; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/client-certificate.ts b/packages/insomnia-data/node-src/services/client-certificate.ts similarity index 97% rename from packages/insomnia/src/insomnia-data/node-src/services/client-certificate.ts rename to packages/insomnia-data/node-src/services/client-certificate.ts index a2a68a970c..70dde42181 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/client-certificate.ts +++ b/packages/insomnia-data/node-src/services/client-certificate.ts @@ -1,4 +1,4 @@ -import { type ClientCertificate, database as db, models } from '~/insomnia-data'; +import { type ClientCertificate, database as db, models } from 'insomnia-data'; const { type } = models.clientCertificate; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/cloud-credential.ts b/packages/insomnia-data/node-src/services/cloud-credential.ts similarity index 94% rename from packages/insomnia/src/insomnia-data/node-src/services/cloud-credential.ts rename to packages/insomnia-data/node-src/services/cloud-credential.ts index 5e8e545561..6cc25b409f 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/cloud-credential.ts +++ b/packages/insomnia-data/node-src/services/cloud-credential.ts @@ -1,4 +1,4 @@ -import { type CloudProviderCredential, type CloudProviderName, database as db, models } from '~/insomnia-data'; +import { type CloudProviderCredential, type CloudProviderName, database as db, models } from 'insomnia-data'; const { type } = models.cloudCredential; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/cookie-jar.ts b/packages/insomnia-data/node-src/services/cookie-jar.ts similarity index 97% rename from packages/insomnia/src/insomnia-data/node-src/services/cookie-jar.ts rename to packages/insomnia-data/node-src/services/cookie-jar.ts index 7153b51618..d923526047 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/cookie-jar.ts +++ b/packages/insomnia-data/node-src/services/cookie-jar.ts @@ -1,6 +1,6 @@ import crypto from 'node:crypto'; -import { type BaseModel, type CookieJar, database as db, models } from '~/insomnia-data'; +import { type BaseModel, type CookieJar, database as db, models } from 'insomnia-data'; const { type, prefix } = models.cookieJar; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/environment.ts b/packages/insomnia-data/node-src/services/environment.ts similarity index 98% rename from packages/insomnia/src/insomnia-data/node-src/services/environment.ts rename to packages/insomnia-data/node-src/services/environment.ts index 1100e5a6a4..2d1572827a 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/environment.ts +++ b/packages/insomnia-data/node-src/services/environment.ts @@ -1,6 +1,6 @@ import * as crypto from 'node:crypto'; -import { database as db, type Environment, models, type Project, type Workspace } from '~/insomnia-data'; +import { database as db, type Environment, models, type Project, type Workspace } from 'insomnia-data'; const { project, workspace } = models; const { type, prefix, EnvironmentType, vaultEnvironmentPath, EnvironmentKvPairDataType } = models.environment; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/git-credentials.ts b/packages/insomnia-data/node-src/services/git-credentials.ts similarity index 96% rename from packages/insomnia/src/insomnia-data/node-src/services/git-credentials.ts rename to packages/insomnia-data/node-src/services/git-credentials.ts index a0b9b30f27..5a78cfce30 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/git-credentials.ts +++ b/packages/insomnia-data/node-src/services/git-credentials.ts @@ -4,7 +4,7 @@ import { type GitCredentials, type GitCredentialsV2, models, -} from '~/insomnia-data'; +} from 'insomnia-data'; const { type } = models.gitCredentials; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/git-repository.ts b/packages/insomnia-data/node-src/services/git-repository.ts similarity index 90% rename from packages/insomnia/src/insomnia-data/node-src/services/git-repository.ts rename to packages/insomnia-data/node-src/services/git-repository.ts index ad3054dbab..c012595a6a 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/git-repository.ts +++ b/packages/insomnia-data/node-src/services/git-repository.ts @@ -1,4 +1,4 @@ -import { database as db, type GitRepository, models } from '~/insomnia-data'; +import { database as db, type GitRepository, models } from 'insomnia-data'; const type = models.gitRepository.type; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/grpc-request-meta.ts b/packages/insomnia-data/node-src/services/grpc-request-meta.ts similarity index 94% rename from packages/insomnia/src/insomnia-data/node-src/services/grpc-request-meta.ts rename to packages/insomnia-data/node-src/services/grpc-request-meta.ts index 86665ecd8f..941d0c2c28 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/grpc-request-meta.ts +++ b/packages/insomnia-data/node-src/services/grpc-request-meta.ts @@ -1,4 +1,4 @@ -import { database as db, type GrpcRequestMeta, models } from '~/insomnia-data'; +import { database as db, type GrpcRequestMeta, models } from 'insomnia-data'; const { isGrpcRequestId } = models.grpcRequest; const { type } = models.grpcRequestMeta; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/grpc-request.ts b/packages/insomnia-data/node-src/services/grpc-request.ts similarity index 95% rename from packages/insomnia/src/insomnia-data/node-src/services/grpc-request.ts rename to packages/insomnia-data/node-src/services/grpc-request.ts index 1c173e3bdf..aeb5f0c603 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/grpc-request.ts +++ b/packages/insomnia-data/node-src/services/grpc-request.ts @@ -1,4 +1,4 @@ -import { database as db, type GrpcRequest, models } from '~/insomnia-data'; +import { database as db, type GrpcRequest, models } from 'insomnia-data'; const { type, name } = models.grpcRequest; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/helpers/__tests__/is-model.test.ts b/packages/insomnia-data/node-src/services/helpers/__tests__/is-model.test.ts similarity index 86% rename from packages/insomnia/src/insomnia-data/node-src/services/helpers/__tests__/is-model.test.ts rename to packages/insomnia-data/node-src/services/helpers/__tests__/is-model.test.ts index 2f2d2fa595..d5dbb75235 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/helpers/__tests__/is-model.test.ts +++ b/packages/insomnia-data/node-src/services/helpers/__tests__/is-model.test.ts @@ -1,13 +1,12 @@ +import { type AllTypes, models } from 'insomnia-data'; +import { generateId } from 'insomnia-data/common'; import { describe, expect, it } from 'vitest'; -import { models } from '~/insomnia-data'; -import { generateId } from '~/insomnia-data/common'; - const allTypes = models.types(); const allPrefixes = models.all().map(model => model.prefix); describe('isGrpcRequest', () => { - const supported = [models.grpcRequest.type]; + const supported: AllTypes[] = [models.grpcRequest.type]; const unsupported = allTypes.filter(x => !supported.includes(x)); it.each(supported)('should return true: "%s"', type => { @@ -28,7 +27,7 @@ describe('isGrpcRequest', () => { }); describe('isGrpcRequestId', () => { - const supported = [models.grpcRequest.prefix]; + const supported: (typeof allPrefixes)[number][] = [models.grpcRequest.prefix]; const unsupported = allPrefixes.filter(x => !supported.includes(x)); it.each(supported)('should return true if id is prefixed by "%s_"', prefix => { @@ -41,7 +40,7 @@ describe('isGrpcRequestId', () => { }); describe('isRequest', () => { - const supported = [models.request.type]; + const supported: AllTypes[] = [models.request.type]; const unsupported = allTypes.filter(x => !supported.includes(x)); it.each(supported)('should return true: "%s"', type => { @@ -62,7 +61,7 @@ describe('isRequest', () => { }); describe('isRequestGroup', () => { - const supported = [models.requestGroup.type]; + const supported: AllTypes[] = [models.requestGroup.type]; const unsupported = allTypes.filter(x => !supported.includes(x)); it.each(supported)('should return true: "%s"', type => { @@ -83,7 +82,7 @@ describe('isRequestGroup', () => { }); describe('isProtoFile', () => { - const supported = [models.protoFile.type]; + const supported: AllTypes[] = [models.protoFile.type]; const unsupported = allTypes.filter(x => !supported.includes(x)); it.each(supported)('should return true: "%s"', type => { @@ -104,7 +103,7 @@ describe('isProtoFile', () => { }); describe('isProtoDirectory', () => { - const supported = [models.protoDirectory.type]; + const supported: AllTypes[] = [models.protoDirectory.type]; const unsupported = allTypes.filter(x => !supported.includes(x)); it.each(supported)('should return true: "%s"', type => { @@ -125,7 +124,7 @@ describe('isProtoDirectory', () => { }); describe('isWorkspace', () => { - const supported = [models.workspace.type]; + const supported: AllTypes[] = [models.workspace.type]; const unsupported = allTypes.filter(x => !supported.includes(x)); it.each(supported)('should return true: "%s"', type => { diff --git a/packages/insomnia/src/insomnia-data/node-src/services/helpers/__tests__/query-all-workspace-urls.test.ts b/packages/insomnia-data/node-src/services/helpers/__tests__/query-all-workspace-urls.test.ts similarity index 98% rename from packages/insomnia/src/insomnia-data/node-src/services/helpers/__tests__/query-all-workspace-urls.test.ts rename to packages/insomnia-data/node-src/services/helpers/__tests__/query-all-workspace-urls.test.ts index a4f314a674..ca65a25d53 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/helpers/__tests__/query-all-workspace-urls.test.ts +++ b/packages/insomnia-data/node-src/services/helpers/__tests__/query-all-workspace-urls.test.ts @@ -1,7 +1,6 @@ +import { models, services } from 'insomnia-data'; import { describe, expect, it } from 'vitest'; -import { models, services } from '~/insomnia-data'; - import { queryAllWorkspaceUrls } from '../query-all-workspace-urls'; describe('queryAllWorkspaceUrls', () => { diff --git a/packages/insomnia/src/insomnia-data/node-src/services/helpers/index.ts b/packages/insomnia-data/node-src/services/helpers/index.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/node-src/services/helpers/index.ts rename to packages/insomnia-data/node-src/services/helpers/index.ts diff --git a/packages/insomnia/src/insomnia-data/node-src/services/helpers/query-all-workspace-urls.ts b/packages/insomnia-data/node-src/services/helpers/query-all-workspace-urls.ts similarity index 79% rename from packages/insomnia/src/insomnia-data/node-src/services/helpers/query-all-workspace-urls.ts rename to packages/insomnia-data/node-src/services/helpers/query-all-workspace-urls.ts index 5981fb3f95..2a529fd296 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/helpers/query-all-workspace-urls.ts +++ b/packages/insomnia-data/node-src/services/helpers/query-all-workspace-urls.ts @@ -1,6 +1,6 @@ -import type { GrpcRequest, models, Request } from '~/insomnia-data'; -import { database as db, services } from '~/insomnia-data'; -import { invariant } from '~/insomnia-data/common'; +import type { GrpcRequest, models, Request } from 'insomnia-data'; +import { database as db, services } from 'insomnia-data'; +import { invariant } from 'insomnia-data/common'; export const queryAllWorkspaceUrls = async ( workspaceId: string, diff --git a/packages/insomnia/src/insomnia-data/node-src/services/helpers/request-operations.ts b/packages/insomnia-data/node-src/services/helpers/request-operations.ts similarity index 99% rename from packages/insomnia/src/insomnia-data/node-src/services/helpers/request-operations.ts rename to packages/insomnia-data/node-src/services/helpers/request-operations.ts index f8c6d1f59e..c87ed8cda2 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/helpers/request-operations.ts +++ b/packages/insomnia-data/node-src/services/helpers/request-operations.ts @@ -5,7 +5,7 @@ import { type Request, type SocketIORequest, type WebSocketRequest, -} from '~/insomnia-data'; +} from 'insomnia-data'; import * as grpcRequestServices from '../grpc-request'; import * as mcpRequestServices from '../mcp-request'; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/helpers/response-operations.ts b/packages/insomnia-data/node-src/services/helpers/response-operations.ts similarity index 98% rename from packages/insomnia/src/insomnia-data/node-src/services/helpers/response-operations.ts rename to packages/insomnia-data/node-src/services/helpers/response-operations.ts index 760a12e39b..4cecb412a4 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/helpers/response-operations.ts +++ b/packages/insomnia-data/node-src/services/helpers/response-operations.ts @@ -12,8 +12,8 @@ import { services, type SocketIOResponse, type WebSocketResponse, -} from '~/insomnia-data'; -import { deserializeNDJSON } from '~/insomnia-data/common'; +} from 'insomnia-data'; +import { deserializeNDJSON } from 'insomnia-data/common'; const { type: responseType, isResponse } = models.response; const { isSocketIORequestId } = models.socketIORequest; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/index.ts b/packages/insomnia-data/node-src/services/index.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/node-src/services/index.ts rename to packages/insomnia-data/node-src/services/index.ts diff --git a/packages/insomnia/src/insomnia-data/node-src/services/mcp-payload.ts b/packages/insomnia-data/node-src/services/mcp-payload.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/node-src/services/mcp-payload.ts rename to packages/insomnia-data/node-src/services/mcp-payload.ts diff --git a/packages/insomnia/src/insomnia-data/node-src/services/mcp-request.ts b/packages/insomnia-data/node-src/services/mcp-request.ts similarity index 95% rename from packages/insomnia/src/insomnia-data/node-src/services/mcp-request.ts rename to packages/insomnia-data/node-src/services/mcp-request.ts index 63bab8e297..7ec2bd1b85 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/mcp-request.ts +++ b/packages/insomnia-data/node-src/services/mcp-request.ts @@ -1,4 +1,4 @@ -import { invariant } from '~/insomnia-data/common'; +import { invariant } from 'insomnia-data/common'; import { database as db } from '../../src/database'; import { models } from '../../src/models'; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/mcp-response.ts b/packages/insomnia-data/node-src/services/mcp-response.ts similarity index 97% rename from packages/insomnia/src/insomnia-data/node-src/services/mcp-response.ts rename to packages/insomnia-data/node-src/services/mcp-response.ts index ec1336d2b7..742221366a 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/mcp-response.ts +++ b/packages/insomnia-data/node-src/services/mcp-response.ts @@ -1,4 +1,4 @@ -import { database as db, type McpResponse, models } from '~/insomnia-data'; +import { database as db, type McpResponse, models } from 'insomnia-data'; import * as mcpRequestService from './mcp-request'; import * as requestVersionService from './request-version'; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/mock-route.ts b/packages/insomnia-data/node-src/services/mock-route.ts similarity index 91% rename from packages/insomnia/src/insomnia-data/node-src/services/mock-route.ts rename to packages/insomnia-data/node-src/services/mock-route.ts index 02f82a0b7a..ae5a71cfc0 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/mock-route.ts +++ b/packages/insomnia-data/node-src/services/mock-route.ts @@ -1,4 +1,4 @@ -import { database as db, type MockRoute, models } from '~/insomnia-data'; +import { database as db, type MockRoute, models } from 'insomnia-data'; const { type } = models.mockRoute; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/mock-server.ts b/packages/insomnia-data/node-src/services/mock-server.ts similarity index 95% rename from packages/insomnia/src/insomnia-data/node-src/services/mock-server.ts rename to packages/insomnia-data/node-src/services/mock-server.ts index bcc4fea804..86e38286f1 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/mock-server.ts +++ b/packages/insomnia-data/node-src/services/mock-server.ts @@ -1,4 +1,4 @@ -import { database as db, type MockServer, models } from '~/insomnia-data'; +import { database as db, type MockServer, models } from 'insomnia-data'; import * as workspaceServices from './workspace'; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/o-auth-2-token.ts b/packages/insomnia-data/node-src/services/o-auth-2-token.ts similarity index 91% rename from packages/insomnia/src/insomnia-data/node-src/services/o-auth-2-token.ts rename to packages/insomnia-data/node-src/services/o-auth-2-token.ts index 80c5491e0c..0f5d45402d 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/o-auth-2-token.ts +++ b/packages/insomnia-data/node-src/services/o-auth-2-token.ts @@ -1,4 +1,4 @@ -import { database as db, models, type OAuth2Token } from '~/insomnia-data'; +import { database as db, models, type OAuth2Token } from 'insomnia-data'; const type = models.oAuth2Token.type; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/plugin-data.ts b/packages/insomnia-data/node-src/services/plugin-data.ts similarity index 92% rename from packages/insomnia/src/insomnia-data/node-src/services/plugin-data.ts rename to packages/insomnia-data/node-src/services/plugin-data.ts index c2c36dd062..9a38e3b34d 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/plugin-data.ts +++ b/packages/insomnia-data/node-src/services/plugin-data.ts @@ -1,4 +1,4 @@ -import { database as db, models, type PluginData } from '~/insomnia-data'; +import { database as db, models, type PluginData } from 'insomnia-data'; const { type } = models.pluginData; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/project.ts b/packages/insomnia-data/node-src/services/project.ts similarity index 91% rename from packages/insomnia/src/insomnia-data/node-src/services/project.ts rename to packages/insomnia-data/node-src/services/project.ts index 44c094cfe2..a798de582f 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/project.ts +++ b/packages/insomnia-data/node-src/services/project.ts @@ -1,4 +1,4 @@ -import { database as db, models, type Project } from '~/insomnia-data'; +import { database as db, models, type Project } from 'insomnia-data'; const { type } = models.project; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/proto-directory.ts b/packages/insomnia-data/node-src/services/proto-directory.ts similarity index 89% rename from packages/insomnia/src/insomnia-data/node-src/services/proto-directory.ts rename to packages/insomnia-data/node-src/services/proto-directory.ts index b601bc1111..07c27e8711 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/proto-directory.ts +++ b/packages/insomnia-data/node-src/services/proto-directory.ts @@ -1,4 +1,4 @@ -import { database as db, models, type ProtoDirectory } from '~/insomnia-data'; +import { database as db, models, type ProtoDirectory } from 'insomnia-data'; const { type } = models.protoDirectory; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/proto-file.ts b/packages/insomnia-data/node-src/services/proto-file.ts similarity index 91% rename from packages/insomnia/src/insomnia-data/node-src/services/proto-file.ts rename to packages/insomnia-data/node-src/services/proto-file.ts index 9aa86e7cc1..67bd586211 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/proto-file.ts +++ b/packages/insomnia-data/node-src/services/proto-file.ts @@ -1,4 +1,4 @@ -import { database as db, models, type ProtoFile } from '~/insomnia-data'; +import { database as db, models, type ProtoFile } from 'insomnia-data'; const { type } = models.protoFile; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/request-group-meta.ts b/packages/insomnia-data/node-src/services/request-group-meta.ts similarity index 88% rename from packages/insomnia/src/insomnia-data/node-src/services/request-group-meta.ts rename to packages/insomnia-data/node-src/services/request-group-meta.ts index d4e0a26213..c318870c76 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/request-group-meta.ts +++ b/packages/insomnia-data/node-src/services/request-group-meta.ts @@ -1,4 +1,4 @@ -import { database as db, models, type RequestGroupMeta } from '~/insomnia-data'; +import { database as db, models, type RequestGroupMeta } from 'insomnia-data'; const { type } = models.requestGroupMeta; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/request-group.ts b/packages/insomnia-data/node-src/services/request-group.ts similarity index 95% rename from packages/insomnia/src/insomnia-data/node-src/services/request-group.ts rename to packages/insomnia-data/node-src/services/request-group.ts index fdfbcaccd1..21bad94fbd 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/request-group.ts +++ b/packages/insomnia-data/node-src/services/request-group.ts @@ -1,4 +1,4 @@ -import { database as db, models, type RequestGroup } from '~/insomnia-data'; +import { database as db, models, type RequestGroup } from 'insomnia-data'; const { type } = models.requestGroup; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/request-meta.ts b/packages/insomnia-data/node-src/services/request-meta.ts similarity index 93% rename from packages/insomnia/src/insomnia-data/node-src/services/request-meta.ts rename to packages/insomnia-data/node-src/services/request-meta.ts index e9fd2ad75f..a06b13e66f 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/request-meta.ts +++ b/packages/insomnia-data/node-src/services/request-meta.ts @@ -1,4 +1,4 @@ -import { database as db, models, type RequestMeta } from '~/insomnia-data'; +import { database as db, models, type RequestMeta } from 'insomnia-data'; const { type } = models.requestMeta; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/request-version.ts b/packages/insomnia-data/node-src/services/request-version.ts similarity index 99% rename from packages/insomnia/src/insomnia-data/node-src/services/request-version.ts rename to packages/insomnia-data/node-src/services/request-version.ts index d61fd7ee1c..195e533848 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/request-version.ts +++ b/packages/insomnia-data/node-src/services/request-version.ts @@ -2,7 +2,6 @@ import { promisify } from 'node:util'; import zlib from 'node:zlib'; import deepEqual from 'deep-equal'; - import { database as db, type GrpcRequest, @@ -12,7 +11,7 @@ import { type RequestVersion, type SocketIORequest, type WebSocketRequest, -} from '~/insomnia-data'; +} from 'insomnia-data'; import * as requestHelpers from './helpers/request-operations'; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/request.ts b/packages/insomnia-data/node-src/services/request.ts similarity index 96% rename from packages/insomnia/src/insomnia-data/node-src/services/request.ts rename to packages/insomnia-data/node-src/services/request.ts index fae4d617fc..1aed350298 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/request.ts +++ b/packages/insomnia-data/node-src/services/request.ts @@ -1,4 +1,4 @@ -import { database as db, models, type Request } from '~/insomnia-data'; +import { database as db, models, type Request } from 'insomnia-data'; const { type, name } = models.request; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/response.ts b/packages/insomnia-data/node-src/services/response.ts similarity index 99% rename from packages/insomnia/src/insomnia-data/node-src/services/response.ts rename to packages/insomnia-data/node-src/services/response.ts index d829777065..8f0e5bac45 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/response.ts +++ b/packages/insomnia-data/node-src/services/response.ts @@ -1,4 +1,4 @@ -import { database as db, models, type Response, services } from '~/insomnia-data'; +import { database as db, models, type Response, services } from 'insomnia-data'; import * as requestVersionOperations from './request-version'; import * as settingsOperations from './settings'; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/runner-test-result.ts b/packages/insomnia-data/node-src/services/runner-test-result.ts similarity index 91% rename from packages/insomnia/src/insomnia-data/node-src/services/runner-test-result.ts rename to packages/insomnia-data/node-src/services/runner-test-result.ts index 12ac3fb06b..e5e6f278b5 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/runner-test-result.ts +++ b/packages/insomnia-data/node-src/services/runner-test-result.ts @@ -1,4 +1,4 @@ -import { database as db, models, type RunnerTestResult } from '~/insomnia-data'; +import { database as db, models, type RunnerTestResult } from 'insomnia-data'; const { type } = models.runnerTestResult; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/settings.ts b/packages/insomnia-data/node-src/services/settings.ts similarity index 92% rename from packages/insomnia/src/insomnia-data/node-src/services/settings.ts rename to packages/insomnia-data/node-src/services/settings.ts index d18c873124..e1e39946a1 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/settings.ts +++ b/packages/insomnia-data/node-src/services/settings.ts @@ -1,4 +1,4 @@ -import { database as db, models, type Settings } from '~/insomnia-data'; +import { database as db, models, type Settings } from 'insomnia-data'; const { type } = models.settings; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/socket-io-payload.ts b/packages/insomnia-data/node-src/services/socket-io-payload.ts similarity index 95% rename from packages/insomnia/src/insomnia-data/node-src/services/socket-io-payload.ts rename to packages/insomnia-data/node-src/services/socket-io-payload.ts index a2e4599fec..35590047b7 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/socket-io-payload.ts +++ b/packages/insomnia-data/node-src/services/socket-io-payload.ts @@ -1,4 +1,4 @@ -import { database, models, type SocketIOPayload } from '~/insomnia-data'; +import { database, models, type SocketIOPayload } from 'insomnia-data'; const { type, name } = models.socketIOPayload; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/socket-io-request.ts b/packages/insomnia-data/node-src/services/socket-io-request.ts similarity index 95% rename from packages/insomnia/src/insomnia-data/node-src/services/socket-io-request.ts rename to packages/insomnia-data/node-src/services/socket-io-request.ts index 73bff6382e..fd62fdb48a 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/socket-io-request.ts +++ b/packages/insomnia-data/node-src/services/socket-io-request.ts @@ -1,4 +1,4 @@ -import { database, models, type SocketIORequest } from '~/insomnia-data'; +import { database, models, type SocketIORequest } from 'insomnia-data'; const { type, name } = models.socketIORequest; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/socket-io-response.ts b/packages/insomnia-data/node-src/services/socket-io-response.ts similarity index 96% rename from packages/insomnia/src/insomnia-data/node-src/services/socket-io-response.ts rename to packages/insomnia-data/node-src/services/socket-io-response.ts index 99989e1695..4884be83f7 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/socket-io-response.ts +++ b/packages/insomnia-data/node-src/services/socket-io-response.ts @@ -1,4 +1,4 @@ -import { database as db, models, type SocketIOResponse } from '~/insomnia-data'; +import { database as db, models, type SocketIOResponse } from 'insomnia-data'; import * as requestServices from './request'; import * as requestVersionServices from './request-version'; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/stats.ts b/packages/insomnia-data/node-src/services/stats.ts similarity index 97% rename from packages/insomnia/src/insomnia-data/node-src/services/stats.ts rename to packages/insomnia-data/node-src/services/stats.ts index 0042a55102..b5e0fdea73 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/stats.ts +++ b/packages/insomnia-data/node-src/services/stats.ts @@ -1,4 +1,4 @@ -import { database as db, models, type Project, type RequestGroup, type Stats, type Workspace } from '~/insomnia-data'; +import { database as db, models, type Project, type RequestGroup, type Stats, type Workspace } from 'insomnia-data'; const { type } = models.stats; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/unit-test-result.ts b/packages/insomnia-data/node-src/services/unit-test-result.ts similarity index 89% rename from packages/insomnia/src/insomnia-data/node-src/services/unit-test-result.ts rename to packages/insomnia-data/node-src/services/unit-test-result.ts index b527e57dd2..f37503f471 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/unit-test-result.ts +++ b/packages/insomnia-data/node-src/services/unit-test-result.ts @@ -1,4 +1,4 @@ -import { database as db, models, type UnitTestResult } from '~/insomnia-data'; +import { database as db, models, type UnitTestResult } from 'insomnia-data'; const { type } = models.unitTestResult; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/unit-test-suite.ts b/packages/insomnia-data/node-src/services/unit-test-suite.ts similarity index 91% rename from packages/insomnia/src/insomnia-data/node-src/services/unit-test-suite.ts rename to packages/insomnia-data/node-src/services/unit-test-suite.ts index 9f1ecca396..cc0463ba31 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/unit-test-suite.ts +++ b/packages/insomnia-data/node-src/services/unit-test-suite.ts @@ -1,4 +1,4 @@ -import { database as db, models, type UnitTestSuite } from '~/insomnia-data'; +import { database as db, models, type UnitTestSuite } from 'insomnia-data'; const { type } = models.unitTestSuite; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/unit-test.ts b/packages/insomnia-data/node-src/services/unit-test.ts similarity index 89% rename from packages/insomnia/src/insomnia-data/node-src/services/unit-test.ts rename to packages/insomnia-data/node-src/services/unit-test.ts index 10710c3fbf..f6a59896b8 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/unit-test.ts +++ b/packages/insomnia-data/node-src/services/unit-test.ts @@ -1,4 +1,4 @@ -import { database as db, models, type UnitTest } from '~/insomnia-data'; +import { database as db, models, type UnitTest } from 'insomnia-data'; const { type } = models.unitTest; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/user-session.ts b/packages/insomnia-data/node-src/services/user-session.ts similarity index 92% rename from packages/insomnia/src/insomnia-data/node-src/services/user-session.ts rename to packages/insomnia-data/node-src/services/user-session.ts index ba74043f7f..4877b1f772 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/user-session.ts +++ b/packages/insomnia-data/node-src/services/user-session.ts @@ -1,4 +1,4 @@ -import { database as db, models, type UserSession } from '~/insomnia-data'; +import { database as db, models, type UserSession } from 'insomnia-data'; const { type } = models.userSession; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/websocket-payload.ts b/packages/insomnia-data/node-src/services/websocket-payload.ts similarity index 94% rename from packages/insomnia/src/insomnia-data/node-src/services/websocket-payload.ts rename to packages/insomnia-data/node-src/services/websocket-payload.ts index 50226fa3b9..f4b7891823 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/websocket-payload.ts +++ b/packages/insomnia-data/node-src/services/websocket-payload.ts @@ -1,4 +1,4 @@ -import { database, models, type WebSocketPayload } from '~/insomnia-data'; +import { database, models, type WebSocketPayload } from 'insomnia-data'; const { type, name } = models.webSocketPayload; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/websocket-request.ts b/packages/insomnia-data/node-src/services/websocket-request.ts similarity index 95% rename from packages/insomnia/src/insomnia-data/node-src/services/websocket-request.ts rename to packages/insomnia-data/node-src/services/websocket-request.ts index 82833e7831..853715bb7e 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/websocket-request.ts +++ b/packages/insomnia-data/node-src/services/websocket-request.ts @@ -1,4 +1,4 @@ -import { database, models, type WebSocketRequest } from '~/insomnia-data'; +import { database, models, type WebSocketRequest } from 'insomnia-data'; const { type, name } = models.webSocketRequest; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/websocket-response.ts b/packages/insomnia-data/node-src/services/websocket-response.ts similarity index 99% rename from packages/insomnia/src/insomnia-data/node-src/services/websocket-response.ts rename to packages/insomnia-data/node-src/services/websocket-response.ts index 862d7c19a7..dd58e05c4c 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/websocket-response.ts +++ b/packages/insomnia-data/node-src/services/websocket-response.ts @@ -1,4 +1,4 @@ -import { database as db, models, type WebSocketResponse } from '~/insomnia-data'; +import { database as db, models, type WebSocketResponse } from 'insomnia-data'; import * as requestServices from './request'; import * as requestVersionServices from './request-version'; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/workspace-meta.ts b/packages/insomnia-data/node-src/services/workspace-meta.ts similarity index 93% rename from packages/insomnia/src/insomnia-data/node-src/services/workspace-meta.ts rename to packages/insomnia-data/node-src/services/workspace-meta.ts index 4f2ce937e3..f557ecf6d9 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/workspace-meta.ts +++ b/packages/insomnia-data/node-src/services/workspace-meta.ts @@ -1,4 +1,4 @@ -import { database as db, models, type WorkspaceMeta } from '~/insomnia-data'; +import { database as db, models, type WorkspaceMeta } from 'insomnia-data'; const { type } = models.workspaceMeta; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/workspace.ts b/packages/insomnia-data/node-src/services/workspace.ts similarity index 93% rename from packages/insomnia/src/insomnia-data/node-src/services/workspace.ts rename to packages/insomnia-data/node-src/services/workspace.ts index 8ef3835e9e..71eae8ae48 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/workspace.ts +++ b/packages/insomnia-data/node-src/services/workspace.ts @@ -1,4 +1,4 @@ -import { database as db, models, type Workspace } from '~/insomnia-data'; +import { database as db, models, type Workspace } from 'insomnia-data'; const { isProjectId } = models.project; const { type } = models.workspace; diff --git a/packages/insomnia-data/node-src/tsconfig.json b/packages/insomnia-data/node-src/tsconfig.json new file mode 100644 index 0000000000..86df5edd32 --- /dev/null +++ b/packages/insomnia-data/node-src/tsconfig.json @@ -0,0 +1,8 @@ +{ + "extends": "../tsconfig.base.json", + "compilerOptions": { + "lib": ["ES2023", "WebWorker"], + "types": ["node"] + }, + "include": ["./**/*.ts"] +} diff --git a/packages/insomnia/src/insomnia-data/node-src/types.d.ts b/packages/insomnia-data/node-src/types.d.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/node-src/types.d.ts rename to packages/insomnia-data/node-src/types.d.ts diff --git a/packages/insomnia/src/insomnia-data/node-src/utils/index.ts b/packages/insomnia-data/node-src/utils/index.ts similarity index 92% rename from packages/insomnia/src/insomnia-data/node-src/utils/index.ts rename to packages/insomnia-data/node-src/utils/index.ts index ece40d4d10..353845a4e7 100644 --- a/packages/insomnia/src/insomnia-data/node-src/utils/index.ts +++ b/packages/insomnia-data/node-src/utils/index.ts @@ -1,6 +1,6 @@ -import type { AllTypes, BaseModel } from '~/insomnia-data'; -import { models } from '~/insomnia-data'; -import { generateId, typedKeys } from '~/insomnia-data/common'; +import type { AllTypes, BaseModel } from 'insomnia-data'; +import { models } from 'insomnia-data'; +import { generateId, typedKeys } from 'insomnia-data/common'; import { migrate as migrateRequest } from './migrate/request'; import { migrate as migrateResponse } from './migrate/response'; diff --git a/packages/insomnia/src/insomnia-data/node-src/utils/migrate/request.ts b/packages/insomnia-data/node-src/utils/migrate/request.ts similarity index 96% rename from packages/insomnia/src/insomnia-data/node-src/utils/migrate/request.ts rename to packages/insomnia-data/node-src/utils/migrate/request.ts index 33a5e7fac0..caf21e9d09 100644 --- a/packages/insomnia/src/insomnia-data/node-src/utils/migrate/request.ts +++ b/packages/insomnia-data/node-src/utils/migrate/request.ts @@ -1,9 +1,9 @@ -import type { Request } from '~/insomnia-data'; +import type { Request } from 'insomnia-data'; import { CONTENT_TYPE_FORM_URLENCODED, deconstructQueryStringToParams, getContentTypeFromHeaders, -} from '~/insomnia-data/common'; +} from 'insomnia-data/common'; export function migrate(doc: Request): Request { try { diff --git a/packages/insomnia/src/insomnia-data/node-src/utils/migrate/response.ts b/packages/insomnia-data/node-src/utils/migrate/response.ts similarity index 87% rename from packages/insomnia/src/insomnia-data/node-src/utils/migrate/response.ts rename to packages/insomnia-data/node-src/utils/migrate/response.ts index 7c14b5c736..16da7f72d9 100644 --- a/packages/insomnia/src/insomnia-data/node-src/utils/migrate/response.ts +++ b/packages/insomnia-data/node-src/utils/migrate/response.ts @@ -1,4 +1,4 @@ -import type { Response } from '~/insomnia-data'; +import type { Response } from 'insomnia-data'; export function migrate(doc: Response) { try { diff --git a/packages/insomnia/src/insomnia-data/node-src/utils/migrate/settings.ts b/packages/insomnia-data/node-src/utils/migrate/settings.ts similarity index 95% rename from packages/insomnia/src/insomnia-data/node-src/utils/migrate/settings.ts rename to packages/insomnia-data/node-src/utils/migrate/settings.ts index fba7a8afdf..9b55552639 100644 --- a/packages/insomnia/src/insomnia-data/node-src/utils/migrate/settings.ts +++ b/packages/insomnia-data/node-src/utils/migrate/settings.ts @@ -1,4 +1,4 @@ -import type { Settings } from '~/insomnia-data'; +import type { Settings } from 'insomnia-data'; import * as hotkeys from '../../../common-src/hotkeys'; import type { KeyboardShortcut } from '../../../common-src/settings'; diff --git a/packages/insomnia/src/insomnia-data/node-src/utils/migrate/workspace.ts b/packages/insomnia-data/node-src/utils/migrate/workspace.ts similarity index 96% rename from packages/insomnia/src/insomnia-data/node-src/utils/migrate/workspace.ts rename to packages/insomnia-data/node-src/utils/migrate/workspace.ts index 2e30979615..bc9d2d303e 100644 --- a/packages/insomnia/src/insomnia-data/node-src/utils/migrate/workspace.ts +++ b/packages/insomnia-data/node-src/utils/migrate/workspace.ts @@ -1,8 +1,7 @@ +import type { Workspace } from 'insomnia-data'; +import { models } from 'insomnia-data'; import type { Merge } from 'type-fest'; -import type { Workspace } from '~/insomnia-data'; -import { models } from '~/insomnia-data'; - import * as clientCertificateService from '../../services/client-certificate'; const { WorkspaceScopeKeys } = models.workspace; diff --git a/packages/insomnia-data/package.json b/packages/insomnia-data/package.json new file mode 100644 index 0000000000..87fba4ee39 --- /dev/null +++ b/packages/insomnia-data/package.json @@ -0,0 +1,37 @@ +{ + "private": true, + "name": "insomnia-data", + "license": "Apache-2.0", + "version": "12.4.0", + "author": "Kong ", + "description": "Insomnia Data functionalities", + "repository": { + "type": "git", + "url": "git+https://github.com/Kong/insomnia.git", + "directory": "packages/insomnia-data" + }, + "bugs": { + "url": "https://github.com/kong/insomnia/issues" + }, + "homepage": "https://github.com/Kong/insomnia#readme", + "exports": { + ".": { + "import": "./src/index.ts", + "types": "./src/index.ts" + }, + "./node": { + "import": "./node-src/index.ts", + "types": "./node-src/index.ts" + }, + "./common": { + "import": "./common-src/index.ts", + "types": "./common-src/index.ts" + } + }, + "scripts": { + "lint": "eslint . --ext .ts,.tsx --cache", + "type-check": "tsc -p src/tsconfig.json && tsc -p common-src/tsconfig.json && tsc -p node-src/tsconfig.json", + "test": "vitest run" + }, + "dependencies": {} +} diff --git a/packages/insomnia-data/setup-vitest.ts b/packages/insomnia-data/setup-vitest.ts new file mode 100644 index 0000000000..ec238083b8 --- /dev/null +++ b/packages/insomnia-data/setup-vitest.ts @@ -0,0 +1,12 @@ +import { initDatabase, initServices } from 'insomnia-data'; +import { createNedbDatabase, servicesNodeImpl } from 'insomnia-data/node'; +import { vi } from 'vitest'; + +import { v4Mock } from './__mocks__/uuid'; + +await initDatabase(createNedbDatabase(), { inMemoryOnly: true }, true); +await initServices(servicesNodeImpl); + +vi.mock('uuid', () => ({ + v4: () => v4Mock(), +})); diff --git a/packages/insomnia/src/insomnia-data/__tests__/git-credentials.test.ts b/packages/insomnia-data/src/__tests__/git-credentials.test.ts similarity index 99% rename from packages/insomnia/src/insomnia-data/__tests__/git-credentials.test.ts rename to packages/insomnia-data/src/__tests__/git-credentials.test.ts index 358092644d..7f64481050 100644 --- a/packages/insomnia/src/insomnia-data/__tests__/git-credentials.test.ts +++ b/packages/insomnia-data/src/__tests__/git-credentials.test.ts @@ -1,7 +1,6 @@ +import { type BaseGitCredentialsV2, models, services } from 'insomnia-data'; import { describe, expect, it } from 'vitest'; -import { type BaseGitCredentialsV2, models, services } from '..'; - const { init, isGitCredentialsV2, supportsRenewal } = models.gitCredentials; describe('init()', () => { diff --git a/packages/insomnia/src/insomnia-data/__tests__/grpc-request-meta.test.ts b/packages/insomnia-data/src/__tests__/grpc-request-meta.test.ts similarity index 96% rename from packages/insomnia/src/insomnia-data/__tests__/grpc-request-meta.test.ts rename to packages/insomnia-data/src/__tests__/grpc-request-meta.test.ts index ee73940552..aebda768f4 100644 --- a/packages/insomnia/src/insomnia-data/__tests__/grpc-request-meta.test.ts +++ b/packages/insomnia-data/src/__tests__/grpc-request-meta.test.ts @@ -1,7 +1,6 @@ +import { models, services } from 'insomnia-data'; import { describe, expect, it, vi } from 'vitest'; -import { models, services } from '..'; - describe('init()', () => { it('contains all required fields', async () => { expect(models.grpcRequestMeta.init()).toEqual({ diff --git a/packages/insomnia/src/insomnia-data/__tests__/grpc-request.test.ts b/packages/insomnia-data/src/__tests__/grpc-request.test.ts similarity index 97% rename from packages/insomnia/src/insomnia-data/__tests__/grpc-request.test.ts rename to packages/insomnia-data/src/__tests__/grpc-request.test.ts index 1c0b9bbe56..9eeb027d52 100644 --- a/packages/insomnia/src/insomnia-data/__tests__/grpc-request.test.ts +++ b/packages/insomnia-data/src/__tests__/grpc-request.test.ts @@ -1,7 +1,6 @@ +import { models, services } from 'insomnia-data'; import { describe, expect, it, vi } from 'vitest'; -import { models, services } from '..'; - describe('init()', () => { it('contains all required fields', async () => { Date.now = vi.fn().mockReturnValue(1_478_795_580_200); diff --git a/packages/insomnia/src/insomnia-data/__tests__/index.test.ts b/packages/insomnia-data/src/__tests__/index.test.ts similarity index 94% rename from packages/insomnia/src/insomnia-data/__tests__/index.test.ts rename to packages/insomnia-data/src/__tests__/index.test.ts index 04500dcb99..061c41c436 100644 --- a/packages/insomnia/src/insomnia-data/__tests__/index.test.ts +++ b/packages/insomnia-data/src/__tests__/index.test.ts @@ -1,7 +1,6 @@ +import { models } from 'insomnia-data'; import { describe, expect, it } from 'vitest'; -import { models } from '..'; - const { getModel, mustGetModel } = models; describe('index', () => { diff --git a/packages/insomnia-data/src/__tests__/project.test.ts b/packages/insomnia-data/src/__tests__/project.test.ts new file mode 100644 index 0000000000..550e40684c --- /dev/null +++ b/packages/insomnia-data/src/__tests__/project.test.ts @@ -0,0 +1,24 @@ +import { models, services } from 'insomnia-data'; +import { describe, expect, it } from 'vitest'; + +const defaultOrgProject = await services.project.create({ + name: 'a', + remoteId: 'proj_team_123456789345678987654', + _id: 'not important', +}); + +const remoteA = await services.project.create({ name: 'a', remoteId: 'notNull', _id: 'remoteA' }); +const remoteB = await services.project.create({ name: 'b', remoteId: 'notNull', _id: 'remoteB' }); +const remote0 = await services.project.create({ name: '0', remoteId: 'notNull', _id: 'remote0' }); + +const { sortProjects } = models.project; + +describe('sortProjects', () => { + it('sorts projects by default > local > remote > name', () => { + const unSortedProjects = [remoteA, defaultOrgProject, remoteB, remote0]; + const result = sortProjects(unSortedProjects); + + const sortedProjects = [defaultOrgProject, remote0, remoteA, remoteB]; + expect(result).toEqual(sortedProjects); + }); +}); diff --git a/packages/insomnia/src/insomnia-data/__tests__/proto-file.test.ts b/packages/insomnia-data/src/__tests__/proto-file.test.ts similarity index 95% rename from packages/insomnia/src/insomnia-data/__tests__/proto-file.test.ts rename to packages/insomnia-data/src/__tests__/proto-file.test.ts index 3cd200ef07..588d9c256d 100644 --- a/packages/insomnia/src/insomnia-data/__tests__/proto-file.test.ts +++ b/packages/insomnia-data/src/__tests__/proto-file.test.ts @@ -1,7 +1,6 @@ +import { models, services } from 'insomnia-data'; import { describe, expect, it, vi } from 'vitest'; -import { models, services } from '..'; - describe('init()', () => { it('contains all required fields', async () => { expect(models.protoFile.init()).toEqual({ diff --git a/packages/insomnia/src/insomnia-data/__tests__/request-meta.test.ts b/packages/insomnia-data/src/__tests__/request-meta.test.ts similarity index 92% rename from packages/insomnia/src/insomnia-data/__tests__/request-meta.test.ts rename to packages/insomnia-data/src/__tests__/request-meta.test.ts index ae94a96d9a..b3a386373c 100644 --- a/packages/insomnia/src/insomnia-data/__tests__/request-meta.test.ts +++ b/packages/insomnia-data/src/__tests__/request-meta.test.ts @@ -1,7 +1,6 @@ +import { services } from 'insomnia-data'; import { describe, expect, it } from 'vitest'; -import { services } from '..'; - describe('create()', () => { it('fails when missing parentId', async () => { expect(() => diff --git a/packages/insomnia/src/insomnia-data/__tests__/request.test.ts b/packages/insomnia-data/src/__tests__/request.test.ts similarity index 99% rename from packages/insomnia/src/insomnia-data/__tests__/request.test.ts rename to packages/insomnia-data/src/__tests__/request.test.ts index 427f5a0c8e..e7347152be 100644 --- a/packages/insomnia/src/insomnia-data/__tests__/request.test.ts +++ b/packages/insomnia-data/src/__tests__/request.test.ts @@ -5,10 +5,10 @@ * we added comments to in request.ts, ensuring they work correctly. */ +import { services } from 'insomnia-data'; import { v4 as uuidv4 } from 'uuid'; import { beforeEach, describe, expect, it } from 'vitest'; -import { services } from '..'; import type { AuthTypeAPIKey, AuthTypeAsap, @@ -25,7 +25,7 @@ import type { RequestBody, RequestHeader, RequestParameter, -} from '../src/models/request'; +} from '../models/request'; // @vitest-environment jsdom describe('Request Model - Comprehensive Tests', () => { diff --git a/packages/insomnia/src/insomnia-data/__tests__/response.test.ts b/packages/insomnia-data/src/__tests__/response.test.ts similarity index 78% rename from packages/insomnia/src/insomnia-data/__tests__/response.test.ts rename to packages/insomnia-data/src/__tests__/response.test.ts index 53cd3bf0fd..6ecfa8ffa6 100644 --- a/packages/insomnia/src/insomnia-data/__tests__/response.test.ts +++ b/packages/insomnia-data/src/__tests__/response.test.ts @@ -3,16 +3,15 @@ import { tmpdir } from 'node:os'; import path from 'node:path'; import zlib from 'node:zlib'; +import { services } from 'insomnia-data'; import { describe, expect, it } from 'vitest'; -import { models, services } from '..'; -import { initModel } from '../node-src/utils'; - describe('migrate()', () => { it('does it', async () => { const bodyPath = path.join(tmpdir(), 'foo.zip'); fs.writeFileSync(bodyPath, zlib.gzipSync('Hello World!')); - const response = await initModel(models.response.type, { + const response = await services.response.create({ + parentId: 'pid', bodyPath, }); const body = (await services.helpers.getResponseBodyBuffer(response)).toString(); @@ -23,7 +22,8 @@ describe('migrate()', () => { it('migrates leaves bodyCompression for null', async () => { expect( ( - await initModel(models.response.type, { + await services.response.create({ + parentId: 'pid', bodyPath: '/foo/bar', bodyCompression: null, }) @@ -34,7 +34,8 @@ describe('migrate()', () => { it('migrates sets bodyCompression to zip if does not have one yet', async () => { expect( ( - await initModel(models.response.type, { + await services.response.create({ + parentId: 'pid', bodyPath: '/foo/bar', }) ).bodyCompression, @@ -44,7 +45,8 @@ describe('migrate()', () => { it('migrates leaves bodyCompression if string', async () => { expect( ( - await initModel(models.response.type, { + await services.response.create({ + parentId: 'pid', bodyPath: '/foo/bar', bodyCompression: 'zip', }) diff --git a/packages/insomnia/src/insomnia-data/__tests__/workspace.test.ts b/packages/insomnia-data/src/__tests__/workspace.test.ts similarity index 81% rename from packages/insomnia/src/insomnia-data/__tests__/workspace.test.ts rename to packages/insomnia-data/src/__tests__/workspace.test.ts index e5512e36e4..001dd24053 100644 --- a/packages/insomnia/src/insomnia-data/__tests__/workspace.test.ts +++ b/packages/insomnia-data/src/__tests__/workspace.test.ts @@ -1,7 +1,8 @@ +import { models, services } from 'insomnia-data'; import { describe, expect, it } from 'vitest'; -import { models, services } from '..'; -import { migrate } from '../node-src/utils/migrate/workspace'; +import { migrate } from '../../node-src/utils/migrate/workspace'; + const { WorkspaceScopeKeys } = models.workspace; describe('migrate()', () => { it('migrates client certificates properly', async () => { @@ -21,14 +22,6 @@ describe('migrate()', () => { const migratedWorkspace = await migrate(workspace); const certs = await services.clientCertificate.findByParentId(workspace._id); - // Delete modified and created so we can assert them - for (const cert of certs) { - expect(typeof cert.modified).toBe('number'); - expect(typeof cert.created).toBe('number'); - delete cert.modified; - delete cert.created; - } - expect(certs.length).toBe(2); expect(certs.sort((c1, c2) => (c1._id > c2._id ? -1 : 1))).toEqual([ { @@ -42,6 +35,8 @@ describe('migrate()', () => { passphrase: null, pfx: null, type: 'ClientCertificate', + modified: expect.any(Number), + created: expect.any(Number), }, { _id: 'crt_dd2ccc1a2745477a881a9e8ef9d42403', @@ -54,6 +49,8 @@ describe('migrate()', () => { passphrase: 'mypass', pfx: null, type: 'ClientCertificate', + modified: expect.any(Number), + created: expect.any(Number), }, ]); expect(migratedWorkspace.certificates).toBeUndefined(); @@ -65,15 +62,19 @@ describe('migrate()', () => { it('translates the scope correctly', async () => { const specW = await services.workspace.create({ + // @ts-expect-error -- legacy migration test intentionally creates an old invalid scope scope: 'spec', }); const debugW = await services.workspace.create({ + // @ts-expect-error -- legacy migration test intentionally creates an old invalid scope scope: 'debug', }); const nullW = await services.workspace.create({ + // @ts-expect-error -- legacy migration test intentionally creates an old invalid scope scope: null, }); const somethingElseW = await services.workspace.create({ + // @ts-expect-error -- legacy migration test intentionally creates an old invalid scope scope: 'something', }); const designW = await services.workspace.create({ diff --git a/packages/insomnia/src/insomnia-data/src/database/index.ts b/packages/insomnia-data/src/database/index.ts similarity index 94% rename from packages/insomnia/src/insomnia-data/src/database/index.ts rename to packages/insomnia-data/src/database/index.ts index f8b60cb877..a3fa72c6c5 100644 --- a/packages/insomnia/src/insomnia-data/src/database/index.ts +++ b/packages/insomnia-data/src/database/index.ts @@ -24,7 +24,7 @@ export async function initDatabase(impl: IDatabase, config?: NeDB.DataStoreOptio * This is a getter that returns the initialized database instance. * * Usage: - * - Import: `import { database } from '~/insomnia-data';` + * - Import: `import { database } from 'insomnia-data';` * - Call methods directly: `await database.find(type, query);` */ export let database: IDatabase = new Proxy({} as IDatabase, { diff --git a/packages/insomnia/src/insomnia-data/src/database/types.ts b/packages/insomnia-data/src/database/types.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/src/database/types.ts rename to packages/insomnia-data/src/database/types.ts diff --git a/packages/insomnia/src/insomnia-data/src/index.ts b/packages/insomnia-data/src/index.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/src/index.ts rename to packages/insomnia-data/src/index.ts diff --git a/packages/insomnia/src/insomnia-data/src/models/api-spec.ts b/packages/insomnia-data/src/models/api-spec.ts similarity index 92% rename from packages/insomnia/src/insomnia-data/src/models/api-spec.ts rename to packages/insomnia-data/src/models/api-spec.ts index 144613fa81..ce0ff9b84d 100644 --- a/packages/insomnia/src/insomnia-data/src/models/api-spec.ts +++ b/packages/insomnia-data/src/models/api-spec.ts @@ -1,4 +1,4 @@ -import { strings } from '~/insomnia-data/common'; +import { strings } from 'insomnia-data/common'; import type { BaseModel } from './base-types'; diff --git a/packages/insomnia/src/insomnia-data/src/models/base-types.ts b/packages/insomnia-data/src/models/base-types.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/src/models/base-types.ts rename to packages/insomnia-data/src/models/base-types.ts diff --git a/packages/insomnia/src/insomnia-data/src/models/ca-certificate.ts b/packages/insomnia-data/src/models/ca-certificate.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/src/models/ca-certificate.ts rename to packages/insomnia-data/src/models/ca-certificate.ts diff --git a/packages/insomnia/src/insomnia-data/src/models/client-certificate.ts b/packages/insomnia-data/src/models/client-certificate.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/src/models/client-certificate.ts rename to packages/insomnia-data/src/models/client-certificate.ts diff --git a/packages/insomnia/src/insomnia-data/src/models/cloud-credential.ts b/packages/insomnia-data/src/models/cloud-credential.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/src/models/cloud-credential.ts rename to packages/insomnia-data/src/models/cloud-credential.ts diff --git a/packages/insomnia/src/insomnia-data/src/models/cookie-jar.ts b/packages/insomnia-data/src/models/cookie-jar.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/src/models/cookie-jar.ts rename to packages/insomnia-data/src/models/cookie-jar.ts diff --git a/packages/insomnia/src/insomnia-data/src/models/environment.ts b/packages/insomnia-data/src/models/environment.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/src/models/environment.ts rename to packages/insomnia-data/src/models/environment.ts diff --git a/packages/insomnia/src/insomnia-data/src/models/git-credentials.ts b/packages/insomnia-data/src/models/git-credentials.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/src/models/git-credentials.ts rename to packages/insomnia-data/src/models/git-credentials.ts diff --git a/packages/insomnia/src/insomnia-data/src/models/git-repository.ts b/packages/insomnia-data/src/models/git-repository.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/src/models/git-repository.ts rename to packages/insomnia-data/src/models/git-repository.ts diff --git a/packages/insomnia/src/insomnia-data/src/models/grpc-request-meta.ts b/packages/insomnia-data/src/models/grpc-request-meta.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/src/models/grpc-request-meta.ts rename to packages/insomnia-data/src/models/grpc-request-meta.ts diff --git a/packages/insomnia/src/insomnia-data/src/models/grpc-request.ts b/packages/insomnia-data/src/models/grpc-request.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/src/models/grpc-request.ts rename to packages/insomnia-data/src/models/grpc-request.ts diff --git a/packages/insomnia/src/insomnia-data/src/models/index.ts b/packages/insomnia-data/src/models/index.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/src/models/index.ts rename to packages/insomnia-data/src/models/index.ts diff --git a/packages/insomnia/src/insomnia-data/src/models/mcp-payload.ts b/packages/insomnia-data/src/models/mcp-payload.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/src/models/mcp-payload.ts rename to packages/insomnia-data/src/models/mcp-payload.ts diff --git a/packages/insomnia/src/insomnia-data/src/models/mcp-request.ts b/packages/insomnia-data/src/models/mcp-request.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/src/models/mcp-request.ts rename to packages/insomnia-data/src/models/mcp-request.ts diff --git a/packages/insomnia/src/insomnia-data/src/models/mcp-response.ts b/packages/insomnia-data/src/models/mcp-response.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/src/models/mcp-response.ts rename to packages/insomnia-data/src/models/mcp-response.ts diff --git a/packages/insomnia/src/insomnia-data/src/models/mock-route.ts b/packages/insomnia-data/src/models/mock-route.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/src/models/mock-route.ts rename to packages/insomnia-data/src/models/mock-route.ts diff --git a/packages/insomnia/src/insomnia-data/src/models/mock-server.ts b/packages/insomnia-data/src/models/mock-server.ts similarity index 94% rename from packages/insomnia/src/insomnia-data/src/models/mock-server.ts rename to packages/insomnia-data/src/models/mock-server.ts index a35bb84dfc..e35cc77640 100644 --- a/packages/insomnia/src/insomnia-data/src/models/mock-server.ts +++ b/packages/insomnia-data/src/models/mock-server.ts @@ -1,4 +1,4 @@ -import { getMockServiceURL } from '~/common/constants'; +import { getMockServiceURL } from 'insomnia-data/common'; import type { BaseModel } from './base-types'; diff --git a/packages/insomnia/src/insomnia-data/src/models/o-auth-2-token.ts b/packages/insomnia-data/src/models/o-auth-2-token.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/src/models/o-auth-2-token.ts rename to packages/insomnia-data/src/models/o-auth-2-token.ts diff --git a/packages/insomnia/src/insomnia-data/src/models/organization.ts b/packages/insomnia-data/src/models/organization.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/src/models/organization.ts rename to packages/insomnia-data/src/models/organization.ts diff --git a/packages/insomnia/src/insomnia-data/src/models/plugin-data.ts b/packages/insomnia-data/src/models/plugin-data.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/src/models/plugin-data.ts rename to packages/insomnia-data/src/models/plugin-data.ts diff --git a/packages/insomnia/src/insomnia-data/src/models/project.ts b/packages/insomnia-data/src/models/project.ts similarity index 98% rename from packages/insomnia/src/insomnia-data/src/models/project.ts rename to packages/insomnia-data/src/models/project.ts index 654e2d2e5d..6e7ba3381b 100644 --- a/packages/insomnia/src/insomnia-data/src/models/project.ts +++ b/packages/insomnia-data/src/models/project.ts @@ -1,6 +1,5 @@ import type { StorageRules } from 'insomnia-api'; - -import { generateId } from '~/insomnia-data/common'; +import { generateId } from 'insomnia-data/common'; import type { BaseModel } from './base-types'; diff --git a/packages/insomnia/src/insomnia-data/src/models/proto-directory.ts b/packages/insomnia-data/src/models/proto-directory.ts similarity index 91% rename from packages/insomnia/src/insomnia-data/src/models/proto-directory.ts rename to packages/insomnia-data/src/models/proto-directory.ts index d7585b393b..2024f003cc 100644 --- a/packages/insomnia/src/insomnia-data/src/models/proto-directory.ts +++ b/packages/insomnia-data/src/models/proto-directory.ts @@ -1,4 +1,4 @@ -import { generateId } from '~/insomnia-data/common'; +import { generateId } from 'insomnia-data/common'; import type { BaseModel } from './base-types'; diff --git a/packages/insomnia/src/insomnia-data/src/models/proto-file.ts b/packages/insomnia-data/src/models/proto-file.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/src/models/proto-file.ts rename to packages/insomnia-data/src/models/proto-file.ts diff --git a/packages/insomnia/src/insomnia-data/src/models/request-group-meta.ts b/packages/insomnia-data/src/models/request-group-meta.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/src/models/request-group-meta.ts rename to packages/insomnia-data/src/models/request-group-meta.ts diff --git a/packages/insomnia/src/insomnia-data/src/models/request-group.ts b/packages/insomnia-data/src/models/request-group.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/src/models/request-group.ts rename to packages/insomnia-data/src/models/request-group.ts diff --git a/packages/insomnia/src/insomnia-data/src/models/request-meta.ts b/packages/insomnia-data/src/models/request-meta.ts similarity index 93% rename from packages/insomnia/src/insomnia-data/src/models/request-meta.ts rename to packages/insomnia-data/src/models/request-meta.ts index cc2a10ebe4..c5ba0e60c6 100644 --- a/packages/insomnia/src/insomnia-data/src/models/request-meta.ts +++ b/packages/insomnia-data/src/models/request-meta.ts @@ -1,4 +1,4 @@ -import { PREVIEW_MODE_FRIENDLY, type PreviewMode } from '~/insomnia-data/common'; +import { PREVIEW_MODE_FRIENDLY, type PreviewMode } from 'insomnia-data/common'; import type { BaseModel } from './base-types'; diff --git a/packages/insomnia/src/insomnia-data/src/models/request-version.ts b/packages/insomnia-data/src/models/request-version.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/src/models/request-version.ts rename to packages/insomnia-data/src/models/request-version.ts diff --git a/packages/insomnia/src/insomnia-data/src/models/request.ts b/packages/insomnia-data/src/models/request.ts similarity index 98% rename from packages/insomnia/src/insomnia-data/src/models/request.ts rename to packages/insomnia-data/src/models/request.ts index 95bf5d04df..a136c0fc66 100644 --- a/packages/insomnia/src/insomnia-data/src/models/request.ts +++ b/packages/insomnia-data/src/models/request.ts @@ -13,9 +13,8 @@ * */ import { getOperationAST, OperationTypeNode, parse } from 'graphql'; - -import { CONTENT_TYPE_GRAPHQL, METHOD_GET } from '~/common/constants'; -import type { OAuth1SignatureMethod } from '~/network/o-auth-1/constants'; +import type { OAuth1SignatureMethod } from 'insomnia-data/common'; +import { CONTENT_TYPE_GRAPHQL, METHOD_GET } from 'insomnia-data/common'; import type { BaseModel } from './base-types'; import { replaceIdsInFields } from './utils/replace-ids-in-fields'; diff --git a/packages/insomnia/src/insomnia-data/src/models/response.ts b/packages/insomnia-data/src/models/response.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/src/models/response.ts rename to packages/insomnia-data/src/models/response.ts diff --git a/packages/insomnia/src/insomnia-data/src/models/runner-test-result.ts b/packages/insomnia-data/src/models/runner-test-result.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/src/models/runner-test-result.ts rename to packages/insomnia-data/src/models/runner-test-result.ts diff --git a/packages/insomnia/src/insomnia-data/src/models/settings.ts b/packages/insomnia-data/src/models/settings.ts similarity index 90% rename from packages/insomnia/src/insomnia-data/src/models/settings.ts rename to packages/insomnia-data/src/models/settings.ts index a2f846ff33..0e3d1b7be0 100644 --- a/packages/insomnia/src/insomnia-data/src/models/settings.ts +++ b/packages/insomnia-data/src/models/settings.ts @@ -1,6 +1,12 @@ -import { getAppDefaultDarkTheme, getAppDefaultLightTheme, getAppDefaultTheme } from '~/common/constants'; -import { HttpVersions, type Settings as BaseSettings, UpdateChannel } from '~/insomnia-data/common'; -import { newDefaultRegistry } from '~/insomnia-data/common'; +import { + getAppDefaultDarkTheme, + getAppDefaultLightTheme, + getAppDefaultTheme, + HttpVersions, + newDefaultRegistry, + type Settings as BaseSettings, + UpdateChannel, +} from 'insomnia-data/common'; import type { BaseModel } from './base-types'; diff --git a/packages/insomnia/src/insomnia-data/src/models/socket-io-payload.ts b/packages/insomnia-data/src/models/socket-io-payload.ts similarity index 95% rename from packages/insomnia/src/insomnia-data/src/models/socket-io-payload.ts rename to packages/insomnia-data/src/models/socket-io-payload.ts index 61da3db3a2..afb185607e 100644 --- a/packages/insomnia/src/insomnia-data/src/models/socket-io-payload.ts +++ b/packages/insomnia-data/src/models/socket-io-payload.ts @@ -1,7 +1,6 @@ +import { CONTENT_TYPE_JSON } from 'insomnia-data/common'; import { v4 as uuidv4 } from 'uuid'; -import { CONTENT_TYPE_JSON } from '~/common/constants'; - import type { BaseModel } from './base-types'; import { replaceIdsInFields } from './utils/replace-ids-in-fields'; diff --git a/packages/insomnia/src/insomnia-data/src/models/socket-io-request.ts b/packages/insomnia-data/src/models/socket-io-request.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/src/models/socket-io-request.ts rename to packages/insomnia-data/src/models/socket-io-request.ts diff --git a/packages/insomnia/src/insomnia-data/src/models/socket-io-response.ts b/packages/insomnia-data/src/models/socket-io-response.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/src/models/socket-io-response.ts rename to packages/insomnia-data/src/models/socket-io-response.ts diff --git a/packages/insomnia/src/insomnia-data/src/models/stats.ts b/packages/insomnia-data/src/models/stats.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/src/models/stats.ts rename to packages/insomnia-data/src/models/stats.ts diff --git a/packages/insomnia/src/insomnia-data/src/models/types.ts b/packages/insomnia-data/src/models/types.ts similarity index 98% rename from packages/insomnia/src/insomnia-data/src/models/types.ts rename to packages/insomnia-data/src/models/types.ts index 3bf5336b99..68f8116ae4 100644 --- a/packages/insomnia/src/insomnia-data/src/models/types.ts +++ b/packages/insomnia-data/src/models/types.ts @@ -93,7 +93,7 @@ export type { Stats } from './stats'; export type { UnitTestResult } from './unit-test-result'; export type { UnitTestSuite } from './unit-test-suite'; export type { UnitTest } from './unit-test'; -export type { UserSession } from './user-session'; +export type { UserSession, AESMessage } from './user-session'; export type { WebSocketPayload } from './websocket-payload'; export type { WebSocketRequest, BaseWebSocketRequest } from './websocket-request'; export type { WebSocketResponse } from './websocket-response'; diff --git a/packages/insomnia/src/insomnia-data/src/models/unit-test-result.ts b/packages/insomnia-data/src/models/unit-test-result.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/src/models/unit-test-result.ts rename to packages/insomnia-data/src/models/unit-test-result.ts diff --git a/packages/insomnia/src/insomnia-data/src/models/unit-test-suite.ts b/packages/insomnia-data/src/models/unit-test-suite.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/src/models/unit-test-suite.ts rename to packages/insomnia-data/src/models/unit-test-suite.ts diff --git a/packages/insomnia/src/insomnia-data/src/models/unit-test.ts b/packages/insomnia-data/src/models/unit-test.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/src/models/unit-test.ts rename to packages/insomnia-data/src/models/unit-test.ts diff --git a/packages/insomnia/src/insomnia-data/src/models/user-session.ts b/packages/insomnia-data/src/models/user-session.ts similarity index 91% rename from packages/insomnia/src/insomnia-data/src/models/user-session.ts rename to packages/insomnia-data/src/models/user-session.ts index 256742bf38..ef5418611e 100644 --- a/packages/insomnia/src/insomnia-data/src/models/user-session.ts +++ b/packages/insomnia-data/src/models/user-session.ts @@ -1,7 +1,12 @@ -import type { AESMessage } from '~/account/crypt'; - import type { BaseModel } from './base-types'; +export interface AESMessage { + iv: string; + t: string; + d: string; + ad: string; +} + export interface BaseUserSession { accountId: string; id: string; diff --git a/packages/insomnia/src/insomnia-data/src/models/utils/replace-ids-in-fields.test.ts b/packages/insomnia-data/src/models/utils/replace-ids-in-fields.test.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/src/models/utils/replace-ids-in-fields.test.ts rename to packages/insomnia-data/src/models/utils/replace-ids-in-fields.test.ts diff --git a/packages/insomnia/src/insomnia-data/src/models/utils/replace-ids-in-fields.ts b/packages/insomnia-data/src/models/utils/replace-ids-in-fields.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/src/models/utils/replace-ids-in-fields.ts rename to packages/insomnia-data/src/models/utils/replace-ids-in-fields.ts diff --git a/packages/insomnia/src/insomnia-data/src/models/websocket-payload.ts b/packages/insomnia-data/src/models/websocket-payload.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/src/models/websocket-payload.ts rename to packages/insomnia-data/src/models/websocket-payload.ts diff --git a/packages/insomnia/src/insomnia-data/src/models/websocket-request.ts b/packages/insomnia-data/src/models/websocket-request.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/src/models/websocket-request.ts rename to packages/insomnia-data/src/models/websocket-request.ts diff --git a/packages/insomnia/src/insomnia-data/src/models/websocket-response.ts b/packages/insomnia-data/src/models/websocket-response.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/src/models/websocket-response.ts rename to packages/insomnia-data/src/models/websocket-response.ts diff --git a/packages/insomnia/src/insomnia-data/src/models/workspace-meta.ts b/packages/insomnia-data/src/models/workspace-meta.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/src/models/workspace-meta.ts rename to packages/insomnia-data/src/models/workspace-meta.ts diff --git a/packages/insomnia/src/insomnia-data/src/models/workspace.ts b/packages/insomnia-data/src/models/workspace.ts similarity index 97% rename from packages/insomnia/src/insomnia-data/src/models/workspace.ts rename to packages/insomnia-data/src/models/workspace.ts index fd81330936..bd7984388a 100644 --- a/packages/insomnia/src/insomnia-data/src/models/workspace.ts +++ b/packages/insomnia-data/src/models/workspace.ts @@ -1,4 +1,4 @@ -import { strings } from '~/insomnia-data/common'; +import { strings } from 'insomnia-data/common'; import type { BaseModel } from './base-types'; diff --git a/packages/insomnia/src/insomnia-data/src/services/index.ts b/packages/insomnia-data/src/services/index.ts similarity index 100% rename from packages/insomnia/src/insomnia-data/src/services/index.ts rename to packages/insomnia-data/src/services/index.ts diff --git a/packages/insomnia-data/src/tsconfig.json b/packages/insomnia-data/src/tsconfig.json new file mode 100644 index 0000000000..564332d319 --- /dev/null +++ b/packages/insomnia-data/src/tsconfig.json @@ -0,0 +1,8 @@ +{ + "extends": "../tsconfig.base.json", + "compilerOptions": { + "lib": ["ES2023", "WebWorker"], + "types": [] + }, + "include": ["./**/*.ts"] +} diff --git a/packages/insomnia-data/tsconfig.base.json b/packages/insomnia-data/tsconfig.base.json new file mode 100644 index 0000000000..ec2ede4bf8 --- /dev/null +++ b/packages/insomnia-data/tsconfig.base.json @@ -0,0 +1,22 @@ +{ + "compilerOptions": { + "esModuleInterop": true, + "skipLibCheck": true, + "target": "es2020", + "allowJs": false, + "resolveJsonModule": true, + "moduleResolution": "bundler", + "isolatedModules": true, + "noEmit": true, + "module": "ESNext", + "sourceMap": true, + "strict": true, + "noImplicitReturns": true, + "noUnusedLocals": true, + "noUnusedParameters": true, + "noFallthroughCasesInSwitch": true, + "useUnknownInCatchVariables": false, + "verbatimModuleSyntax": true, + "forceConsistentCasingInFileNames": true + } +} diff --git a/packages/insomnia-data/vitest.config.ts b/packages/insomnia-data/vitest.config.ts new file mode 100644 index 0000000000..a468e66497 --- /dev/null +++ b/packages/insomnia-data/vitest.config.ts @@ -0,0 +1,13 @@ +import { defineConfig } from 'vitest/config'; +export default defineConfig({ + test: { + setupFiles: ['./setup-vitest.ts'], + hideSkippedTests: true, + exclude: ['node_modules'], + server: { + deps: { + inline: ['tinykeys'], + }, + }, + }, +}); diff --git a/packages/insomnia-inso/src/analytics.ts b/packages/insomnia-inso/src/analytics.ts index ba4c0bf657..d8fe32fb24 100644 --- a/packages/insomnia-inso/src/analytics.ts +++ b/packages/insomnia-inso/src/analytics.ts @@ -2,10 +2,9 @@ import os from 'node:os'; import { Analytics } from '@segment/analytics-node'; import { getSegmentWriteKey } from 'insomnia/src/common/constants'; +import type { Settings } from 'insomnia-data'; import { v4 as uuidv4 } from 'uuid'; -import type { Settings } from '~/insomnia-data'; - import packageJson from '../package.json'; import neDbAdapter from './db/adapters/ne-db-adapter'; import { getAppDataDir, getDefaultProductName } from './util'; diff --git a/packages/insomnia-inso/src/cli.ts b/packages/insomnia-inso/src/cli.ts index 19a176767a..a934ce3e17 100644 --- a/packages/insomnia-inso/src/cli.ts +++ b/packages/insomnia-inso/src/cli.ts @@ -11,12 +11,7 @@ import { isDevelopment, JSON_ORDER_PREFIX, JSON_ORDER_SEPARATOR } from 'insomnia import { getSendRequestCallbackMemDb } from 'insomnia/src/common/send-request'; import { insomniaFetch } from 'insomnia/src/ui/insomnia-fetch'; import { configureFetch } from 'insomnia-api'; -import { generate, runTestsCli } from 'insomnia-testing'; -import orderedJSON from 'json-order'; -import { parseArgsStringToArgv } from 'string-argv'; -import { v4 as uuidv4 } from 'uuid'; - -import type { RequestTestResult } from '~/insomnia-data'; +import type { RequestTestResult } from 'insomnia-data'; import { type Environment, initServices, @@ -25,9 +20,13 @@ import { type RequestGroup, type UserUploadEnvironment, type Workspace, -} from '~/insomnia-data'; -import { deserializeNDJSON } from '~/insomnia-data/common'; -import { servicesNodeImpl } from '~/insomnia-data/node'; +} from 'insomnia-data'; +import { deserializeNDJSON } from 'insomnia-data/common'; +import { servicesNodeImpl } from 'insomnia-data/node'; +import { generate, runTestsCli } from 'insomnia-testing'; +import orderedJSON from 'json-order'; +import { parseArgsStringToArgv } from 'string-argv'; +import { v4 as uuidv4 } from 'uuid'; import packageJson from '../package.json'; import { flushAnalytics, InsoEvent, trackInsoEvent } from './analytics'; diff --git a/packages/insomnia-inso/src/commands/run-collection/result-report.ts b/packages/insomnia-inso/src/commands/run-collection/result-report.ts index 49509d9e4d..3357caae65 100644 --- a/packages/insomnia-inso/src/commands/run-collection/result-report.ts +++ b/packages/insomnia-inso/src/commands/run-collection/result-report.ts @@ -3,7 +3,6 @@ import nodePath from 'node:path'; import type { Consola } from 'consola'; import { pick } from 'es-toolkit'; - import type { Environment, Request, @@ -12,7 +11,8 @@ import type { RequestTestResult, UserUploadEnvironment, Workspace, -} from '~/insomnia-data'; +} from 'insomnia-data'; + import { typedKeys } from '~/utils'; interface RunReportExecution { diff --git a/packages/insomnia-inso/src/db/types.ts b/packages/insomnia-inso/src/db/types.ts index 3badd6abf5..9232d941de 100644 --- a/packages/insomnia-inso/src/db/types.ts +++ b/packages/insomnia-inso/src/db/types.ts @@ -1,4 +1,4 @@ -import type { CaCertificate, ClientCertificate, CloudProviderCredential, CookieJar, Settings } from '~/insomnia-data'; +import type { CaCertificate, ClientCertificate, CloudProviderCredential, CookieJar, Settings } from 'insomnia-data'; import type { ApiSpec, diff --git a/packages/insomnia-inso/src/reporter/index.ts b/packages/insomnia-inso/src/reporter/index.ts index fcc8db7842..8e597f532e 100644 --- a/packages/insomnia-inso/src/reporter/index.ts +++ b/packages/insomnia-inso/src/reporter/index.ts @@ -1,7 +1,6 @@ +import type { RequestTestResult } from 'insomnia-data'; import pc from 'picocolors'; -import type { RequestTestResult } from '~/insomnia-data'; - export const reporterTypes = ['dot', 'list', 'min', 'progress', 'spec', 'tap'] as const; export type TestReporter = (typeof reporterTypes)[number]; diff --git a/packages/insomnia-scripting-environment/src/objects/auth.ts b/packages/insomnia-scripting-environment/src/objects/auth.ts index d878065922..2518d49060 100644 --- a/packages/insomnia-scripting-environment/src/objects/auth.ts +++ b/packages/insomnia-scripting-environment/src/objects/auth.ts @@ -1,6 +1,5 @@ -import type { OAuth1SignatureMethod } from 'insomnia/src/network/o-auth-1/constants'; - -import type { OAuth2ResponseType, RequestAuthentication } from '~/insomnia-data'; +import type { OAuth2ResponseType, RequestAuthentication } from 'insomnia-data'; +import type { OAuth1SignatureMethod } from 'insomnia-data/common'; import { Property } from './properties'; import { Variable, VariableList } from './variables'; diff --git a/packages/insomnia-scripting-environment/src/objects/cookies.ts b/packages/insomnia-scripting-environment/src/objects/cookies.ts index 403f9c10dc..febd9ad075 100644 --- a/packages/insomnia-scripting-environment/src/objects/cookies.ts +++ b/packages/insomnia-scripting-environment/src/objects/cookies.ts @@ -1,8 +1,7 @@ +import type { Cookie as InsomniaCookie, CookieJar as InsomniaCookieJar } from 'insomnia-data'; import { Cookie as ToughCookie } from 'tough-cookie'; import { v4 as uuidv4 } from 'uuid'; -import type { Cookie as InsomniaCookie, CookieJar as InsomniaCookieJar } from '~/insomnia-data'; - import { getExistingConsole } from './console'; import { Property, PropertyList } from './properties'; diff --git a/packages/insomnia-scripting-environment/src/objects/insomnia.ts b/packages/insomnia-scripting-environment/src/objects/insomnia.ts index 3f0ff84602..ea3763621b 100644 --- a/packages/insomnia-scripting-environment/src/objects/insomnia.ts +++ b/packages/insomnia-scripting-environment/src/objects/insomnia.ts @@ -1,7 +1,6 @@ import { expect } from 'chai'; import { filterClientCertificates } from 'insomnia/src/network/certificate'; - -import type { ClientCertificate, RequestHeader, RequestTestResult, Settings } from '~/insomnia-data'; +import type { ClientCertificate, RequestHeader, RequestTestResult, Settings } from 'insomnia-data'; import { toPreRequestAuth } from './auth'; import { getExistingConsole } from './console'; diff --git a/packages/insomnia-scripting-environment/src/objects/interfaces.ts b/packages/insomnia-scripting-environment/src/objects/interfaces.ts index 90838f9365..2495d91c2c 100644 --- a/packages/insomnia-scripting-environment/src/objects/interfaces.ts +++ b/packages/insomnia-scripting-environment/src/objects/interfaces.ts @@ -1,12 +1,11 @@ import type { sendCurlAndWriteTimelineError, sendCurlAndWriteTimelineResponse } from 'insomnia/src/network/network'; - import type { ClientCertificate, CookieJar as InsomniaCookieJar, Request, RequestTestResult, Settings, -} from '~/insomnia-data'; +} from 'insomnia-data'; import type { ExecutionOption } from './execution'; import type { RequestInfoOption } from './request-info'; diff --git a/packages/insomnia-scripting-environment/src/objects/request.ts b/packages/insomnia-scripting-environment/src/objects/request.ts index 49f94ac674..f6171207ca 100644 --- a/packages/insomnia-scripting-environment/src/objects/request.ts +++ b/packages/insomnia-scripting-environment/src/objects/request.ts @@ -6,7 +6,7 @@ import { type RequestBodyParameter, type RequestPathParameter, type Settings, -} from '~/insomnia-data'; +} from 'insomnia-data'; import { type AuthOptions, type AuthOptionTypes, fromPreRequestAuth, RequestAuth } from './auth'; import type { CertificateOptions } from './certificates'; diff --git a/packages/insomnia-scripting-environment/src/objects/response.ts b/packages/insomnia-scripting-environment/src/objects/response.ts index a0091aae6b..93f737f58f 100644 --- a/packages/insomnia-scripting-environment/src/objects/response.ts +++ b/packages/insomnia-scripting-environment/src/objects/response.ts @@ -2,8 +2,7 @@ import { Ajv, type ErrorObject } from 'ajv'; import * as chai from 'chai'; import { RESPONSE_CODE_REASONS } from 'insomnia/src/common/constants'; import type { sendCurlAndWriteTimelineError, sendCurlAndWriteTimelineResponse } from 'insomnia/src/network/network'; - -import { services } from '~/insomnia-data'; +import { services } from 'insomnia-data'; import { Cookie, type CookieOptions } from './cookies'; import { CookieList } from './cookies'; diff --git a/packages/insomnia-scripting-environment/src/objects/send-request.ts b/packages/insomnia-scripting-environment/src/objects/send-request.ts index c13232a0da..af652a428f 100644 --- a/packages/insomnia-scripting-environment/src/objects/send-request.ts +++ b/packages/insomnia-scripting-environment/src/objects/send-request.ts @@ -1,9 +1,8 @@ import type { CurlRequestOutput } from 'insomnia/src/main/network/libcurl-promise'; +import { services, type Settings } from 'insomnia-data'; import { Cookie } from 'tough-cookie'; import { v4 as uuidv4 } from 'uuid'; -import { services, type Settings } from '~/insomnia-data'; - import { RequestAuth } from './auth'; import { fromPreRequestAuth } from './auth'; import type { CookieOptions } from './cookies'; diff --git a/packages/insomnia-scripting-environment/src/objects/test.ts b/packages/insomnia-scripting-environment/src/objects/test.ts index 4d356f4e29..92c27067a4 100644 --- a/packages/insomnia-scripting-environment/src/objects/test.ts +++ b/packages/insomnia-scripting-environment/src/objects/test.ts @@ -1,4 +1,4 @@ -import type { RequestTestResult } from '~/insomnia-data'; +import type { RequestTestResult } from 'insomnia-data'; /** @ignore */ export async function test(msg: string, fn: () => Promise, log: (testResult: RequestTestResult) => void) { diff --git a/packages/insomnia/config/config.json b/packages/insomnia/config/config.json index 17db7bfea7..9d77be5c32 100644 --- a/packages/insomnia/config/config.json +++ b/packages/insomnia/config/config.json @@ -5,9 +5,6 @@ "productName": "Insomnia", "synopsis": "The Collaborative API Client and Design Tool", "icon": "https://github.com/kong/insomnia/blob/develop/packages/insomnia/src/icons/icon.ico?raw=true", - "theme": "default", - "lightTheme": "studio-light", - "darkTheme": "default", "githubOrg": "Kong", "githubRepo": "insomnia", "segmentWriteKeys": { diff --git a/packages/insomnia/setup-vitest.ts b/packages/insomnia/setup-vitest.ts index a10467b41e..115e97e3e6 100644 --- a/packages/insomnia/setup-vitest.ts +++ b/packages/insomnia/setup-vitest.ts @@ -1,8 +1,7 @@ +import { initDatabase, initServices } from 'insomnia-data'; +import { servicesNodeImpl } from 'insomnia-data/node'; import { vi } from 'vitest'; -import { initDatabase, initServices } from '~/insomnia-data'; -import { servicesNodeImpl } from '~/insomnia-data/node'; - import { nodeLibcurlMock } from './src/__mocks__/@getinsomnia/node-libcurl'; import { electronMock } from './src/__mocks__/electron'; import { v4Mock } from './src/__mocks__/uuid'; diff --git a/packages/insomnia/src/__tests__/install-plugin.test.ts b/packages/insomnia/src/__tests__/install-plugin.test.ts index 16dbac4ad2..3d41eab672 100644 --- a/packages/insomnia/src/__tests__/install-plugin.test.ts +++ b/packages/insomnia/src/__tests__/install-plugin.test.ts @@ -48,7 +48,7 @@ vi.mock('electron', () => ({ }, })); -vi.mock('~/insomnia-data', () => ({ +vi.mock('insomnia-data', () => ({ services: { settings: { get: vi.fn(() => Promise.resolve({})), diff --git a/packages/insomnia/src/account/crypt.ts b/packages/insomnia/src/account/crypt.ts index e7386628a8..5034a75222 100644 --- a/packages/insomnia/src/account/crypt.ts +++ b/packages/insomnia/src/account/crypt.ts @@ -1,11 +1,7 @@ +import type { AESMessage } from 'insomnia-data'; import forge from 'node-forge'; -export interface AESMessage { - iv: string; - t: string; - d: string; - ad: string; -} +export type { AESMessage }; /** * Encrypt with RSA256 public key diff --git a/packages/insomnia/src/account/session.ts b/packages/insomnia/src/account/session.ts index 33a2fcf99f..128ad13e20 100644 --- a/packages/insomnia/src/account/session.ts +++ b/packages/insomnia/src/account/session.ts @@ -1,6 +1,5 @@ import { logout as logoutAPI, whoami } from 'insomnia-api'; - -import { type GitRepository, models, type Project, services, type WorkspaceMeta } from '~/insomnia-data'; +import { type AESMessage, type GitRepository, models, type Project, services, type WorkspaceMeta } from 'insomnia-data'; import { AI_PLUGIN_NAME, LLM_BACKENDS } from '../common/constants'; import { database } from '../common/database'; @@ -14,7 +13,7 @@ export interface SessionData { lastName: string; symmetricKey: JsonWebKey; publicKey: JsonWebKey; - encPrivateKey: crypt.AESMessage; + encPrivateKey: AESMessage; } /** Creates a session from a sessionId and derived symmetric key. */ @@ -100,7 +99,7 @@ export async function setSessionData( email: string, symmetricKey: JsonWebKey, publicKey: JsonWebKey, - encPrivateKey: crypt.AESMessage, + encPrivateKey: AESMessage, ) { const sessionData: SessionData = { id, @@ -145,7 +144,7 @@ async function _unsetSessionData() { lastName: '', symmetricKey: {} as JsonWebKey, publicKey: {} as JsonWebKey, - encPrivateKey: {} as crypt.AESMessage, + encPrivateKey: {} as AESMessage, vaultSalt: '', vaultKey: '', }); diff --git a/packages/insomnia/src/common/__fixtures__/nestedfolders.ts b/packages/insomnia/src/common/__fixtures__/nestedfolders.ts index 3dabca37ae..0fffbc5e52 100644 --- a/packages/insomnia/src/common/__fixtures__/nestedfolders.ts +++ b/packages/insomnia/src/common/__fixtures__/nestedfolders.ts @@ -1,4 +1,4 @@ -import { models, type BaseModel } from '~/insomnia-data'; +import { models, type BaseModel } from 'insomnia-data'; export const data: Record[]> = { [models.workspace.type]: [ diff --git a/packages/insomnia/src/common/__tests__/constants.test.ts b/packages/insomnia/src/common/__tests__/constants.test.ts index 127e803ef7..f5e2b7fb37 100644 --- a/packages/insomnia/src/common/__tests__/constants.test.ts +++ b/packages/insomnia/src/common/__tests__/constants.test.ts @@ -1,8 +1,7 @@ +import type { MockServer } from 'insomnia-data'; +import { models } from 'insomnia-data'; import { describe, expect, it } from 'vitest'; -import type { MockServer } from '~/insomnia-data'; -import { models } from '~/insomnia-data'; - import { FLEXIBLE_URL_REGEX, getContentTypeName } from '../constants'; const { getMockServiceBinURL } = models.mockServer; diff --git a/packages/insomnia/src/common/__tests__/har.test.ts b/packages/insomnia/src/common/__tests__/har.test.ts index 595a340dcd..361367c681 100644 --- a/packages/insomnia/src/common/__tests__/har.test.ts +++ b/packages/insomnia/src/common/__tests__/har.test.ts @@ -1,9 +1,8 @@ import path from 'node:path'; +import { type Cookie, models, type Request, type Response, services } from 'insomnia-data'; import { beforeEach, describe, expect, it } from 'vitest'; -import { type Cookie, models, type Request, type Response, services } from '~/insomnia-data'; - import { database as db } from '../../common/database'; import { exportHar, exportHarResponse, exportHarWithRequest } from '../har'; import { getRenderedRequestAndContext } from '../render'; diff --git a/packages/insomnia/src/common/__tests__/import.test.ts b/packages/insomnia/src/common/__tests__/import.test.ts index 56fab46cad..a93f968b15 100644 --- a/packages/insomnia/src/common/__tests__/import.test.ts +++ b/packages/insomnia/src/common/__tests__/import.test.ts @@ -1,10 +1,9 @@ import fs from 'node:fs'; import path from 'node:path'; +import { models, services } from 'insomnia-data'; import { describe, expect, it } from 'vitest'; -import { models, services } from '~/insomnia-data'; - import * as importUtil from '../import'; import { generateId } from '../misc'; diff --git a/packages/insomnia/src/common/__tests__/insomnia-v5.test.ts b/packages/insomnia/src/common/__tests__/insomnia-v5.test.ts index 45f8529dfc..7b7f76b0d3 100644 --- a/packages/insomnia/src/common/__tests__/insomnia-v5.test.ts +++ b/packages/insomnia/src/common/__tests__/insomnia-v5.test.ts @@ -5,11 +5,10 @@ * ensuring they work correctly and handle edge cases properly. */ +import { models, type Request, services } from 'insomnia-data'; import { beforeEach, describe, expect, it } from 'vitest'; import YAML from 'yaml'; -import { models, type Request, services } from '~/insomnia-data'; - import { INSOMNIA_SCHEMA_VERSION } from '../../common/insomnia-schema-migrations/schema-version'; import { database as db } from '../database'; import { diff --git a/packages/insomnia/src/common/__tests__/render.test.ts b/packages/insomnia/src/common/__tests__/render.test.ts index c6e04e53f7..fd8a8b7eed 100644 --- a/packages/insomnia/src/common/__tests__/render.test.ts +++ b/packages/insomnia/src/common/__tests__/render.test.ts @@ -1,8 +1,7 @@ import { createBuilder } from '@develohpanda/fluent-builder'; +import { type Environment, services, type Workspace } from 'insomnia-data'; import { beforeEach, describe, expect, it } from 'vitest'; -import { type Environment, services, type Workspace } from '~/insomnia-data'; - import { environmentModelSchema, requestGroupModelSchema } from '../../sync/__schemas__/model-schemas'; import * as renderUtils from '../render'; diff --git a/packages/insomnia/src/common/__tests__/sorting.test.ts b/packages/insomnia/src/common/__tests__/sorting.test.ts index d3bc50b239..bf3565df0c 100644 --- a/packages/insomnia/src/common/__tests__/sorting.test.ts +++ b/packages/insomnia/src/common/__tests__/sorting.test.ts @@ -1,7 +1,6 @@ +import { models } from 'insomnia-data'; import { describe, expect, it } from 'vitest'; -import { models } from '~/insomnia-data'; - import { METHOD_DELETE, METHOD_GET, diff --git a/packages/insomnia/src/common/__tests__/strings.test.ts b/packages/insomnia/src/common/__tests__/strings.test.ts index 076d913a82..6e90467931 100644 --- a/packages/insomnia/src/common/__tests__/strings.test.ts +++ b/packages/insomnia/src/common/__tests__/strings.test.ts @@ -1,8 +1,7 @@ +import { models } from 'insomnia-data'; +import { strings } from 'insomnia-data/common'; import { describe, expect, it } from 'vitest'; -import { models } from '~/insomnia-data'; -import { strings } from '~/insomnia-data/common'; - import { getWorkspaceLabel } from '../get-workspace-label'; describe('getWorkspaceLabel', () => { diff --git a/packages/insomnia/src/common/common-headers.ts b/packages/insomnia/src/common/common-headers.ts index a40ffa816c..9f364640d8 100644 --- a/packages/insomnia/src/common/common-headers.ts +++ b/packages/insomnia/src/common/common-headers.ts @@ -1,4 +1,4 @@ -import { type RequestHeader } from '~/insomnia-data'; +import { type RequestHeader } from 'insomnia-data'; import allCharsets from '../datasets/charsets'; import allMimeTypes from '../datasets/content-types'; diff --git a/packages/insomnia/src/common/constants.ts b/packages/insomnia/src/common/constants.ts index 143c9400ea..0ab814580d 100644 --- a/packages/insomnia/src/common/constants.ts +++ b/packages/insomnia/src/common/constants.ts @@ -1,11 +1,18 @@ -import { CONTENT_TYPE_FORM_URLENCODED } from '~/insomnia-data/common'; -import { isLinux, isMac, isWindows, platform } from '~/insomnia-data/common'; +import { + CONTENT_TYPE_FORM_URLENCODED, + CONTENT_TYPE_GRAPHQL, + CONTENT_TYPE_JSON, + getMockServiceURL, + isLinux, + isMac, + isWindows, + METHOD_GET, + platform, +} from 'insomnia-data/common'; import appConfig from '../../config/config.json'; import { version } from '../../package.json'; -export { CONTENT_TYPE_FORM_URLENCODED }; - // Vite is filtering out process.env variables that are not prefixed with VITE_. const ENV = 'env'; @@ -26,9 +33,6 @@ export const getInsomniaVaultKey = () => env.INSOMNIA_VAULT_KEY; export const getInsomniaVaultSrpSecret = () => env.INSOMNIA_VAULT_SRP_SECRET; export const getAppVersion = () => version; export const getProductName = () => appConfig.productName; -export const getAppDefaultTheme = () => appConfig.theme; -export const getAppDefaultLightTheme = () => appConfig.lightTheme; -export const getAppDefaultDarkTheme = () => appConfig.darkTheme; export const getAppSynopsis = () => appConfig.synopsis; export const getAppId = () => appConfig.appId; export const getAppBundlePlugins = () => appConfig.bundlePlugins; @@ -100,7 +104,7 @@ export const getOauthRelayUrl = () => env.OAUTH_RELAY_URL || 'https://app.insomn // API export const getApiBaseURL = () => env.INSOMNIA_API_URL || 'https://api.insomnia.rest'; -export const getMockServiceURL = () => env.INSOMNIA_MOCK_API_URL || 'https://mock.insomnia.run'; +export { getMockServiceURL }; export const getAIServiceURL = () => env.INSOMNIA_AI_URL || 'https://ai-helper.insomnia.rest'; @@ -126,7 +130,7 @@ export const MAX_EDITOR_FONT_SIZE = 24; export const DEFAULT_SIDEBAR_SIZE = 25; // HTTP Methods -export const METHOD_GET = 'GET'; +export { METHOD_GET }; export const METHOD_POST = 'POST'; export const METHOD_PUT = 'PUT'; export const METHOD_PATCH = 'PATCH'; @@ -147,7 +151,7 @@ export const HTTP_METHODS = [ export const METHOD_GRPC = 'GRPC'; // Content Types -export const CONTENT_TYPE_JSON = 'application/json'; +export { CONTENT_TYPE_JSON }; export const CONTENT_TYPE_PLAINTEXT = 'text/plain'; export const CONTENT_TYPE_XML = 'application/xml'; export const CONTENT_TYPE_YAML = 'application/yaml'; @@ -155,7 +159,8 @@ export const CONTENT_TYPE_EVENT_STREAM = 'text/event-stream'; export const CONTENT_TYPE_EDN = 'application/edn'; export const CONTENT_TYPE_FORM_DATA = 'multipart/form-data'; export const CONTENT_TYPE_FILE = 'application/octet-stream'; -export const CONTENT_TYPE_GRAPHQL = 'application/graphql'; +export { CONTENT_TYPE_GRAPHQL }; +export { CONTENT_TYPE_FORM_URLENCODED }; export const CONTENT_TYPE_OTHER = ''; export const contentTypesMap: Record = { [CONTENT_TYPE_EDN]: ['EDN', 'EDN'], diff --git a/packages/insomnia/src/common/cookies.ts b/packages/insomnia/src/common/cookies.ts index e2771fd18f..85fe7cec4a 100644 --- a/packages/insomnia/src/common/cookies.ts +++ b/packages/insomnia/src/common/cookies.ts @@ -1,7 +1,6 @@ +import { type Cookie as CookieModel } from 'insomnia-data'; import { Cookie, CookieJar, type CookieJSON } from 'tough-cookie'; -import { type Cookie as CookieModel } from '~/insomnia-data'; - /** * Get a list of cookie objects from a request.jar() */ diff --git a/packages/insomnia/src/common/database.ts b/packages/insomnia/src/common/database.ts index 3c86fb251b..254fe2005d 100644 --- a/packages/insomnia/src/common/database.ts +++ b/packages/insomnia/src/common/database.ts @@ -1 +1 @@ -export { database, type ChangeBufferEvent, type ChangeType, type Operation } from '~/insomnia-data'; +export { database, type ChangeBufferEvent, type ChangeType, type Operation } from 'insomnia-data'; diff --git a/packages/insomnia/src/common/get-workspace-label.ts b/packages/insomnia/src/common/get-workspace-label.ts index acf7cdc053..ef1f368b93 100644 --- a/packages/insomnia/src/common/get-workspace-label.ts +++ b/packages/insomnia/src/common/get-workspace-label.ts @@ -1,7 +1,6 @@ import type { IconProp } from '@fortawesome/fontawesome-svg-core'; - -import { models, type Workspace, type WorkspaceScope } from '~/insomnia-data'; -import { strings } from '~/insomnia-data/common'; +import { models, type Workspace, type WorkspaceScope } from 'insomnia-data'; +import { strings } from 'insomnia-data/common'; export type ProjectScopeKeys = WorkspaceScope | 'unsynced'; diff --git a/packages/insomnia/src/common/har.ts b/packages/insomnia/src/common/har.ts index 055e10d3b4..c058a944d1 100644 --- a/packages/insomnia/src/common/har.ts +++ b/packages/insomnia/src/common/har.ts @@ -1,7 +1,5 @@ import clone from 'clone'; import type * as Har from 'har-format'; -import { Cookie as ToughCookie } from 'tough-cookie'; - import { type BaseModel, models, @@ -10,7 +8,8 @@ import { type Response, services, type Workspace, -} from '~/insomnia-data'; +} from 'insomnia-data'; +import { Cookie as ToughCookie } from 'tough-cookie'; import { getAuthHeader } from '../network/authentication'; import * as plugins from '../plugins'; diff --git a/packages/insomnia/src/common/import.ts b/packages/insomnia/src/common/import.ts index d64a6953a1..9728466415 100644 --- a/packages/insomnia/src/common/import.ts +++ b/packages/insomnia/src/common/import.ts @@ -1,6 +1,3 @@ -import orderedJSON from 'json-order'; -import { z, type ZodError } from 'zod/v4'; - import { type AllTypes, type ApiSpec, @@ -19,7 +16,10 @@ import { type UnitTestSuite, type WebSocketRequest, type Workspace, -} from '~/insomnia-data'; +} from 'insomnia-data'; +import orderedJSON from 'json-order'; +import { z, type ZodError } from 'zod/v4'; + import { insecureReadFile } from '~/main/secure-read-file'; import { type InsomniaImporter } from '../main/importers/convert'; diff --git a/packages/insomnia/src/common/insomnia-v5.ts b/packages/insomnia/src/common/insomnia-v5.ts index c786e47006..cc7c26998b 100644 --- a/packages/insomnia/src/common/insomnia-v5.ts +++ b/packages/insomnia/src/common/insomnia-v5.ts @@ -12,12 +12,7 @@ * */ -import { parse, stringify } from 'yaml'; - -import { type AllExportTypes, MODELS_BY_EXPORT_TYPE } from '~/common/import'; -import { migrateToLatestYaml } from '~/common/insomnia-schema-migrations'; -import { INSOMNIA_SCHEMA_VERSION } from '~/common/insomnia-schema-migrations/schema-version'; -import type { McpRequest } from '~/insomnia-data'; +import type { McpRequest } from 'insomnia-data'; import { type ApiSpec, type BaseModel, @@ -40,7 +35,12 @@ import { type WebSocketRequest, type Workspace, type WorkspaceScope, -} from '~/insomnia-data'; +} from 'insomnia-data'; +import { parse, stringify } from 'yaml'; + +import { type AllExportTypes, MODELS_BY_EXPORT_TYPE } from '~/common/import'; +import { migrateToLatestYaml } from '~/common/insomnia-schema-migrations'; +import { INSOMNIA_SCHEMA_VERSION } from '~/common/insomnia-schema-migrations/schema-version'; import { maskVaultEnvironmentData } from '~/utils/environment-utils'; import { invariant } from '~/utils/invariant'; diff --git a/packages/insomnia/src/common/render.ts b/packages/insomnia/src/common/render.ts index d01d46fc8c..2723a387e3 100644 --- a/packages/insomnia/src/common/render.ts +++ b/packages/insomnia/src/common/render.ts @@ -1,7 +1,5 @@ import clone from 'clone'; -import orderedJSON from 'json-order'; - -import { type McpRequest, services } from '~/insomnia-data'; +import { type McpRequest, services } from 'insomnia-data'; import { type Environment, type GrpcRequest, @@ -13,7 +11,8 @@ import { type UserUploadEnvironment, type WebSocketRequest, type Workspace, -} from '~/insomnia-data'; +} from 'insomnia-data'; +import orderedJSON from 'json-order'; import { getOrInheritAuthentication, getOrInheritHeaders } from '../network/network'; import * as templating from '../templating'; diff --git a/packages/insomnia/src/common/send-request.ts b/packages/insomnia/src/common/send-request.ts index 7ff1276c94..4ce4c26df6 100644 --- a/packages/insomnia/src/common/send-request.ts +++ b/packages/insomnia/src/common/send-request.ts @@ -1,9 +1,9 @@ import fs from 'node:fs/promises'; import path from 'node:path'; -import { database, initDatabase, services, type Settings } from '~/insomnia-data'; -import { type BaseModel, type Environment, type UserUploadEnvironment } from '~/insomnia-data'; -import { createNedbDatabase } from '~/insomnia-data/node'; +import { database, initDatabase, services, type Settings } from 'insomnia-data'; +import { type BaseModel, type Environment, type UserUploadEnvironment } from 'insomnia-data'; +import { createNedbDatabase } from 'insomnia-data/node'; import { defaultSendActionRuntime, diff --git a/packages/insomnia/src/common/sorting.ts b/packages/insomnia/src/common/sorting.ts index a11db7d34b..2490a1ac5e 100644 --- a/packages/insomnia/src/common/sorting.ts +++ b/packages/insomnia/src/common/sorting.ts @@ -1,4 +1,4 @@ -import { type GrpcRequest, models, type Request, type RequestGroup } from '~/insomnia-data'; +import { type GrpcRequest, models, type Request, type RequestGroup } from 'insomnia-data'; import { type DashboardSortOrder, HTTP_METHODS, type SortOrder } from './constants'; diff --git a/packages/insomnia/src/entry.client.tsx b/packages/insomnia/src/entry.client.tsx index b93fd43ca7..7772f5f54f 100644 --- a/packages/insomnia/src/entry.client.tsx +++ b/packages/insomnia/src/entry.client.tsx @@ -2,11 +2,11 @@ import './ui/renderer-listeners'; import './ui/log'; import { configureFetch } from 'insomnia-api'; +import { initDatabase, initServices, services } from 'insomnia-data'; import { startTransition, StrictMode } from 'react'; import { hydrateRoot } from 'react-dom/client'; import { HydratedRouter } from 'react-router/dom'; -import { initDatabase, initServices, services } from '~/insomnia-data'; import { database as clientDatabase } from '~/ui/database.client'; import { insomniaFetch } from '~/ui/insomnia-fetch'; diff --git a/packages/insomnia/src/entry.hidden-window-preload.ts b/packages/insomnia/src/entry.hidden-window-preload.ts index d6e6903335..bcdf10baf0 100644 --- a/packages/insomnia/src/entry.hidden-window-preload.ts +++ b/packages/insomnia/src/entry.hidden-window-preload.ts @@ -1,8 +1,7 @@ import * as fs from 'node:fs'; import { contextBridge, ipcRenderer, type IpcRendererEvent } from 'electron'; - -import { type Compression } from '~/insomnia-data'; +import { type Compression } from 'insomnia-data'; import { asyncTasksAllSettled, diff --git a/packages/insomnia/src/entry.main.ts b/packages/insomnia/src/entry.main.ts index 2b658a1aa6..bfc06aecdf 100644 --- a/packages/insomnia/src/entry.main.ts +++ b/packages/insomnia/src/entry.main.ts @@ -7,8 +7,6 @@ import electron, { app, BrowserWindow, session } from 'electron'; import contextMenu from 'electron-context-menu'; import installExtension, { REACT_DEVELOPER_TOOLS } from 'electron-devtools-installer'; import { configureFetch } from 'insomnia-api'; - -import { getCurrentSessionId } from '~/account/session'; import { database, initDatabase, @@ -18,9 +16,11 @@ import { type RemoteProject, services, type Stats, -} from '~/insomnia-data'; -import { isMac } from '~/insomnia-data/common'; -import { servicesNodeImpl } from '~/insomnia-data/node'; +} from 'insomnia-data'; +import { isMac } from 'insomnia-data/common'; +import { servicesNodeImpl } from 'insomnia-data/node'; + +import { getCurrentSessionId } from '~/account/session'; import { mainDatabase } from '~/main/database.main'; import { registerPathHandlers } from '~/main/ipc/path'; import { registerLLMConfigServiceAPI } from '~/main/llm-config-service'; diff --git a/packages/insomnia/src/entry.preload.ts b/packages/insomnia/src/entry.preload.ts index 6a32d3e95f..3c592198b5 100644 --- a/packages/insomnia/src/entry.preload.ts +++ b/packages/insomnia/src/entry.preload.ts @@ -1,6 +1,6 @@ import { contextBridge, ipcRenderer, webUtils as webUtilities } from 'electron'; +import type { Services } from 'insomnia-data'; -import type { Services } from '~/insomnia-data'; import type { LLMBackend, LLMConfig, LLMConfigServiceAPI } from '~/main/llm-config-service'; import type { GenerateMcpSamplingResponseFunction } from '~/plugins/types'; diff --git a/packages/insomnia/src/insomnia-data/__tests__/project.test.ts b/packages/insomnia/src/insomnia-data/__tests__/project.test.ts deleted file mode 100644 index 62f5edec9b..0000000000 --- a/packages/insomnia/src/insomnia-data/__tests__/project.test.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { describe, expect, it } from 'vitest'; - -import { models } from '~/insomnia-data'; - -const defaultOrgProject = { name: 'a', remoteId: 'proj_team_123456789345678987654', _id: 'not important' }; - -const remoteA = { name: 'a', remoteId: 'notNull', _id: 'remoteA' }; -const remoteB = { name: 'b', remoteId: 'notNull', _id: 'remoteB' }; -const remote0 = { name: '0', remoteId: 'notNull', _id: 'remote0' }; - -const {sortProjects} = models.project - -describe('sortProjects', () => { - it('sorts projects by default > local > remote > name', () => { - const unSortedProjects = [remoteA, defaultOrgProject, remoteB, remote0]; - const result = sortProjects(unSortedProjects); - - const sortedProjects = [defaultOrgProject, remote0, remoteA, remoteB]; - expect(result).toEqual(sortedProjects); - }); -}); diff --git a/packages/insomnia/src/insomnia-data/common-src/request.ts b/packages/insomnia/src/insomnia-data/common-src/request.ts deleted file mode 100644 index 8d7430b6f1..0000000000 --- a/packages/insomnia/src/insomnia-data/common-src/request.ts +++ /dev/null @@ -1,10 +0,0 @@ -export const CONTENT_TYPE_FORM_URLENCODED = 'application/x-www-form-urlencoded'; - -export function getContentTypeFromHeaders(headers: any[], defaultValue: string | null = null) { - if (!Array.isArray(headers)) { - return null; - } - - const header = headers.find(({ name }) => name.toLowerCase() === 'content-type'); - return header ? header.value : defaultValue; -} diff --git a/packages/insomnia/src/insomnia-data/common.ts b/packages/insomnia/src/insomnia-data/common.ts deleted file mode 100644 index 24e06001c0..0000000000 --- a/packages/insomnia/src/insomnia-data/common.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './common-src'; diff --git a/packages/insomnia/src/insomnia-data/index.ts b/packages/insomnia/src/insomnia-data/index.ts deleted file mode 100644 index 8420b1093f..0000000000 --- a/packages/insomnia/src/insomnia-data/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './src'; diff --git a/packages/insomnia/src/insomnia-data/node.ts b/packages/insomnia/src/insomnia-data/node.ts deleted file mode 100644 index 35e5cd3d5c..0000000000 --- a/packages/insomnia/src/insomnia-data/node.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './node-src'; diff --git a/packages/insomnia/src/main/__tests__/llm-config-service.test.ts b/packages/insomnia/src/main/__tests__/llm-config-service.test.ts index 12a6c15620..e62b221501 100644 --- a/packages/insomnia/src/main/__tests__/llm-config-service.test.ts +++ b/packages/insomnia/src/main/__tests__/llm-config-service.test.ts @@ -1,7 +1,6 @@ +import { services } from 'insomnia-data'; import { beforeEach, describe, expect, it, vi } from 'vitest'; -import { services } from '~/insomnia-data'; - import { clearActiveBackend, getActiveBackend, @@ -11,7 +10,7 @@ import { updateBackendConfig, } from '../llm-config-service'; -vi.mock('~/insomnia-data', () => ({ +vi.mock('insomnia-data', () => ({ services: { pluginData: { getByKey: vi.fn(), diff --git a/packages/insomnia/src/main/analytics.ts b/packages/insomnia/src/main/analytics.ts index 5ae4683959..613d270b42 100644 --- a/packages/insomnia/src/main/analytics.ts +++ b/packages/insomnia/src/main/analytics.ts @@ -3,11 +3,10 @@ import crypto from 'node:crypto'; import { Analytics } from '@segment/analytics-node'; import * as Sentry from '@sentry/electron/main'; import { net } from 'electron'; +import { services } from 'insomnia-data'; +import { platform } from 'insomnia-data/common'; import { v4 as uuidv4 } from 'uuid'; -import { services } from '~/insomnia-data'; -import { platform } from '~/insomnia-data/common'; - import { getApiBaseURL, getAppVersion, diff --git a/packages/insomnia/src/main/api.protocol.ts b/packages/insomnia/src/main/api.protocol.ts index 42155c07fd..21d2510d75 100644 --- a/packages/insomnia/src/main/api.protocol.ts +++ b/packages/insomnia/src/main/api.protocol.ts @@ -4,8 +4,7 @@ import { parse as urlParse } from 'node:url'; import { Curl, CurlAuth, CurlFeature, CurlProxy, CurlSslOpt, type HeaderInfo } from '@getinsomnia/node-libcurl'; import { app, net, protocol, session } from 'electron'; - -import { services } from '~/insomnia-data'; +import { services } from 'insomnia-data'; import { getApiBaseURL } from '../common/constants'; import { setDefaultProtocol } from './network/libcurl-promise'; diff --git a/packages/insomnia/src/main/authorize-user-in-window.ts b/packages/insomnia/src/main/authorize-user-in-window.ts index 9b4b721520..9d4bfaf1a2 100644 --- a/packages/insomnia/src/main/authorize-user-in-window.ts +++ b/packages/insomnia/src/main/authorize-user-in-window.ts @@ -1,6 +1,5 @@ import { BrowserWindow, dialog } from 'electron'; - -import { services } from '~/insomnia-data'; +import { services } from 'insomnia-data'; export enum ChromiumVerificationResult { BLIND_TRUST = 0, diff --git a/packages/insomnia/src/main/backup.ts b/packages/insomnia/src/main/backup.ts index 404bdb7a83..222cd352d0 100644 --- a/packages/insomnia/src/main/backup.ts +++ b/packages/insomnia/src/main/backup.ts @@ -2,8 +2,8 @@ import { copyFile, mkdir, readdir } from 'node:fs/promises'; import path from 'node:path'; import electron from 'electron'; +import { services } from 'insomnia-data'; -import { services } from '~/insomnia-data'; import { getUpdateUrl } from '~/main/updates'; import { version } from '../../package.json'; diff --git a/packages/insomnia/src/main/database.main.ts b/packages/insomnia/src/main/database.main.ts index d26925f485..f532474aae 100644 --- a/packages/insomnia/src/main/database.main.ts +++ b/packages/insomnia/src/main/database.main.ts @@ -1,7 +1,6 @@ import electron from 'electron'; - -import type { DataStoreOptions, IDatabase } from '~/insomnia-data'; -import { createNedbDatabase, flushChangesImpl } from '~/insomnia-data/node'; +import type { DataStoreOptions, IDatabase } from 'insomnia-data'; +import { createNedbDatabase, flushChangesImpl } from 'insomnia-data/node'; export const mainDatabase: IDatabase = createNedbDatabase(nedbDatabase => ({ ...nedbDatabase, diff --git a/packages/insomnia/src/main/git-service.ts b/packages/insomnia/src/main/git-service.ts index ffe1a6c022..c939241c6b 100644 --- a/packages/insomnia/src/main/git-service.ts +++ b/packages/insomnia/src/main/git-service.ts @@ -17,10 +17,10 @@ import path from 'node:path'; import { app } from 'electron/main'; import { fromUrl } from 'hosted-git-info'; +import { type BaseModel, type GitRemoteProviderType, type GitRepository, models, services, type WorkspaceScope } from 'insomnia-data'; import { Errors, type PromiseFsClient } from 'isomorphic-git'; import YAML, { parse } from 'yaml'; -import { type BaseModel, type GitRemoteProviderType, type GitRepository, models, services, type WorkspaceScope } from '~/insomnia-data'; import { GitVCSOperationErrors } from '~/sync/git/git-vcs-operation-errors'; import { gitRemoteProviderRegistry, diff --git a/packages/insomnia/src/main/importers/entities.ts b/packages/insomnia/src/main/importers/entities.ts index 5379d081b5..63c6115e88 100644 --- a/packages/insomnia/src/main/importers/entities.ts +++ b/packages/insomnia/src/main/importers/entities.ts @@ -1,6 +1,5 @@ import type * as Har from 'har-format'; - -import { type RequestAuthentication } from '~/insomnia-data'; +import { type RequestAuthentication } from 'insomnia-data'; export interface Comment { comment?: string; diff --git a/packages/insomnia/src/main/importers/importers/curl.ts b/packages/insomnia/src/main/importers/importers/curl.ts index 736596dd57..aa289eedc0 100644 --- a/packages/insomnia/src/main/importers/importers/curl.ts +++ b/packages/insomnia/src/main/importers/importers/curl.ts @@ -1,9 +1,8 @@ import { URL } from 'node:url'; +import { type RequestAuthentication } from 'insomnia-data'; import { type ControlOperator, parse, type ParseEntry } from 'shell-quote'; -import { type RequestAuthentication } from '~/insomnia-data'; - import { type Converter, type ImportRequest, type Parameter } from '../entities'; export const id = 'curl'; diff --git a/packages/insomnia/src/main/importers/importers/postman.ts b/packages/insomnia/src/main/importers/importers/postman.ts index cd119bacc1..e11446da23 100644 --- a/packages/insomnia/src/main/importers/importers/postman.ts +++ b/packages/insomnia/src/main/importers/importers/postman.ts @@ -1,8 +1,8 @@ import { CONTENT_TYPE_JSON, CONTENT_TYPE_PLAINTEXT, CONTENT_TYPE_XML } from 'insomnia/src/common/constants'; import { fakerFunctions } from 'insomnia/src/templating/faker-functions'; import { forceBracketNotation } from 'insomnia/src/templating/utils'; +import { type AuthTypeOAuth2 } from 'insomnia-data'; -import { type AuthTypeOAuth2 } from '~/insomnia-data'; import { translateHandlersInScript } from '~/main/importers/importers/translate-postman-script'; import type { Converter, ImportRequest, Parameter, PathParameters } from '../entities'; diff --git a/packages/insomnia/src/main/install-plugin.ts b/packages/insomnia/src/main/install-plugin.ts index a956f4bf61..8e3a25cfad 100644 --- a/packages/insomnia/src/main/install-plugin.ts +++ b/packages/insomnia/src/main/install-plugin.ts @@ -5,8 +5,8 @@ import path from 'node:path'; import { promisify } from 'node:util'; import { app, net } from 'electron'; +import { services } from 'insomnia-data'; -import { services } from '~/insomnia-data'; import { SegmentEvent, trackSegmentEvent } from '~/main/analytics'; import { isDevelopment } from '../common/constants'; diff --git a/packages/insomnia/src/main/ipc/grpc.ts b/packages/insomnia/src/main/ipc/grpc.ts index 89f9f446f8..97cb509b5c 100644 --- a/packages/insomnia/src/main/ipc/grpc.ts +++ b/packages/insomnia/src/main/ipc/grpc.ts @@ -27,9 +27,8 @@ import type { import * as protoLoader from '@grpc/proto-loader'; import electron, { type IpcMainEvent } from 'electron'; import * as grpcReflection from 'grpc-reflection-js'; - -import { services } from '~/insomnia-data'; -import { type GrpcRequest, type GrpcRequestBody, type GrpcRequestHeader } from '~/insomnia-data'; +import { services } from 'insomnia-data'; +import { type GrpcRequest, type GrpcRequestBody, type GrpcRequestHeader } from 'insomnia-data'; import { version } from '../../../package.json'; import { parseGrpcUrl } from '../../network/grpc/parse-grpc-url'; diff --git a/packages/insomnia/src/main/ipc/main.ts b/packages/insomnia/src/main/ipc/main.ts index 3831194b0c..af1287af62 100644 --- a/packages/insomnia/src/main/ipc/main.ts +++ b/packages/insomnia/src/main/ipc/main.ts @@ -15,9 +15,9 @@ import { } from 'electron'; import type { UtilityProcess } from 'electron/main'; import iconv from 'iconv-lite'; +import { type Services, services } from 'insomnia-data'; import { AI_PLUGIN_NAME } from '~/common/constants'; -import { type Services, services } from '~/insomnia-data'; import { convert } from '~/main/importers/convert'; import { getCurrentConfig, type LLMConfigServiceAPI } from '~/main/llm-config-service'; import { multipartBufferToArray, type Part } from '~/main/multipart-buffer-to-array'; diff --git a/packages/insomnia/src/main/llm-config-service.ts b/packages/insomnia/src/main/llm-config-service.ts index 42d7f8f4ce..d3df5d803b 100644 --- a/packages/insomnia/src/main/llm-config-service.ts +++ b/packages/insomnia/src/main/llm-config-service.ts @@ -1,9 +1,9 @@ import path from 'node:path'; import { app } from 'electron'; +import { services } from 'insomnia-data'; import { LLM_BACKENDS } from '~/common/constants'; -import { services } from '~/insomnia-data'; import { SegmentEvent, trackSegmentEvent } from '~/main/analytics'; import { ipcMainHandle } from '~/main/ipc/electron'; diff --git a/packages/insomnia/src/main/mcp/common.ts b/packages/insomnia/src/main/mcp/common.ts index dc4c3ba229..22fabbdfca 100644 --- a/packages/insomnia/src/main/mcp/common.ts +++ b/packages/insomnia/src/main/mcp/common.ts @@ -12,6 +12,7 @@ import { } from '@modelcontextprotocol/sdk/types.js'; import electron from 'electron'; import { BrowserWindow } from 'electron'; +import { models, services } from 'insomnia-data'; import { Agent } from 'undici'; import { v4 as uuidV4 } from 'uuid'; @@ -27,7 +28,6 @@ import { unsupportedMethodPrefix, } from '~/common/mcp-utils'; import { generateId } from '~/common/misc'; -import { models, services } from '~/insomnia-data'; import type { CommonMcpOptions, McpClient, diff --git a/packages/insomnia/src/main/mcp/oauth-client-provider.ts b/packages/insomnia/src/main/mcp/oauth-client-provider.ts index 1310cee132..07ceadf680 100644 --- a/packages/insomnia/src/main/mcp/oauth-client-provider.ts +++ b/packages/insomnia/src/main/mcp/oauth-client-provider.ts @@ -6,10 +6,10 @@ import { type OAuthTokens, } from '@modelcontextprotocol/sdk/shared/auth.js'; import { BrowserWindow, ipcMain } from 'electron'; +import { services } from 'insomnia-data'; +import { type RequestAuthentication } from 'insomnia-data'; import { getOauthRedirectUrl } from '~/common/constants'; -import { services } from '~/insomnia-data'; -import { type RequestAuthentication } from '~/insomnia-data'; import { authorizeUserInDefaultBrowser } from '~/main/authorize-user-in-default-browser'; import type { ConnectionContext } from '~/main/mcp/common'; import { encryptOAuthUrl } from '~/network/o-auth-2/utils'; diff --git a/packages/insomnia/src/main/mcp/transport-stdio.ts b/packages/insomnia/src/main/mcp/transport-stdio.ts index b00cb51b18..839c052a0c 100644 --- a/packages/insomnia/src/main/mcp/transport-stdio.ts +++ b/packages/insomnia/src/main/mcp/transport-stdio.ts @@ -1,9 +1,9 @@ import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js'; import { InitializeRequestSchema, type JSONRPCRequest } from '@modelcontextprotocol/sdk/types.js'; +import { type McpResponse, models, services } from 'insomnia-data'; import { shellPath } from 'shell-path'; import { parse } from 'shell-quote'; -import { type McpResponse, models, services } from '~/insomnia-data'; import { type ConnectionContext, writeTimeline } from '~/main/mcp/common'; import type { OpenMcpStdioClientConnectionOptions } from '~/main/mcp/types'; diff --git a/packages/insomnia/src/main/mcp/transport-streamable-http.ts b/packages/insomnia/src/main/mcp/transport-streamable-http.ts index 0852effda3..4fcc103524 100644 --- a/packages/insomnia/src/main/mcp/transport-streamable-http.ts +++ b/packages/insomnia/src/main/mcp/transport-streamable-http.ts @@ -7,10 +7,10 @@ import { import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js'; import { isInitializeRequest } from '@modelcontextprotocol/sdk/types.js'; import { BrowserWindow } from 'electron'; +import { type McpResponse, models, services } from 'insomnia-data'; +import { type RequestHeader } from 'insomnia-data'; import type { Dispatcher } from 'undici'; -import { type McpResponse, models, services } from '~/insomnia-data'; -import { type RequestHeader } from '~/insomnia-data'; import { type ConnectionContext, getFetchDispatcher, writeEventLogAndNotify, writeTimeline } from '~/main/mcp/common'; import { MCPAuthError, type McpOAuthClientProvider } from '~/main/mcp/oauth-client-provider'; import type { McpAuthEventWithoutBase, OpenMcpHTTPClientConnectionOptions } from '~/main/mcp/types'; diff --git a/packages/insomnia/src/main/mcp/types.ts b/packages/insomnia/src/main/mcp/types.ts index 9c770dc72c..40d52a1955 100644 --- a/packages/insomnia/src/main/mcp/types.ts +++ b/packages/insomnia/src/main/mcp/types.ts @@ -2,11 +2,10 @@ import type { Client } from '@modelcontextprotocol/sdk/client/index.js'; import type { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js'; import type { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js'; import type { ClientRequest, JSONRPCResponse, Notification } from '@modelcontextprotocol/sdk/types.js'; +import type { models } from 'insomnia-data'; +import { type RequestAuthentication, type RequestHeader } from 'insomnia-data'; import type z from 'zod'; -import type { models } from '~/insomnia-data'; -import { type RequestAuthentication, type RequestHeader } from '~/insomnia-data'; - // Refer the SDK: https://github.com/modelcontextprotocol/typescript-sdk/blob/main/src/shared/protocol.ts#L504 // The Client type has missing transport property export type McpClient = Client & { transport: StreamableHTTPClientTransport | StdioClientTransport }; diff --git a/packages/insomnia/src/main/network/curl.ts b/packages/insomnia/src/main/network/curl.ts index 76986a83ad..30dc066754 100644 --- a/packages/insomnia/src/main/network/curl.ts +++ b/packages/insomnia/src/main/network/curl.ts @@ -4,11 +4,11 @@ import type { Readable } from 'node:stream'; import { Curl, CurlFeature, CurlInfoDebug, type HeaderInfo } from '@getinsomnia/node-libcurl'; import electron, { BrowserWindow } from 'electron'; +import { services } from 'insomnia-data'; +import { type CookieJar, type RequestAuthentication, type RequestHeader, type Response } from 'insomnia-data'; import { v4 as uuidV4 } from 'uuid'; import { REALTIME_EVENTS_CHANNELS } from '~/common/constants'; -import { services } from '~/insomnia-data'; -import { type CookieJar, type RequestAuthentication, type RequestHeader, type Response } from '~/insomnia-data'; import { insecureReadFile } from '~/main/secure-read-file'; import { describeByteSize, generateId, getSetCookieHeaders } from '../../common/misc'; diff --git a/packages/insomnia/src/main/network/libcurl-promise.ts b/packages/insomnia/src/main/network/libcurl-promise.ts index 1ed6336922..c2b31ca94a 100644 --- a/packages/insomnia/src/main/network/libcurl-promise.ts +++ b/packages/insomnia/src/main/network/libcurl-promise.ts @@ -19,14 +19,13 @@ import { } from '@getinsomnia/node-libcurl'; import { isValid } from 'date-fns'; import electron from 'electron'; -import { v4 as uuidv4 } from 'uuid'; - import { type ClientCertificate, type RequestHeader, type ResponseHeader, type ResponseTimelineEntry, -} from '~/insomnia-data'; +} from 'insomnia-data'; +import { v4 as uuidv4 } from 'uuid'; import { version } from '../../../package.json'; import { type AuthTypes, CONTENT_TYPE_FORM_DATA, CONTENT_TYPE_FORM_URLENCODED } from '../../common/constants'; diff --git a/packages/insomnia/src/main/network/mcp.ts b/packages/insomnia/src/main/network/mcp.ts index 28378a696d..200b47bcd5 100644 --- a/packages/insomnia/src/main/network/mcp.ts +++ b/packages/insomnia/src/main/network/mcp.ts @@ -17,10 +17,10 @@ import { ServerNotificationSchema, } from '@modelcontextprotocol/sdk/types.js'; import electron from 'electron'; +import { models, services } from 'insomnia-data'; import { getAppVersion, getProductName, REALTIME_EVENTS_CHANNELS } from '~/common/constants'; import { getMcpMethodFromMessage, METHOD_NOTIFICATION_CANCELLED } from '~/common/mcp-utils'; -import { models, services } from '~/insomnia-data'; import { SegmentEvent, trackSegmentEvent } from '~/main/analytics'; import { callTool, diff --git a/packages/insomnia/src/main/network/multipart.ts b/packages/insomnia/src/main/network/multipart.ts index 281e6dc18f..975a935272 100644 --- a/packages/insomnia/src/main/network/multipart.ts +++ b/packages/insomnia/src/main/network/multipart.ts @@ -6,10 +6,9 @@ import fs from 'node:fs'; import os from 'node:os'; import path from 'node:path'; +import { type RequestBodyParameter } from 'insomnia-data'; import { lookup } from 'mime-types'; -import { type RequestBodyParameter } from '~/insomnia-data'; - export const DEFAULT_BOUNDARY = 'X-INSOMNIA-BOUNDARY'; interface Multipart { diff --git a/packages/insomnia/src/main/network/parse-header-strings.ts b/packages/insomnia/src/main/network/parse-header-strings.ts index d475d8930d..6890c8ba6d 100644 --- a/packages/insomnia/src/main/network/parse-header-strings.ts +++ b/packages/insomnia/src/main/network/parse-header-strings.ts @@ -2,8 +2,7 @@ import { parse as urlParse } from 'node:url'; import aws4 from 'aws4'; import clone from 'clone'; - -import { type RequestAuthentication } from '~/insomnia-data'; +import { type RequestAuthentication } from 'insomnia-data'; import { CONTENT_TYPE_FORM_DATA } from '../../common/constants'; import { diff --git a/packages/insomnia/src/main/network/socket-io.ts b/packages/insomnia/src/main/network/socket-io.ts index 87129b3106..650e15cbe1 100644 --- a/packages/insomnia/src/main/network/socket-io.ts +++ b/packages/insomnia/src/main/network/socket-io.ts @@ -5,18 +5,18 @@ import tls from 'node:tls'; import electron, { BrowserWindow } from 'electron'; import { HttpProxyAgent } from 'http-proxy-agent'; import { HttpsProxyAgent } from 'https-proxy-agent'; -import { io as SocketIOClient, type ManagerOptions, type Socket, type SocketOptions } from 'socket.io-client'; -import { v4 as uuidV4 } from 'uuid'; - -import { REALTIME_EVENTS_CHANNELS } from '~/common/constants'; -import { services } from '~/insomnia-data'; +import { services } from 'insomnia-data'; import { type BaseSocketIORequest, type CookieJar, type RequestAuthentication, type RequestHeader, type SocketIOResponse, -} from '~/insomnia-data'; +} from 'insomnia-data'; +import { io as SocketIOClient, type ManagerOptions, type Socket, type SocketOptions } from 'socket.io-client'; +import { v4 as uuidV4 } from 'uuid'; + +import { REALTIME_EVENTS_CHANNELS } from '~/common/constants'; import { jarFromCookies } from '../../common/cookies'; import { generateId } from '../../common/misc'; diff --git a/packages/insomnia/src/main/network/websocket.ts b/packages/insomnia/src/main/network/websocket.ts index 2000706a7b..271c289f89 100644 --- a/packages/insomnia/src/main/network/websocket.ts +++ b/packages/insomnia/src/main/network/websocket.ts @@ -7,12 +7,7 @@ import electron, { BrowserWindow } from 'electron'; import { MessageType, parseMessage } from 'graphql-ws'; import { HttpProxyAgent } from 'http-proxy-agent'; import { HttpsProxyAgent } from 'https-proxy-agent'; -import { v4 as uuidV4 } from 'uuid'; -import { type CloseEvent, type ErrorEvent, type Event, type MessageEvent, WebSocket } from 'ws'; - -import { REALTIME_EVENTS_CHANNELS } from '~/common/constants'; -import { database } from '~/common/database'; -import { services } from '~/insomnia-data'; +import { services } from 'insomnia-data'; import { type BaseWebSocketRequest, type CookieJar, @@ -21,7 +16,12 @@ import { type RequestAuthentication, type RequestHeader, type WebSocketResponse, -} from '~/insomnia-data'; +} from 'insomnia-data'; +import { v4 as uuidV4 } from 'uuid'; +import { type CloseEvent, type ErrorEvent, type Event, type MessageEvent, WebSocket } from 'ws'; + +import { REALTIME_EVENTS_CHANNELS } from '~/common/constants'; +import { database } from '~/common/database'; import { jarFromCookies } from '../../common/cookies'; import { generateId, getSetCookieHeaders } from '../../common/misc'; diff --git a/packages/insomnia/src/main/proxy.ts b/packages/insomnia/src/main/proxy.ts index 442dfdfc49..1047833326 100644 --- a/packages/insomnia/src/main/proxy.ts +++ b/packages/insomnia/src/main/proxy.ts @@ -1,6 +1,5 @@ import { session } from 'electron/main'; - -import { models, services } from '~/insomnia-data'; +import { models, services } from 'insomnia-data'; import { type ChangeBufferEvent, database as db } from '../common/database'; import { setDefaultProtocol } from '../utils/url/protocol'; diff --git a/packages/insomnia/src/main/secure-read-file.ts b/packages/insomnia/src/main/secure-read-file.ts index 6bb5c558c8..78ecea9f0a 100644 --- a/packages/insomnia/src/main/secure-read-file.ts +++ b/packages/insomnia/src/main/secure-read-file.ts @@ -3,8 +3,8 @@ import os from 'node:os'; import path from 'node:path'; import electron from 'electron'; +import { services } from 'insomnia-data'; -import { services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { SECURITY_SETTINGS_PATH_LABEL } from '../common/misc'; diff --git a/packages/insomnia/src/main/sentry.ts b/packages/insomnia/src/main/sentry.ts index c5964e332e..f90c222a1a 100644 --- a/packages/insomnia/src/main/sentry.ts +++ b/packages/insomnia/src/main/sentry.ts @@ -1,6 +1,5 @@ import * as Sentry from '@sentry/electron/main'; - -import { models, services } from '~/insomnia-data'; +import { models, services } from 'insomnia-data'; import * as session from '../account/session'; import { type ChangeBufferEvent, database as db } from '../common/database'; diff --git a/packages/insomnia/src/main/templating-worker-database.ts b/packages/insomnia/src/main/templating-worker-database.ts index 3dce400e50..117169583d 100644 --- a/packages/insomnia/src/main/templating-worker-database.ts +++ b/packages/insomnia/src/main/templating-worker-database.ts @@ -4,9 +4,6 @@ import os from 'node:os'; import { shell } from 'electron'; import iconv from 'iconv-lite'; -import { v4 as uuidv4 } from 'uuid'; - -import { jarFromCookies } from '~/common/cookies'; import { type AllTypes, type CloudProviderCredential, @@ -15,7 +12,10 @@ import { type Response, services, type Workspace, -} from '~/insomnia-data'; +} from 'insomnia-data'; +import { v4 as uuidv4 } from 'uuid'; + +import { jarFromCookies } from '~/common/cookies'; import { getAppBundlePlugins, RESPONSE_CODE_REASONS } from '../common/constants'; import { isDevelopment } from '../common/constants'; diff --git a/packages/insomnia/src/main/updates.ts b/packages/insomnia/src/main/updates.ts index 5716d059f0..d5c627bfde 100644 --- a/packages/insomnia/src/main/updates.ts +++ b/packages/insomnia/src/main/updates.ts @@ -5,8 +5,7 @@ import path from 'node:path'; import { app, autoUpdater, BrowserWindow, dialog } from 'electron'; import log from 'electron-log'; import { autoUpdater as electronUpdater } from 'electron-updater'; - -import { services, type Settings } from '~/insomnia-data'; +import { services, type Settings } from 'insomnia-data'; import appConfig from '../../config/config.json'; import packageJSON from '../../package.json'; diff --git a/packages/insomnia/src/main/window-utils.ts b/packages/insomnia/src/main/window-utils.ts index 4770352948..6b16ec1212 100644 --- a/packages/insomnia/src/main/window-utils.ts +++ b/packages/insomnia/src/main/window-utils.ts @@ -15,8 +15,7 @@ import { screen, shell, } from 'electron'; - -import { isLinux, isMac } from '~/insomnia-data/common'; +import { isLinux, isMac } from 'insomnia-data/common'; import { getAppBuildDate, getAppVersion, getProductName, isDevelopment, MNEMONIC_SYM } from '../common/constants'; import { docsBase } from '../common/documentation'; diff --git a/packages/insomnia/src/network/__tests__/certificate.test.ts b/packages/insomnia/src/network/__tests__/certificate.test.ts index 27140131f2..4b823da63d 100644 --- a/packages/insomnia/src/network/__tests__/certificate.test.ts +++ b/packages/insomnia/src/network/__tests__/certificate.test.ts @@ -1,7 +1,6 @@ +import type { ClientCertificate } from 'insomnia-data'; import { describe, expect, it } from 'vitest'; -import type { ClientCertificate } from '~/insomnia-data'; - import { filterClientCertificates } from '../certificate'; describe('filterClientCertificates', () => { diff --git a/packages/insomnia/src/network/__tests__/network.test.ts b/packages/insomnia/src/network/__tests__/network.test.ts index 8abb29d9f9..c042831564 100644 --- a/packages/insomnia/src/network/__tests__/network.test.ts +++ b/packages/insomnia/src/network/__tests__/network.test.ts @@ -2,11 +2,10 @@ import fs from 'node:fs'; import nodePath from 'node:path'; import { CurlHttpVersion, CurlNetrc } from '@getinsomnia/node-libcurl'; +import { models, services } from 'insomnia-data'; +import { HttpVersions } from 'insomnia-data/common'; import { beforeEach, describe, expect, it } from 'vitest'; -import { models, services } from '~/insomnia-data'; -import { HttpVersions } from '~/insomnia-data/common'; - import { CONTENT_TYPE_FILE, CONTENT_TYPE_FORM_DATA, CONTENT_TYPE_FORM_URLENCODED } from '../../common/constants'; import { filterHeaders } from '../../common/misc'; import { getRenderedRequestAndContext } from '../../common/render'; diff --git a/packages/insomnia/src/network/authentication.ts b/packages/insomnia/src/network/authentication.ts index 5642019aec..0c51365c90 100644 --- a/packages/insomnia/src/network/authentication.ts +++ b/packages/insomnia/src/network/authentication.ts @@ -1,6 +1,5 @@ import * as Hawk from 'hawk'; - -import { type AuthTypeOAuth2, type RequestAuthentication, type RequestParameter } from '~/insomnia-data'; +import { type AuthTypeOAuth2, type RequestAuthentication, type RequestParameter } from 'insomnia-data'; import type { RenderedRequest } from '../templating/types'; import { COOKIE, HEADER, QUERY_PARAMS } from './api-key/constants'; diff --git a/packages/insomnia/src/network/basic-auth/get-header.ts b/packages/insomnia/src/network/basic-auth/get-header.ts index 58516d1eed..a609338747 100644 --- a/packages/insomnia/src/network/basic-auth/get-header.ts +++ b/packages/insomnia/src/network/basic-auth/get-header.ts @@ -1,4 +1,4 @@ -import { type RequestHeader } from '~/insomnia-data'; +import { type RequestHeader } from 'insomnia-data'; export function getBasicAuthHeader(username?: string | null, password?: string | null, encoding = 'utf8') { const name = 'Authorization'; diff --git a/packages/insomnia/src/network/bearer-auth/get-header.ts b/packages/insomnia/src/network/bearer-auth/get-header.ts index 0a919411bb..72eeadb9e3 100644 --- a/packages/insomnia/src/network/bearer-auth/get-header.ts +++ b/packages/insomnia/src/network/bearer-auth/get-header.ts @@ -1,4 +1,4 @@ -import { type RequestHeader } from '~/insomnia-data'; +import { type RequestHeader } from 'insomnia-data'; export function getBearerAuthHeader(token: string, prefix?: string) { const name = 'Authorization'; diff --git a/packages/insomnia/src/network/certificate.ts b/packages/insomnia/src/network/certificate.ts index aae4e25fbd..3d7a9df5f7 100644 --- a/packages/insomnia/src/network/certificate.ts +++ b/packages/insomnia/src/network/certificate.ts @@ -1,4 +1,4 @@ -import { type ClientCertificate } from '~/insomnia-data'; +import { type ClientCertificate } from 'insomnia-data'; import { setDefaultProtocol } from '../utils/url/protocol'; import { urlMatchesCertHost } from './url-matches-cert-host'; diff --git a/packages/insomnia/src/network/concurrency.ts b/packages/insomnia/src/network/concurrency.ts index bfc7bd5c1a..0ed0ea2ffd 100644 --- a/packages/insomnia/src/network/concurrency.ts +++ b/packages/insomnia/src/network/concurrency.ts @@ -1,6 +1,5 @@ import type { queueAsPromised } from 'fastq'; import * as fastq from 'fastq'; - import { type ClientCertificate, type CookieJar, @@ -9,7 +8,7 @@ import { type RequestTestResult, type Settings, type UserUploadEnvironment, -} from '~/insomnia-data'; +} from 'insomnia-data'; import type { RequestContext } from '../../../insomnia-scripting-environment/src/objects'; import { cancellableExecution } from './cancellation'; diff --git a/packages/insomnia/src/network/grpc/__tests__/write-proto-file.test.ts b/packages/insomnia/src/network/grpc/__tests__/write-proto-file.test.ts index d20f91e4f8..801df44f1b 100644 --- a/packages/insomnia/src/network/grpc/__tests__/write-proto-file.test.ts +++ b/packages/insomnia/src/network/grpc/__tests__/write-proto-file.test.ts @@ -2,10 +2,9 @@ import fs from 'node:fs'; import os from 'node:os'; import path from 'node:path'; +import { services } from 'insomnia-data'; import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'; -import { services } from '~/insomnia-data'; - import { writeProtoFile } from '../write-proto-file'; describe('writeProtoFile', () => { diff --git a/packages/insomnia/src/network/grpc/proto-directory-loader.tsx b/packages/insomnia/src/network/grpc/proto-directory-loader.tsx index b51f6b093d..9d23f3490e 100644 --- a/packages/insomnia/src/network/grpc/proto-directory-loader.tsx +++ b/packages/insomnia/src/network/grpc/proto-directory-loader.tsx @@ -1,7 +1,7 @@ import fs from 'node:fs'; import path from 'node:path'; -import { models, type ProtoDirectory,services } from '~/insomnia-data'; +import { models, type ProtoDirectory,services } from 'insomnia-data'; import { insecureReadFile } from '../../main/secure-read-file'; diff --git a/packages/insomnia/src/network/grpc/write-proto-file.ts b/packages/insomnia/src/network/grpc/write-proto-file.ts index 0fd617f7f2..e3a78cd4d0 100644 --- a/packages/insomnia/src/network/grpc/write-proto-file.ts +++ b/packages/insomnia/src/network/grpc/write-proto-file.ts @@ -2,7 +2,7 @@ import fs from 'node:fs'; import os from 'node:os'; import path from 'node:path'; -import { type BaseModel, models, type ProtoDirectory, type ProtoFile, type Workspace } from '~/insomnia-data'; +import { type BaseModel, models, type ProtoDirectory, type ProtoFile, type Workspace } from 'insomnia-data'; import { database as db } from '../../common/database'; diff --git a/packages/insomnia/src/network/network.ts b/packages/insomnia/src/network/network.ts index be87f80dc7..f2de01c14d 100644 --- a/packages/insomnia/src/network/network.ts +++ b/packages/insomnia/src/network/network.ts @@ -2,8 +2,6 @@ import fs from 'node:fs'; import nodePath from 'node:path'; import clone from 'clone'; -import orderedJSON from 'json-order'; - import { type BaseRequest, type CaCertificate, @@ -28,8 +26,10 @@ import { type UserUploadEnvironment, type WebSocketRequest, type Workspace, -} from '~/insomnia-data'; -import { serializeNDJSON } from '~/insomnia-data/common'; +} from 'insomnia-data'; +import { serializeNDJSON } from 'insomnia-data/common'; +import orderedJSON from 'json-order'; + import { getKVPairFromData } from '~/utils/environment-utils'; import type { ExecutionOption, RequestContext } from '../../../insomnia-scripting-environment/src/objects'; diff --git a/packages/insomnia/src/network/o-auth-1/get-token.ts b/packages/insomnia/src/network/o-auth-1/get-token.ts index 3a2b56fd30..91d5926708 100644 --- a/packages/insomnia/src/network/o-auth-1/get-token.ts +++ b/packages/insomnia/src/network/o-auth-1/get-token.ts @@ -4,10 +4,9 @@ */ import crypto from 'node:crypto'; +import { type RequestAuthentication, type RequestBody } from 'insomnia-data'; import OAuth1 from 'oauth-1.0a'; -import { type RequestAuthentication, type RequestBody } from '~/insomnia-data'; - import { CONTENT_TYPE_FORM_URLENCODED } from '../../common/constants'; import type { OAuth1SignatureMethod } from './constants'; import { diff --git a/packages/insomnia/src/network/o-auth-2/get-token.ts b/packages/insomnia/src/network/o-auth-2/get-token.ts index 8e97e894cc..f530284adb 100644 --- a/packages/insomnia/src/network/o-auth-2/get-token.ts +++ b/packages/insomnia/src/network/o-auth-2/get-token.ts @@ -1,8 +1,6 @@ import crypto from 'node:crypto'; import querystring from 'node:querystring'; -import { v4 as uuidv4 } from 'uuid'; - import { type AuthTypeOAuth2, models, @@ -14,7 +12,9 @@ import { type RequestParameter, type Response, services, -} from '~/insomnia-data'; +} from 'insomnia-data'; +import { v4 as uuidv4 } from 'uuid'; + import { encryptOAuthUrl } from '~/network/o-auth-2/utils'; import { version } from '../../../package.json'; diff --git a/packages/insomnia/src/network/set-cookie-util.ts b/packages/insomnia/src/network/set-cookie-util.ts index 5a1f7eff3b..e788b103a7 100644 --- a/packages/insomnia/src/network/set-cookie-util.ts +++ b/packages/insomnia/src/network/set-cookie-util.ts @@ -1,4 +1,4 @@ -import { type Cookie } from '~/insomnia-data'; +import { type Cookie } from 'insomnia-data'; import { cookiesFromJar, jarFromCookies } from '../common/cookies'; diff --git a/packages/insomnia/src/network/unit-test-feature.ts b/packages/insomnia/src/network/unit-test-feature.ts index 7ba0000e03..cd0b746463 100644 --- a/packages/insomnia/src/network/unit-test-feature.ts +++ b/packages/insomnia/src/network/unit-test-feature.ts @@ -1,4 +1,4 @@ -import { services } from '~/insomnia-data'; +import { services } from 'insomnia-data'; import { parseGraphQLReqeustBody } from '../utils/graph-ql'; import { diff --git a/packages/insomnia/src/plugins/context/__tests__/request.test.ts b/packages/insomnia/src/plugins/context/__tests__/request.test.ts index f014b09f8e..b1af989f3d 100644 --- a/packages/insomnia/src/plugins/context/__tests__/request.test.ts +++ b/packages/insomnia/src/plugins/context/__tests__/request.test.ts @@ -1,7 +1,6 @@ +import { services } from 'insomnia-data'; import { beforeEach, describe, expect, it, vi } from 'vitest'; -import { services } from '~/insomnia-data'; - import { CONTENT_TYPE_FORM_URLENCODED } from '../../../common/constants'; import { database as db } from '../../../common/database'; import * as plugin from '../request'; diff --git a/packages/insomnia/src/plugins/context/__tests__/response.test.ts b/packages/insomnia/src/plugins/context/__tests__/response.test.ts index 84073561e1..f9a2f6307c 100644 --- a/packages/insomnia/src/plugins/context/__tests__/response.test.ts +++ b/packages/insomnia/src/plugins/context/__tests__/response.test.ts @@ -2,10 +2,9 @@ import fs from 'node:fs'; import { tmpdir } from 'node:os'; import path from 'node:path'; +import { services } from 'insomnia-data'; import { describe, expect, it } from 'vitest'; -import { services } from '~/insomnia-data'; - import * as plugin from '../response'; describe('init()', () => { diff --git a/packages/insomnia/src/plugins/context/app.ts b/packages/insomnia/src/plugins/context/app.ts index df03a17bd8..c1e9ca036e 100644 --- a/packages/insomnia/src/plugins/context/app.ts +++ b/packages/insomnia/src/plugins/context/app.ts @@ -1,8 +1,7 @@ import { getAppVersion } from 'insomnia/src/common/constants'; import type { AppContext, RenderPurpose } from 'insomnia/src/templating/types'; import { invariant } from 'insomnia/src/utils/invariant'; - -import { platform } from '~/insomnia-data/common'; +import { platform } from 'insomnia-data/common'; // TODO: consider how this would work in a webworker context const isRenderer = process.type === 'renderer'; diff --git a/packages/insomnia/src/plugins/context/data.ts b/packages/insomnia/src/plugins/context/data.ts index 4fa9a0ac95..197ade4842 100644 --- a/packages/insomnia/src/plugins/context/data.ts +++ b/packages/insomnia/src/plugins/context/data.ts @@ -1,4 +1,4 @@ -import { services, type Workspace } from '~/insomnia-data'; +import { services, type Workspace } from 'insomnia-data'; import { exportWorkspacesHAR } from '../../common/har'; import { fetchImportContentFromURI, importResourcesToProject, scanResources } from '../../common/import'; diff --git a/packages/insomnia/src/plugins/context/network.ts b/packages/insomnia/src/plugins/context/network.ts index 8f2dca739d..78baabe993 100644 --- a/packages/insomnia/src/plugins/context/network.ts +++ b/packages/insomnia/src/plugins/context/network.ts @@ -1,7 +1,6 @@ +import { type Request, type ResponseHeader, services } from 'insomnia-data'; import { v4 as uuidv4 } from 'uuid'; -import { type Request, type ResponseHeader, services } from '~/insomnia-data'; - import { RESPONSE_CODE_REASONS } from '../../common/constants'; import { fetchRequestData, diff --git a/packages/insomnia/src/plugins/context/request.ts b/packages/insomnia/src/plugins/context/request.ts index 05c53f78ea..0ae448c4e2 100644 --- a/packages/insomnia/src/plugins/context/request.ts +++ b/packages/insomnia/src/plugins/context/request.ts @@ -1,4 +1,4 @@ -import { type RequestBody } from '~/insomnia-data'; +import { type RequestBody } from 'insomnia-data'; import * as misc from '../../common/misc'; import type { RenderedRequest } from '../../templating/types'; diff --git a/packages/insomnia/src/plugins/context/response.ts b/packages/insomnia/src/plugins/context/response.ts index 52efa68d2b..f8253176a1 100644 --- a/packages/insomnia/src/plugins/context/response.ts +++ b/packages/insomnia/src/plugins/context/response.ts @@ -2,7 +2,7 @@ import fs from 'node:fs'; import type { Readable } from 'node:stream'; import zlib from 'node:zlib'; -import { type Compression, type ResponseHeader, services } from '~/insomnia-data'; +import { type Compression, type ResponseHeader, services } from 'insomnia-data'; interface MaybeResponse { parentId?: string; diff --git a/packages/insomnia/src/plugins/context/store.ts b/packages/insomnia/src/plugins/context/store.ts index 48bae9e89a..72bc68aa31 100644 --- a/packages/insomnia/src/plugins/context/store.ts +++ b/packages/insomnia/src/plugins/context/store.ts @@ -1,4 +1,4 @@ -import { services } from '~/insomnia-data'; +import { services } from 'insomnia-data'; import type { Plugin } from '../index'; diff --git a/packages/insomnia/src/plugins/index.ts b/packages/insomnia/src/plugins/index.ts index 672bcfc8e5..e9dc741199 100644 --- a/packages/insomnia/src/plugins/index.ts +++ b/packages/insomnia/src/plugins/index.ts @@ -2,7 +2,6 @@ import fs from 'node:fs'; import path from 'node:path'; import electron from 'electron'; - import { type GrpcRequest, models, @@ -12,8 +11,8 @@ import { type SocketIORequest, type WebSocketRequest, type Workspace, -} from '~/insomnia-data'; -import type { PluginConfigMap } from '~/insomnia-data/common'; +} from 'insomnia-data'; +import type { PluginConfigMap } from 'insomnia-data/common'; import type { ParsedApiSpec } from '../common/api-specs'; import { getAppBundlePlugins, isDevelopment } from '../common/constants'; diff --git a/packages/insomnia/src/plugins/misc.ts b/packages/insomnia/src/plugins/misc.ts index 8aa6c7b0bb..f895f947eb 100644 --- a/packages/insomnia/src/plugins/misc.ts +++ b/packages/insomnia/src/plugins/misc.ts @@ -1,8 +1,7 @@ import Color from 'color'; +import type { ThemeSettings } from 'insomnia-data'; +import { getAppDefaultTheme } from 'insomnia-data/common'; -import type { ThemeSettings } from '~/insomnia-data'; - -import { getAppDefaultTheme } from '../common/constants'; import type { Theme } from './index'; import { type ColorScheme, getThemes } from './index'; diff --git a/packages/insomnia/src/root.tsx b/packages/insomnia/src/root.tsx index 55cc96aff2..81223ed697 100644 --- a/packages/insomnia/src/root.tsx +++ b/packages/insomnia/src/root.tsx @@ -1,5 +1,7 @@ import { config } from '@fortawesome/fontawesome-svg-core'; import type { IpcRendererEvent } from 'electron'; +import type { Settings, UserSession } from 'insomnia-data'; +import { services } from 'insomnia-data'; import type { FC } from 'react'; import { useEffect, useState } from 'react'; import { Button } from 'react-aria-components'; @@ -19,8 +21,6 @@ import { } from 'react-router'; import { EXTERNAL_VAULT_PLUGIN_NAME, isDevelopment } from '~/common/constants'; -import { services, type Settings } from '~/insomnia-data'; -import { type UserSession } from '~/insomnia-data'; import { executePluginMainAction, reloadPlugins } from '~/plugins'; import { createPlugin } from '~/plugins/create'; import { setTheme } from '~/plugins/misc'; diff --git a/packages/insomnia/src/routes/auth.authorize.tsx b/packages/insomnia/src/routes/auth.authorize.tsx index e4e6f7255e..f707de44ea 100644 --- a/packages/insomnia/src/routes/auth.authorize.tsx +++ b/packages/insomnia/src/routes/auth.authorize.tsx @@ -1,9 +1,9 @@ import { getVault } from 'insomnia-api'; +import { services } from 'insomnia-data'; import { Fragment } from 'react'; import { Button, Heading } from 'react-aria-components'; import { href, redirect, useFetchers, useNavigate } from 'react-router'; -import { services } from '~/insomnia-data'; import { SegmentEvent } from '~/ui/analytics'; import { getLoginUrl, submitAuthCode } from '~/ui/auth-session-provider.client'; import { Icon } from '~/ui/components/icon'; diff --git a/packages/insomnia/src/routes/auth.clear-vault-key.tsx b/packages/insomnia/src/routes/auth.clear-vault-key.tsx index 1d2b64f641..43abd88acd 100644 --- a/packages/insomnia/src/routes/auth.clear-vault-key.tsx +++ b/packages/insomnia/src/routes/auth.clear-vault-key.tsx @@ -1,8 +1,8 @@ import electron from 'electron'; import { getVault } from 'insomnia-api'; +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { createFetcherSubmitHook } from '~/utils/router'; import type { Route } from './+types/auth.clear-vault-key'; diff --git a/packages/insomnia/src/routes/auth.login.tsx b/packages/insomnia/src/routes/auth.login.tsx index fbd5439ca9..702d1ce525 100644 --- a/packages/insomnia/src/routes/auth.login.tsx +++ b/packages/insomnia/src/routes/auth.login.tsx @@ -1,8 +1,8 @@ +import { models } from 'insomnia-data'; import { useEffect, useState } from 'react'; import { Button } from 'react-aria-components'; import { href, redirect, useNavigate } from 'react-router'; -import { models } from '~/insomnia-data'; import { SegmentEvent } from '~/ui/analytics'; import { getLoginUrl } from '~/ui/auth-session-provider.client'; import { Icon } from '~/ui/components/icon'; diff --git a/packages/insomnia/src/routes/auth.update-vault-salt.tsx b/packages/insomnia/src/routes/auth.update-vault-salt.tsx index 0255c9aa28..4b95d9ccc4 100644 --- a/packages/insomnia/src/routes/auth.update-vault-salt.tsx +++ b/packages/insomnia/src/routes/auth.update-vault-salt.tsx @@ -1,7 +1,7 @@ import { getVault } from 'insomnia-api'; +import { services } from 'insomnia-data'; import { type ActionFunctionArgs, href } from 'react-router'; -import { services } from '~/insomnia-data'; import { createFetcherSubmitHook } from '~/utils/router'; export async function clientAction(_args: ActionFunctionArgs) { diff --git a/packages/insomnia/src/routes/auth.validate-vault-key.tsx b/packages/insomnia/src/routes/auth.validate-vault-key.tsx index 6790065def..69049b8c35 100644 --- a/packages/insomnia/src/routes/auth.validate-vault-key.tsx +++ b/packages/insomnia/src/routes/auth.validate-vault-key.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { type ActionFunctionArgs, href } from 'react-router'; -import { services } from '~/insomnia-data'; import { saveVaultKey, validateVaultKey } from '~/ui/vault-key.client'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/cloud-credentials.$cloudCredentialId.delete.ts b/packages/insomnia/src/routes/cloud-credentials.$cloudCredentialId.delete.ts index 636e3309de..24c382d469 100644 --- a/packages/insomnia/src/routes/cloud-credentials.$cloudCredentialId.delete.ts +++ b/packages/insomnia/src/routes/cloud-credentials.$cloudCredentialId.delete.ts @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/cloud-credentials.$cloudCredentialId.update.ts b/packages/insomnia/src/routes/cloud-credentials.$cloudCredentialId.update.ts index f05d35ddf6..3864d90d90 100644 --- a/packages/insomnia/src/routes/cloud-credentials.$cloudCredentialId.update.ts +++ b/packages/insomnia/src/routes/cloud-credentials.$cloudCredentialId.update.ts @@ -1,7 +1,7 @@ +import { type CloudProviderCredential,services } from 'insomnia-data'; import { href } from 'react-router'; import { EXTERNAL_VAULT_PLUGIN_NAME } from '~/common/constants'; -import { type CloudProviderCredential,services } from '~/insomnia-data'; import { executePluginMainAction } from '~/plugins'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/cloud-credentials.create.tsx b/packages/insomnia/src/routes/cloud-credentials.create.tsx index d586dea7ae..3da8fe7e4d 100644 --- a/packages/insomnia/src/routes/cloud-credentials.create.tsx +++ b/packages/insomnia/src/routes/cloud-credentials.create.tsx @@ -1,7 +1,7 @@ +import { type CloudProviderCredential,services } from 'insomnia-data'; import { href } from 'react-router'; import { EXTERNAL_VAULT_PLUGIN_NAME } from '~/common/constants'; -import { type CloudProviderCredential,services } from '~/insomnia-data'; import { executePluginMainAction } from '~/plugins'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/commands.tsx b/packages/insomnia/src/routes/commands.tsx index 9afd96dbd9..590b862b6e 100644 --- a/packages/insomnia/src/routes/commands.tsx +++ b/packages/insomnia/src/routes/commands.tsx @@ -1,8 +1,8 @@ import type { Organization } from 'insomnia-api'; +import { type Environment, type GrpcRequest, models, type Project, type Request, type RequestGroup, services, type WebSocketRequest, type Workspace } from 'insomnia-data'; import { database } from '~/common/database'; import { fuzzyMatch } from '~/common/misc'; -import { type Environment, type GrpcRequest, models, type Project, type Request, type RequestGroup, services, type WebSocketRequest, type Workspace } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherLoadHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/git-credentials.$id.delete.tsx b/packages/insomnia/src/routes/git-credentials.$id.delete.tsx index 284e304569..d817bf8d70 100644 --- a/packages/insomnia/src/routes/git-credentials.$id.delete.tsx +++ b/packages/insomnia/src/routes/git-credentials.$id.delete.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/git-credentials.$id.related-projects.tsx b/packages/insomnia/src/routes/git-credentials.$id.related-projects.tsx index 2992a99bec..e02c1b7121 100644 --- a/packages/insomnia/src/routes/git-credentials.$id.related-projects.tsx +++ b/packages/insomnia/src/routes/git-credentials.$id.related-projects.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { createFetcherLoadHook } from '~/utils/router'; import type { Route } from './+types/git-credentials.$id.related-projects'; diff --git a/packages/insomnia/src/routes/git-credentials.$id.update.tsx b/packages/insomnia/src/routes/git-credentials.$id.update.tsx index 2966e80db5..67333f1b8a 100644 --- a/packages/insomnia/src/routes/git-credentials.$id.update.tsx +++ b/packages/insomnia/src/routes/git-credentials.$id.update.tsx @@ -1,6 +1,6 @@ +import { type GitCredentialsV2,models, services } from 'insomnia-data'; import { href } from 'react-router'; -import { type GitCredentialsV2,models, services } from '~/insomnia-data'; import { createFetcherSubmitHook } from '~/utils/router'; import type { Route } from './+types/git-credentials.$id.update'; diff --git a/packages/insomnia/src/routes/git-credentials.complete-sign-in.tsx b/packages/insomnia/src/routes/git-credentials.complete-sign-in.tsx index b829233671..8b77b74a7d 100644 --- a/packages/insomnia/src/routes/git-credentials.complete-sign-in.tsx +++ b/packages/insomnia/src/routes/git-credentials.complete-sign-in.tsx @@ -1,6 +1,6 @@ +import { type GitRemoteProviderType } from 'insomnia-data'; import { href } from 'react-router'; -import { type GitRemoteProviderType } from '~/insomnia-data'; import { createFetcherSubmitHook } from '~/utils/router'; import type { Route } from './+types/git-credentials.complete-sign-in'; diff --git a/packages/insomnia/src/routes/git-credentials.create.tsx b/packages/insomnia/src/routes/git-credentials.create.tsx index 0d9ce1d66a..bb5c090e4c 100644 --- a/packages/insomnia/src/routes/git-credentials.create.tsx +++ b/packages/insomnia/src/routes/git-credentials.create.tsx @@ -1,6 +1,6 @@ +import { type BaseGitCredentialsV2,services } from 'insomnia-data'; import { href } from 'react-router'; -import { type BaseGitCredentialsV2,services } from '~/insomnia-data'; import { createFetcherSubmitHook } from '~/utils/router'; import type { Route } from './+types/git-credentials.create'; diff --git a/packages/insomnia/src/routes/git-credentials.tsx b/packages/insomnia/src/routes/git-credentials.tsx index da24f7a807..3fb502586f 100644 --- a/packages/insomnia/src/routes/git-credentials.tsx +++ b/packages/insomnia/src/routes/git-credentials.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href, type LoaderFunctionArgs } from 'react-router'; -import { services } from '~/insomnia-data'; import { createFetcherLoadHook } from '~/utils/router'; export async function clientLoader(_args: LoaderFunctionArgs) { diff --git a/packages/insomnia/src/routes/git-credentials.update-sign-in.tsx b/packages/insomnia/src/routes/git-credentials.update-sign-in.tsx index 4d87b6e9ae..44756203c9 100644 --- a/packages/insomnia/src/routes/git-credentials.update-sign-in.tsx +++ b/packages/insomnia/src/routes/git-credentials.update-sign-in.tsx @@ -1,6 +1,6 @@ +import type { GitRemoteProviderType } from 'insomnia-data'; import { href } from 'react-router'; -import type { GitRemoteProviderType } from '~/insomnia-data'; import { createFetcherSubmitHook } from '~/utils/router'; import type { Route } from './+types/git-credentials.update-sign-in'; diff --git a/packages/insomnia/src/routes/git.all-connected-repos.tsx b/packages/insomnia/src/routes/git.all-connected-repos.tsx index 7ba961d6d7..fa932c82bb 100644 --- a/packages/insomnia/src/routes/git.all-connected-repos.tsx +++ b/packages/insomnia/src/routes/git.all-connected-repos.tsx @@ -1,6 +1,6 @@ +import { database, models, type Organization, type Project, services } from 'insomnia-data'; import { href } from 'react-router'; -import { database, models, type Organization, type Project, services } from '~/insomnia-data'; import { createFetcherLoadHook } from '~/utils/router'; export async function clientLoader() { diff --git a/packages/insomnia/src/routes/import.resources.tsx b/packages/insomnia/src/routes/import.resources.tsx index 8a9aa5e24d..59181958b2 100644 --- a/packages/insomnia/src/routes/import.resources.tsx +++ b/packages/insomnia/src/routes/import.resources.tsx @@ -1,7 +1,7 @@ +import { models, services, type Workspace } from 'insomnia-data'; import { href } from 'react-router'; import { importResourcesToProject, importResourcesToWorkspace } from '~/common/import'; -import { models, services, type Workspace } from '~/insomnia-data'; import { initializeLocalBackendProjectAndMarkForSync, pushSnapshotOnInitialize, diff --git a/packages/insomnia/src/routes/organization.$organizationId.collaborators-check-seats.tsx b/packages/insomnia/src/routes/organization.$organizationId.collaborators-check-seats.tsx index 0599e63193..44550e471c 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.collaborators-check-seats.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.collaborators-check-seats.tsx @@ -1,8 +1,8 @@ import { checkSeats } from 'insomnia-api'; +import { services } from 'insomnia-data'; import { href } from 'react-router'; import { v4 as uuidv4 } from 'uuid'; -import { services } from '~/insomnia-data'; import { createFetcherLoadHook } from '~/utils/router'; import type { Route } from './+types/organization.$organizationId.collaborators-check-seats'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.collaborators-search.tsx b/packages/insomnia/src/routes/organization.$organizationId.collaborators-search.tsx index 2180b26840..9aa21cf031 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.collaborators-search.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.collaborators-search.tsx @@ -1,7 +1,7 @@ import { searchCollaborators } from 'insomnia-api'; +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { createFetcherLoadHook } from '~/utils/router'; import type { Route } from './+types/organization.$organizationId.collaborators-search'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.collaborators.invites.$invitationId.reinvite.tsx b/packages/insomnia/src/routes/organization.$organizationId.collaborators.invites.$invitationId.reinvite.tsx index 6cd137af9d..10f911ccdf 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.collaborators.invites.$invitationId.reinvite.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.collaborators.invites.$invitationId.reinvite.tsx @@ -1,7 +1,7 @@ import { reinvite } from 'insomnia-api'; +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { createFetcherSubmitHook } from '~/utils/router'; import type { Route } from './+types/organization.$organizationId.collaborators.invites.$invitationId.reinvite'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.collaborators.invites.$invitationId.tsx b/packages/insomnia/src/routes/organization.$organizationId.collaborators.invites.$invitationId.tsx index e236906471..f19b860713 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.collaborators.invites.$invitationId.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.collaborators.invites.$invitationId.tsx @@ -1,7 +1,7 @@ import { updateInvitationRole } from 'insomnia-api'; +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.collaborators.tsx b/packages/insomnia/src/routes/organization.$organizationId.collaborators.tsx index 732fee0a42..4128b3038e 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.collaborators.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.collaborators.tsx @@ -1,7 +1,7 @@ import { getCollaborators } from 'insomnia-api'; +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { createFetcherLoadHook } from '~/utils/router'; import type { Route } from './+types/organization.$organizationId.collaborators'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.insomnia-sync.pull-remote-file.tsx b/packages/insomnia/src/routes/organization.$organizationId.insomnia-sync.pull-remote-file.tsx index bdb0e39ea4..8ac87d6361 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.insomnia-sync.pull-remote-file.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.insomnia-sync.pull-remote-file.tsx @@ -1,6 +1,6 @@ +import { models, services } from 'insomnia-data'; import { href, redirect } from 'react-router'; -import { models, services } from '~/insomnia-data'; import { VCSInstance } from '~/sync/vcs/insomnia-sync'; import { pullBackendProject } from '~/sync/vcs/pull-backend-project'; import { invariant } from '~/utils/invariant'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.members.$userId.roles.tsx b/packages/insomnia/src/routes/organization.$organizationId.members.$userId.roles.tsx index 5f3201d63e..5dd9eb22fd 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.members.$userId.roles.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.members.$userId.roles.tsx @@ -1,7 +1,7 @@ import { updateUserRoles } from 'insomnia-api'; +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.permissions.tsx b/packages/insomnia/src/routes/organization.$organizationId.permissions.tsx index fe16d96ecf..6448422db4 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.permissions.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.permissions.tsx @@ -1,7 +1,7 @@ import { type Billing, type FeatureList, getOrganizationFeatures, type Organization } from 'insomnia-api'; +import { models, services } from 'insomnia-data'; import { href, redirect, type ShouldRevalidateFunctionArgs } from 'react-router'; -import { models, services } from '~/insomnia-data'; import { createFetcherLoadHook } from '~/utils/router'; import type { Route } from './+types/organization.$organizationId.permissions'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId._index.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId._index.tsx index d50d5e57bd..5767d59326 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId._index.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId._index.tsx @@ -1,5 +1,6 @@ import type { IconName, IconProp } from '@fortawesome/fontawesome-svg-core'; import { getLearningFeature } from 'insomnia-api'; +import { type ApiSpec, type GitRepository, type MockServer, models, type Project, services, type Workspace, type WorkspaceMeta, type WorkspaceScope } from 'insomnia-data'; import { Fragment, useEffect, useMemo, useState } from 'react'; import { Button, @@ -36,7 +37,6 @@ import { database } from '~/common/database'; import { scopeToBgColorMap, scopeToIconMap, scopeToLabelMap, scopeToTextColorMap } from '~/common/get-workspace-label'; import { fuzzyMatchAll, isNotNullOrUndefined } from '~/common/misc'; import { descendingNumberSort, sortMethodMap } from '~/common/sorting'; -import { type ApiSpec, type GitRepository, type MockServer, models, type Project, services, type Workspace, type WorkspaceMeta, type WorkspaceScope } from '~/insomnia-data'; import { useRootLoaderData } from '~/root'; import { useOrganizationLoaderData } from '~/routes/organization'; import { useInsomniaSyncPullRemoteFileActionFetcher } from '~/routes/organization.$organizationId.insomnia-sync.pull-remote-file'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.delete.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.delete.tsx index 342c13a789..72c2bf668b 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.delete.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.delete.tsx @@ -1,9 +1,9 @@ import { deleteTeamProject, isApiError } from 'insomnia-api'; +import { services } from 'insomnia-data'; import { href, redirect } from 'react-router'; import { database } from '~/common/database'; import { projectLock } from '~/common/project'; -import { services } from '~/insomnia-data'; import { reportGitProjectCount } from '~/routes/organization.$organizationId.project.new'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook, getInitialRouteForOrganization } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.list-workspaces.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.list-workspaces.tsx index 0a2c970080..5ac9088fc6 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.list-workspaces.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.list-workspaces.tsx @@ -1,3 +1,4 @@ +import { type ApiSpec, type GitRepository, type MockServer, models, type Project, services, type WorkspaceMeta } from 'insomnia-data'; import { href } from 'react-router'; import { parseApiSpec, type ParsedApiSpec } from '~/common/api-specs'; @@ -5,7 +6,6 @@ import { database } from '~/common/database'; import { scopeToLabelMap } from '~/common/get-workspace-label'; import { isNotNullOrUndefined } from '~/common/misc'; import { descendingNumberSort } from '~/common/sorting'; -import { type ApiSpec, type GitRepository, type MockServer, models, type Project, services, type WorkspaceMeta } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherLoadHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.move-workspace.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.move-workspace.tsx index 5cc4e0fd18..ce98fd79a1 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.move-workspace.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.move-workspace.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.move.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.move.tsx index f0513f0c6c..8061899235 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.move.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.move.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.tsx index 7ff409df58..ce55ce0e9c 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href, redirect, useRouteLoaderData } from 'react-router'; -import { services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import type { Route } from './+types/organization.$organizationId.project.$projectId'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.update.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.update.tsx index 905938336e..562abf376b 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.update.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.update.tsx @@ -1,9 +1,9 @@ import { createTeamProject, deleteTeamProject, isApiError, updateTeamProject } from 'insomnia-api'; +import { models, services, type WorkspaceMeta } from 'insomnia-data'; import { href } from 'react-router'; import { database } from '~/common/database'; import { projectLock } from '~/common/project'; -import { models, services, type WorkspaceMeta } from '~/insomnia-data'; import { reportGitProjectCount } from '~/routes/organization.$organizationId.project.new'; import { SegmentEvent } from '~/ui/analytics'; import { showToast } from '~/ui/components/toast-notification'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.cacert.delete.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.cacert.delete.tsx index fa7b40952a..f113f4ceca 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.cacert.delete.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.cacert.delete.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.cacert.new.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.cacert.new.tsx index 1dcd918bfc..a9b0df0271 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.cacert.new.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.cacert.new.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { createFetcherSubmitHook } from '~/utils/router'; import type { Route } from './+types/organization.$organizationId.project.$projectId.workspace.$workspaceId.cacert.new'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.cacert.update.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.cacert.update.tsx index ea460bf88d..d649513d21 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.cacert.update.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.cacert.update.tsx @@ -1,6 +1,6 @@ +import { type CaCertificate, services } from 'insomnia-data'; import { href } from 'react-router'; -import { type CaCertificate, services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.clientcert.delete.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.clientcert.delete.tsx index dfe8f70e8c..0412f91895 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.clientcert.delete.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.clientcert.delete.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.clientcert.new.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.clientcert.new.tsx index 5cec64ff8b..4cfa42bd03 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.clientcert.new.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.clientcert.new.tsx @@ -1,6 +1,6 @@ +import { type ClientCertificate,services } from 'insomnia-data'; import { href } from 'react-router'; -import { type ClientCertificate,services } from '~/insomnia-data'; import { createFetcherSubmitHook } from '~/utils/router'; import type { Route } from './+types/organization.$organizationId.project.$projectId.workspace.$workspaceId.clientcert.new'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.clientcert.update.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.clientcert.update.tsx index a465abb27b..b9b4defce8 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.clientcert.update.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.clientcert.update.tsx @@ -1,6 +1,6 @@ +import { type ClientCertificate,services } from 'insomnia-data'; import { href } from 'react-router'; -import { type ClientCertificate,services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.reorder.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.reorder.tsx index 95a694c8b9..b51522a07f 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.reorder.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.reorder.tsx @@ -1,6 +1,6 @@ +import { models, services } from 'insomnia-data'; import { href } from 'react-router'; -import { models, services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.$requestGroupId.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.$requestGroupId.tsx index 4fa28d6f28..e4d29cbc4b 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.$requestGroupId.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.$requestGroupId.tsx @@ -1,6 +1,6 @@ +import { type RequestGroup,services } from 'insomnia-data'; import { href, redirect, useRouteLoaderData } from 'react-router'; -import { type RequestGroup,services } from '~/insomnia-data'; import { showResourceNotFoundToast } from '~/ui/components/toast-notification'; import type { Route } from './+types/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.$requestGroupId'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.$requestGroupId.update-meta.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.$requestGroupId.update-meta.tsx index cc9668eea0..fccd31357d 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.$requestGroupId.update-meta.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.$requestGroupId.update-meta.tsx @@ -1,6 +1,6 @@ +import { type RequestGroupMeta, services } from 'insomnia-data'; import { href } from 'react-router'; -import { type RequestGroupMeta,services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.$requestGroupId.update.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.$requestGroupId.update.tsx index 9896cfd8d3..1a10df2a42 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.$requestGroupId.update.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.$requestGroupId.update.tsx @@ -1,6 +1,6 @@ +import { type RequestGroup, services } from 'insomnia-data'; import { href } from 'react-router'; -import { type RequestGroup,services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.delete.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.delete.tsx index 582c527c70..728dac3e38 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.delete.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.delete.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.duplicate.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.duplicate.tsx index 0d455dbd7f..2bf46ca027 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.duplicate.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.duplicate.tsx @@ -1,6 +1,6 @@ +import { type RequestGroup, services } from 'insomnia-data'; import { href } from 'react-router'; -import { type RequestGroup, services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.new.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.new.tsx index d9157682b3..67bd3ae254 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.new.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.new.tsx @@ -1,6 +1,6 @@ +import { type EnvironmentType, models, services } from 'insomnia-data'; import { href } from 'react-router'; -import { type EnvironmentType, models, services } from '~/insomnia-data'; import { createFetcherSubmitHook } from '~/utils/router'; import type { Route } from './+types/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.new'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.connect.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.connect.tsx index 195eb28ff0..fc4d8e4524 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.connect.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.connect.tsx @@ -1,9 +1,9 @@ import { GRAPHQL_TRANSPORT_WS_PROTOCOL, MessageType } from 'graphql-ws'; +import { type McpTransportType, models, services } from 'insomnia-data'; +import { type CookieJar, type RequestAuthentication, type RequestHeader } from 'insomnia-data'; import { href } from 'react-router'; import type { ChangeBufferEvent } from '~/common/database'; -import { type McpTransportType, models, services } from '~/insomnia-data'; -import { type CookieJar, type RequestAuthentication, type RequestHeader } from '~/insomnia-data'; import { getAuthHeader } from '~/network/authentication'; import type { RenderedRequest } from '~/templating/types'; import { invariant } from '~/utils/invariant'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.duplicate.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.duplicate.tsx index 5ed5c40e21..626e4b0807 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.duplicate.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.duplicate.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href, redirect } from 'react-router'; -import { services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.grant-access.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.grant-access.tsx index d45194c9ff..8b1a68193f 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.grant-access.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.grant-access.tsx @@ -1,7 +1,7 @@ +import type { McpRequest } from 'insomnia-data'; +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import type { McpRequest } from '~/insomnia-data'; -import { services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.response.delete-all.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.response.delete-all.tsx index fa625ffb40..c0d1da6336 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.response.delete-all.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.response.delete-all.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.response.delete.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.response.delete.tsx index 43fceb29f6..2f43f03c4f 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.response.delete.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.response.delete.tsx @@ -1,6 +1,6 @@ +import { models, services } from 'insomnia-data'; import { href } from 'react-router'; -import { models, services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.send.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.send.tsx index f8090ad9bf..f1a4478e97 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.send.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.send.tsx @@ -2,11 +2,6 @@ import { createWriteStream } from 'node:fs'; import path from 'node:path'; import contentDisposition from 'content-disposition'; -import { extension as mimeExtension } from 'mime-types'; -import { href, redirect } from 'react-router'; -import { v4 as uuidv4 } from 'uuid'; - -import { getContentDispositionHeader } from '~/common/misc'; import { type Environment, models, @@ -16,7 +11,12 @@ import { type RunnerResultPerRequestPerIteration, services, type UserUploadEnvironment, -} from '~/insomnia-data'; +} from 'insomnia-data'; +import { extension as mimeExtension } from 'mime-types'; +import { href, redirect } from 'react-router'; +import { v4 as uuidv4 } from 'uuid'; + +import { getContentDispositionHeader } from '~/common/misc'; import type { ResponsePatch } from '~/main/network/libcurl-promise'; import type { TimingStep } from '~/main/network/request-timing'; import { diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.tsx index 1dc8a54ebb..96b97e20bf 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.tsx @@ -1,6 +1,3 @@ -import { href, Outlet, redirect, useRouteLoaderData } from 'react-router'; - -import { database } from '~/common/database'; import { type BaseModel, type GrpcRequest, @@ -21,7 +18,10 @@ import { type SocketIOResponse, type WebSocketRequest, type WebSocketResponse, -} from '~/insomnia-data'; +} from 'insomnia-data'; +import { href, Outlet, redirect, useRouteLoaderData } from 'react-router'; + +import { database } from '~/common/database'; import { showResourceNotFoundToast } from '~/ui/components/toast-notification'; import type { Route } from './+types/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.update-meta.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.update-meta.tsx index a48bc97fd2..a393696869 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.update-meta.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.update-meta.tsx @@ -1,6 +1,6 @@ +import { type GrpcRequestMeta, models, type RequestMeta,services } from 'insomnia-data'; import { href } from 'react-router'; -import { type GrpcRequestMeta, models, type RequestMeta,services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.update-payload.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.update-payload.tsx index 57b5aabfaf..37ab9571eb 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.update-payload.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.update-payload.tsx @@ -1,6 +1,6 @@ +import { type McpPayload, models, services, type SocketIOPayload } from 'insomnia-data'; import { href } from 'react-router'; -import { type McpPayload, models, services, type SocketIOPayload } from '~/insomnia-data'; import { createFetcherSubmitHook } from '~/utils/router'; import type { Route } from './+types/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.update-payload'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.update.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.update.tsx index 9429c399cc..110af1551b 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.update.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.update.tsx @@ -1,6 +1,6 @@ +import { models, services, type WebSocketRequest } from 'insomnia-data'; import { href } from 'react-router'; -import { models, services, type WebSocketRequest } from '~/insomnia-data'; import { SegmentEvent } from '~/ui/analytics'; import { updateMimeType } from '~/ui/components/dropdowns/content-type-dropdown'; import { invariant } from '~/utils/invariant'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.delete.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.delete.tsx index 5b2bf98884..eae624e4ed 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.delete.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.delete.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href, redirect } from 'react-router'; -import { services } from '~/insomnia-data'; import { SegmentEvent } from '~/ui/analytics'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.new-mock-send.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.new-mock-send.tsx index ed40d2fb1e..17a3b4ffb5 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.new-mock-send.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.new-mock-send.tsx @@ -1,6 +1,6 @@ +import { type Request,services } from 'insomnia-data'; import { href } from 'react-router'; -import { type Request,services } from '~/insomnia-data'; import { fetchRequestData, responseTransform, diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.new.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.new.tsx index a8b2d382a3..5e77b5eaeb 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.new.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.new.tsx @@ -1,3 +1,5 @@ +import { services } from 'insomnia-data'; +import { type Request, type RequestBody, type RequestParameter } from 'insomnia-data'; import { href, redirect } from 'react-router'; import { @@ -8,8 +10,6 @@ import { METHOD_GET, METHOD_POST, } from '~/common/constants'; -import { services } from '~/insomnia-data'; -import { type Request, type RequestBody, type RequestParameter } from '~/insomnia-data'; import { SegmentEvent } from '~/ui/analytics'; import type { CreateRequestType } from '~/ui/hooks/use-request'; import { invariant } from '~/utils/invariant'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.runner.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.runner.tsx index 8d87f50d85..d9cd87b67b 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.runner.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.runner.tsx @@ -1,3 +1,11 @@ +import { + models, + type ResponseTimelineEntry, + type RunnerResultPerRequest, + type RunnerTestResult, + services, + type UserUploadEnvironment, +} from 'insomnia-data'; import porderedJSON from 'json-order'; import React, { type FC, useCallback, useEffect, useMemo, useState } from 'react'; import { @@ -22,14 +30,6 @@ import * as reactUse from 'react-use'; import { v4 as uuidv4 } from 'uuid'; import { JSON_ORDER_PREFIX, JSON_ORDER_SEPARATOR } from '~/common/constants'; -import { - models, - type ResponseTimelineEntry, - type RunnerResultPerRequest, - type RunnerTestResult, - services, - type UserUploadEnvironment, -} from '~/insomnia-data'; import type { TimingStep } from '~/main/network/request-timing'; import { cancelRequestById } from '~/network/cancellation'; import { defaultSendActionRuntime } from '~/network/network'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.tsx index 8ca5fdf0e2..f5a2e3eb93 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.tsx @@ -1,6 +1,19 @@ import type { IconName } from '@fortawesome/fontawesome-svg-core'; import type { ServiceError, StatusObject } from '@grpc/grpc-js'; import { useVirtualizer } from '@tanstack/react-virtual'; +import { + type Environment, + type GrpcRequest, + models, + type Project, + type Request, + type RequestGroup, + services, + type SocketIORequest, + type WebSocketRequest, + type Workspace, +} from 'insomnia-data'; +import type { PlatformKeyCombinations } from 'insomnia-data/common'; import React, { Fragment, useCallback, useEffect, useMemo, useRef, useState } from 'react'; import { Breadcrumb, @@ -43,19 +56,6 @@ import { useLocalStorage } from 'react-use'; import { DEFAULT_SIDEBAR_SIZE, getProductName, SORT_ORDERS, type SortOrder, sortOrderName } from '~/common/constants'; import { type ChangeBufferEvent } from '~/common/database'; import { generateId, isNotNullOrUndefined } from '~/common/misc'; -import { - type Environment, - type GrpcRequest, - models, - type Project, - type Request, - type RequestGroup, - services, - type SocketIORequest, - type WebSocketRequest, - type Workspace, -} from '~/insomnia-data'; -import type { PlatformKeyCombinations } from '~/insomnia-data/common'; import type { GrpcMethodInfo } from '~/main/ipc/grpc'; import { useRootLoaderData } from '~/root'; import { diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.create.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.create.tsx index 9c04d242ad..df2a8aed53 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.create.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.create.tsx @@ -1,6 +1,6 @@ +import { models, services } from 'insomnia-data'; import { href } from 'react-router'; -import { models, services } from '~/insomnia-data'; import { SegmentEvent } from '~/ui/analytics'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.delete.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.delete.tsx index 5beb7d232b..b451bf64c3 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.delete.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.delete.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.duplicate.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.duplicate.tsx index 81e76e5077..8cd12708c3 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.duplicate.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.duplicate.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.set-active-global.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.set-active-global.tsx index 5b8b137d60..c153667d0e 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.set-active-global.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.set-active-global.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.set-active.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.set-active.tsx index 95ed241f22..ad4fa4547c 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.set-active.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.set-active.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.tsx index ed42980b3a..9d6c7949ca 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.tsx @@ -1,4 +1,5 @@ import type { IconName, IconProp } from '@fortawesome/fontawesome-svg-core'; +import { type Environment, type EnvironmentKvPairData, type EnvironmentType, models, services } from 'insomnia-data'; import React, { Fragment, useEffect, useMemo, useRef, useState } from 'react'; import { Breadcrumb, @@ -22,7 +23,6 @@ import { NavLink } from 'react-router'; import { DEFAULT_SIDEBAR_SIZE } from '~/common/constants'; import { debounce } from '~/common/misc'; -import { type Environment, type EnvironmentKvPairData, type EnvironmentType, models, services } from '~/insomnia-data'; import { useWorkspaceLoaderData } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId'; import { useEnvironmentCreateActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.create'; import { useEnvironmentDeleteActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.delete'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.update.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.update.tsx index 3168f98856..19f41b4217 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.update.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.update.tsx @@ -1,6 +1,6 @@ +import { type Environment,services } from 'insomnia-data'; import { href } from 'react-router'; -import { type Environment,services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.branch.checkout.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.branch.checkout.tsx index 564d443068..cfe0bb0af4 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.branch.checkout.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.branch.checkout.tsx @@ -1,8 +1,8 @@ +import { models, services } from 'insomnia-data'; import { href, redirect } from 'react-router'; import type { Operation } from '~/common/database'; import { database } from '~/common/database'; -import { models, services } from '~/insomnia-data'; import { VCSInstance } from '~/sync/vcs/insomnia-sync'; import { getSyncItems, remoteCompareCache } from '~/ui/sync-utils'; import { invariant } from '~/utils/invariant'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.branch.delete.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.branch.delete.tsx index a4239be5d7..755245e5df 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.branch.delete.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.branch.delete.tsx @@ -1,6 +1,6 @@ +import { models, services } from 'insomnia-data'; import { href, redirect } from 'react-router'; -import { models, services } from '~/insomnia-data'; import { VCSInstance } from '~/sync/vcs/insomnia-sync'; import { remoteBranchesCache } from '~/ui/sync-utils'; import { invariant } from '~/utils/invariant'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.create-snapshot.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.create-snapshot.tsx index 2acbed0f68..7c31a3dcc4 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.create-snapshot.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.create-snapshot.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { VCSInstance } from '~/sync/vcs/insomnia-sync'; import { remoteCompareCache } from '~/ui/sync-utils'; import { invariant } from '~/utils/invariant'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.fetch.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.fetch.tsx index 2483cd4bde..d569b69972 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.fetch.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.fetch.tsx @@ -1,7 +1,7 @@ +import { services } from 'insomnia-data'; import { href } from 'react-router'; import { database } from '~/common/database'; -import { services } from '~/insomnia-data'; import { VCSInstance } from '~/sync/vcs/insomnia-sync'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.pull.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.pull.tsx index afba7981da..4ce989e3da 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.pull.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.pull.tsx @@ -1,7 +1,7 @@ +import { services } from 'insomnia-data'; import { href } from 'react-router'; import { database } from '~/common/database'; -import { services } from '~/insomnia-data'; import { VCSInstance } from '~/sync/vcs/insomnia-sync'; import { SegmentEvent } from '~/ui/analytics'; import { getSyncItems, remoteCompareCache, vcsSegmentEventProperties } from '~/ui/sync-utils'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.push.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.push.tsx index c534ddebd4..d590c9908d 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.push.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.push.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { VCSInstance } from '~/sync/vcs/insomnia-sync'; import { SegmentEvent } from '~/ui/analytics'; import { remoteCompareCache, vcsSegmentEventProperties } from '~/ui/sync-utils'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.restore.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.restore.tsx index d71061374f..357370643c 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.restore.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.restore.tsx @@ -1,8 +1,8 @@ +import { models, services } from 'insomnia-data'; import { href, redirect } from 'react-router'; import type { Operation } from '~/common/database'; import { database } from '~/common/database'; -import { models, services } from '~/insomnia-data'; import { VCSInstance } from '~/sync/vcs/insomnia-sync'; import { getSyncItems, remoteCompareCache } from '~/ui/sync-utils'; import { invariant } from '~/utils/invariant'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.rollback.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.rollback.tsx index 2e7981a85e..5cfe1df6d0 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.rollback.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.rollback.tsx @@ -1,8 +1,8 @@ +import { models, services } from 'insomnia-data'; import { href, redirect } from 'react-router'; import type { Operation } from '~/common/database'; import { database } from '~/common/database'; -import { models, services } from '~/insomnia-data'; import { VCSInstance } from '~/sync/vcs/insomnia-sync'; import { getSyncItems, remoteCompareCache } from '~/ui/sync-utils'; import { invariant } from '~/utils/invariant'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.sync-data.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.sync-data.tsx index a07015cd60..f6782686e2 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.sync-data.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.sync-data.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { VCSInstance } from '~/sync/vcs/insomnia-sync'; import { getSyncItems, remoteBackendProjectsCache, remoteBranchesCache, remoteCompareCache } from '~/ui/sync-utils'; import { invariant } from '~/utils/invariant'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.tsx index 6120bbb055..019f7b0c0d 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.tsx @@ -1,7 +1,7 @@ +import { models, services, type Workspace } from 'insomnia-data'; import { href } from 'react-router'; import { database } from '~/common/database'; -import { models, services, type Workspace } from '~/insomnia-data'; import { VCSInstance } from '~/sync/vcs/insomnia-sync'; import { invariant } from '~/utils/invariant'; import { createFetcherLoadHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mcp.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mcp.tsx index 0f72b04d1d..f4c531fb67 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mcp.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mcp.tsx @@ -1,9 +1,9 @@ +import { services } from 'insomnia-data'; import { Breadcrumb, Breadcrumbs, Button } from 'react-aria-components'; import { Panel, PanelGroup, PanelResizeHandle } from 'react-resizable-panels'; import { href, NavLink, redirect, useParams } from 'react-router'; import { Icon } from '~/basic-components/icon'; -import { services } from '~/insomnia-data'; import { WorkspaceSyncDropdown } from '~/ui/components/dropdowns/workspace-sync-dropdown'; import { Pane, PaneBody, PaneHeader } from '~/ui/components/panes/pane'; import { showResourceNotFoundToast } from '~/ui/components/toast-notification'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.generate-request-collection.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.generate-request-collection.tsx index e558aa4233..fb997ce6cc 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.generate-request-collection.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.generate-request-collection.tsx @@ -1,6 +1,6 @@ +import { models, services } from 'insomnia-data'; import { href, redirect } from 'react-router'; -import { models, services } from '~/insomnia-data'; import { SegmentEvent } from '~/ui/analytics'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId.delete.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId.delete.tsx index da9b156f22..deda464e63 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId.delete.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId.delete.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href, redirect } from 'react-router'; -import { services } from '~/insomnia-data'; import { SegmentEvent } from '~/ui/analytics'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId.tsx index 116aadc5b2..521e618713 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId.tsx @@ -1,5 +1,14 @@ import type * as Har from 'har-format'; import { isApiError, upsertMockbin } from 'insomnia-api'; +import { + type MockRoute, + type MockServer, + models, + type Request, + type RequestHeader, + type Response, + services, +} from 'insomnia-data'; import { useCallback } from 'react'; import { Button, Tab, TabList, TabPanel, Tabs, Toolbar } from 'react-aria-components'; import { useParams, useRouteLoaderData } from 'react-router'; @@ -16,15 +25,6 @@ import { } from '~/common/constants'; import { database as db } from '~/common/database'; import { getResponseCookiesFromHeaders } from '~/common/har'; -import { - type MockRoute, - type MockServer, - models, - type Request, - type RequestHeader, - type Response, - services, -} from '~/insomnia-data'; import { useRootLoaderData } from '~/root'; import { useRequestNewMockSendActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.new-mock-send'; import { useMockRouteUpdateActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId.update'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId.update.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId.update.tsx index 326a5cb4a0..038e8b4dab 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId.update.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId.update.tsx @@ -1,6 +1,6 @@ +import { type MockRoute,services } from 'insomnia-data'; import { href } from 'react-router'; -import { type MockRoute,services } from '~/insomnia-data'; import { SegmentEvent } from '~/ui/analytics'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.new.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.new.tsx index 090f514784..0f70ac33d1 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.new.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.new.tsx @@ -1,6 +1,6 @@ +import { type MockRoute,services } from 'insomnia-data'; import { href, redirect } from 'react-router'; -import { type MockRoute,services } from '~/insomnia-data'; import { SegmentEvent } from '~/ui/analytics'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.tsx index 2c5a1ce190..4b9fdbee76 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.tsx @@ -1,4 +1,5 @@ import type { IconName } from '@fortawesome/fontawesome-svg-core'; +import { type MockRoute,services } from 'insomnia-data'; import React, { Suspense, useEffect, useLayoutEffect, useRef, useState } from 'react'; import { Breadcrumb, @@ -24,7 +25,6 @@ import { } from 'react-router'; import { DEFAULT_SIDEBAR_SIZE } from '~/common/constants'; -import { type MockRoute,services } from '~/insomnia-data'; import { useRootLoaderData } from '~/root'; import { useWorkspaceLoaderData } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId'; import { useMockRouteDeleteActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId.delete'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.spec.generate-request-collection.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.spec.generate-request-collection.tsx index bb895fbf47..84bd8db523 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.spec.generate-request-collection.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.spec.generate-request-collection.tsx @@ -1,10 +1,10 @@ import path from 'node:path'; import type { IRuleResult } from '@stoplight/spectral-core'; +import { models, services } from 'insomnia-data'; import { href, redirect } from 'react-router'; import { importResourcesToWorkspace, scanResources } from '~/common/import'; -import { models, services } from '~/insomnia-data'; import { SegmentEvent } from '~/ui/analytics'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.spec.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.spec.tsx index 89f6ae3efe..573256800e 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.spec.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.spec.tsx @@ -2,6 +2,7 @@ import path from 'node:path'; import { type IRuleResult } from '@stoplight/spectral-core'; import CodeMirror from 'codemirror'; +import { models, services } from 'insomnia-data'; import type { OpenAPIV3 } from 'openapi-types'; import { Fragment, type ReactNode, useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react'; import { @@ -30,7 +31,6 @@ import YAML from 'yaml'; import { parseApiSpec } from '~/common/api-specs'; import { DEFAULT_SIDEBAR_SIZE } from '~/common/constants'; import { debounce, isNotNullOrUndefined } from '~/common/misc'; -import { models, services } from '~/insomnia-data'; import { useRootLoaderData } from '~/root'; import { useOrganizationLoaderData } from '~/routes/organization'; import { useWorkspaceLoaderData } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.spec.update.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.spec.update.tsx index 74846c9bae..12644d3624 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.spec.update.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.spec.update.tsx @@ -1,7 +1,7 @@ +import { services } from 'insomnia-data'; import { href } from 'react-router'; import { database } from '~/common/database'; -import { services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test._index.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test._index.tsx index ee18b37cc3..0645489b85 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test._index.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test._index.tsx @@ -1,7 +1,6 @@ +import { services } from 'insomnia-data'; import { href, Outlet, redirect } from 'react-router'; -import { services } from '~/insomnia-data'; - import type { Route } from './+types/organization.$organizationId.project.$projectId.workspace.$workspaceId.test._index'; export default Outlet; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId._index.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId._index.tsx index edeba9a68e..34532d1943 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId._index.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId._index.tsx @@ -1,7 +1,7 @@ +import { type UnitTestResult } from 'insomnia-data'; import { href, redirect } from 'react-router'; import { database } from '~/common/database'; -import { type UnitTestResult } from '~/insomnia-data'; import type { Route } from './+types/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId._index'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.delete.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.delete.tsx index 482d309f67..1a716a4f61 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.delete.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.delete.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href, redirect } from 'react-router'; -import { services } from '~/insomnia-data'; import { SegmentEvent } from '~/ui/analytics'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.run-all-tests.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.run-all-tests.tsx index 7467543a1d..0cd243fb49 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.run-all-tests.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.run-all-tests.tsx @@ -1,8 +1,8 @@ +import { models, services, type UnitTest } from 'insomnia-data'; import { generate, runTests, type Test, type TestResults } from 'insomnia-testing'; import { href, redirect } from 'react-router'; import { database } from '~/common/database'; -import { models, services, type UnitTest } from '~/insomnia-data'; import { getSendRequestCallback } from '~/network/unit-test-feature'; import { SegmentEvent } from '~/ui/analytics'; import { invariant } from '~/utils/invariant'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test-result.$testResultId.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test-result.$testResultId.tsx index 54b04eb081..a18d40b751 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test-result.$testResultId.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test-result.$testResultId.tsx @@ -1,8 +1,8 @@ +import { models, type UnitTestResult } from 'insomnia-data'; import { Heading } from 'react-aria-components'; import { useRouteLoaderData } from 'react-router'; import { database } from '~/common/database'; -import { models, type UnitTestResult } from '~/insomnia-data'; import { Icon } from '~/ui/components/icon'; import { invariant } from '~/utils/invariant'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test-result._index.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test-result._index.tsx index 4191850af1..71a0927481 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test-result._index.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test-result._index.tsx @@ -1,7 +1,7 @@ +import { type UnitTestResult } from 'insomnia-data'; import { href, redirect } from 'react-router'; import { database } from '~/common/database'; -import { type UnitTestResult } from '~/insomnia-data'; import type { Route } from './+types/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test-result._index'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test.$testId.delete.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test.$testId.delete.tsx index 62c2a26442..0504a3b720 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test.$testId.delete.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test.$testId.delete.tsx @@ -1,7 +1,7 @@ +import { models, services, type UnitTest } from 'insomnia-data'; import { href } from 'react-router'; import { database } from '~/common/database'; -import { models, services, type UnitTest } from '~/insomnia-data'; import { SegmentEvent } from '~/ui/analytics'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test.$testId.run.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test.$testId.run.tsx index 0310b08723..3eaccf90a9 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test.$testId.run.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test.$testId.run.tsx @@ -1,8 +1,8 @@ +import { models, services, type UnitTest } from 'insomnia-data'; import { generate, runTests, type Test, type TestResults } from 'insomnia-testing'; import { href, redirect } from 'react-router'; import { database } from '~/common/database'; -import { models, services, type UnitTest } from '~/insomnia-data'; import { getSendRequestCallback } from '~/network/unit-test-feature'; import { SegmentEvent } from '~/ui/analytics'; import { invariant } from '~/utils/invariant'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test.$testId.update.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test.$testId.update.tsx index f96b1c2724..f3240a6d9e 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test.$testId.update.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test.$testId.update.tsx @@ -1,7 +1,7 @@ +import { models, services, type UnitTest } from 'insomnia-data'; import { href } from 'react-router'; import { database } from '~/common/database'; -import { models, services, type UnitTest } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test.new.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test.new.tsx index cf4079068b..8a287a02ae 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test.new.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test.new.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { SegmentEvent } from '~/ui/analytics'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.tsx index 3e9ae37397..1af8b7346e 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.tsx @@ -1,3 +1,4 @@ +import { models, type Request, services, type UnitTest, type UnitTestSuite } from 'insomnia-data'; import React, { Fragment, useRef, useState } from 'react'; import { Button, @@ -17,7 +18,6 @@ import { useParams, useRouteLoaderData } from 'react-router'; import { database } from '~/common/database'; import { documentationLinks } from '~/common/documentation'; -import { models, type Request, services, type UnitTest, type UnitTestSuite } from '~/insomnia-data'; import { useRunAllTestsActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.run-all-tests'; import { useTestDeleteActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test.$testId.delete'; import { useTestRunActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test.$testId.run'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.update.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.update.tsx index 31900849dd..4d3ae941ec 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.update.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.update.tsx @@ -1,7 +1,7 @@ +import { models, services, type UnitTestSuite } from 'insomnia-data'; import { href } from 'react-router'; import { database } from '~/common/database'; -import { models, services, type UnitTestSuite } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.new.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.new.tsx index 51ad1aa726..cb45dfeb24 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.new.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.new.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href, redirect } from 'react-router'; -import { services } from '~/insomnia-data'; import { SegmentEvent } from '~/ui/analytics'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.tsx index 0a0845f0e5..daf2024d31 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.tsx @@ -1,4 +1,5 @@ import type { IconName } from '@fortawesome/fontawesome-svg-core'; +import { models, type UnitTestSuite } from 'insomnia-data'; import { Suspense, useEffect, useLayoutEffect, useRef, useState } from 'react'; import { Breadcrumb, @@ -20,7 +21,6 @@ import { NavLink, Route as RouteComponent, Routes, useFetchers, useLoaderData, u import { DEFAULT_SIDEBAR_SIZE } from '~/common/constants'; import { database } from '~/common/database'; import { isNotNullOrUndefined } from '~/common/misc'; -import { models, type UnitTestSuite } from '~/insomnia-data'; import { useRootLoaderData } from '~/root'; import { useTestSuiteDeleteActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.delete'; import { useRunAllTestsActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.run-all-tests'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.toggle-expand-all.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.toggle-expand-all.tsx index d3b4fd6489..602c22c359 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.toggle-expand-all.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.toggle-expand-all.tsx @@ -1,7 +1,7 @@ +import { models, services } from 'insomnia-data'; import { href } from 'react-router'; import { database } from '~/common/database'; -import { models, services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.tsx index 1274de8720..e12b1f090d 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.tsx @@ -1,10 +1,10 @@ +import { type CaCertificate, services } from 'insomnia-data'; +import { type ApiSpec, type ClientCertificate, type CookieJar, type Environment, type GitRepository, type GrpcRequest, type GrpcRequestMeta, type MockServer, models, type Project, type Request, type RequestGroup, type RequestGroupMeta, type RequestMeta, type SocketIORequest, type WebSocketRequest, type Workspace, type WorkspaceMeta } from 'insomnia-data'; import { href, Outlet, redirect, useRouteLoaderData } from 'react-router'; import type { SortOrder } from '~/common/constants'; import { database } from '~/common/database'; import { sortMethodMap } from '~/common/sorting'; -import { type CaCertificate, services } from '~/insomnia-data'; -import { type ApiSpec, type ClientCertificate, type CookieJar, type Environment, type GitRepository, type GrpcRequest, type GrpcRequestMeta, type MockServer, models, type Project, type Request, type RequestGroup, type RequestGroupMeta, type RequestMeta, type SocketIORequest, type WebSocketRequest, type Workspace, type WorkspaceMeta } from '~/insomnia-data'; import { pushSnapshotOnInitialize } from '~/sync/vcs/initialize-backend-project'; import { VCSInstance } from '~/sync/vcs/insomnia-sync'; import { showResourceNotFoundToast } from '~/ui/components/toast-notification'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.update-cookie-jar.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.update-cookie-jar.tsx index 7c4fd6cb38..f7589eeee3 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.update-cookie-jar.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.update-cookie-jar.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.update-meta.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.update-meta.tsx index 8cb6b819e5..2743eda186 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.update-meta.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.update-meta.tsx @@ -1,6 +1,6 @@ +import { services, type WorkspaceMeta } from 'insomnia-data'; import { href } from 'react-router'; -import { services, type WorkspaceMeta } from '~/insomnia-data'; import { createFetcherSubmitHook } from '~/utils/router'; import type { Route } from './+types/organization.$organizationId.project.$projectId.workspace.$workspaceId.update-meta'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.delete.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.delete.tsx index da846b55d2..94c5b1bae3 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.delete.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.delete.tsx @@ -1,6 +1,6 @@ +import { models, type Project, services, type Workspace } from 'insomnia-data'; import { href, redirect } from 'react-router'; -import { models, type Project, services, type Workspace } from '~/insomnia-data'; import { VCSInstance } from '~/sync/vcs/insomnia-sync'; import { SegmentEvent } from '~/ui/analytics'; import { invariant } from '~/utils/invariant'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.move.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.move.tsx index aa041840e0..154a1d9984 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.move.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.move.tsx @@ -1,8 +1,8 @@ +import { models, type Project,services } from 'insomnia-data'; import { href, redirect } from 'react-router'; import { importResourcesToNewWorkspace } from '~/common/import'; import { getInsomniaV5DataExport, importInsomniaV5Data } from '~/common/insomnia-v5'; -import { models, type Project,services } from '~/insomnia-data'; import { syncNewWorkspaceIfNeeded } from '~/routes/import.resources'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.new.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.new.tsx index 18a96fa482..3df1a79189 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.new.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.new.tsx @@ -2,12 +2,12 @@ import fs from 'node:fs'; import path from 'node:path'; import { upsertMockbin } from 'insomnia-api'; +import { services } from 'insomnia-data'; +import { type MockRoute, type MockServer, models, type WorkspaceScope } from 'insomnia-data'; import { href, redirect } from 'react-router'; import { getAppVersion, getMockServiceURL, METHOD_GET } from '~/common/constants'; import { database } from '~/common/database'; -import { services } from '~/insomnia-data'; -import { type MockRoute, type MockServer, models, type WorkspaceScope } from '~/insomnia-data'; import type { MockRouteData } from '~/plugins/types'; import { safeToUseInsomniaFileNameWithExt } from '~/sync/git/insomnia-filename'; import { initializeLocalBackendProjectAndMarkForSync } from '~/sync/vcs/initialize-backend-project'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.update.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.update.tsx index f1c3987084..fd1c5e3f8f 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.update.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.update.tsx @@ -1,8 +1,8 @@ import path from 'node:path'; +import { models, services } from 'insomnia-data'; import { href } from 'react-router'; -import { models, services } from '~/insomnia-data'; import { safeToUseInsomniaFileNameWithExt } from '~/sync/git/insomnia-filename'; import { SegmentEvent } from '~/ui/analytics'; import { invariant } from '~/utils/invariant'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project._index.tsx b/packages/insomnia/src/routes/organization.$organizationId.project._index.tsx index e12e0bf776..833b8657db 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project._index.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project._index.tsx @@ -1,3 +1,4 @@ +import { type GitRepository, models, type Project,services } from 'insomnia-data'; import { useEffect, useState } from 'react'; import { Panel, PanelGroup, PanelResizeHandle } from 'react-resizable-panels'; import type { LoaderFunctionArgs } from 'react-router'; @@ -5,7 +6,6 @@ import { href, redirect, useLoaderData, useNavigate, useParams } from 'react-rou import { logout } from '~/account/session'; import { DEFAULT_SIDEBAR_SIZE } from '~/common/constants'; -import { type GitRepository, models, type Project,services } from '~/insomnia-data'; import { useRootLoaderData } from '~/root'; import { useOrganizationLoaderData } from '~/routes/organization'; import { getProjectsWithGitRepositories } from '~/routes/organization.$organizationId.project.$projectId._index'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.new.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.new.tsx index 668b231316..bf6f3a47ee 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.new.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.new.tsx @@ -1,10 +1,10 @@ import { createTeamProject, isApiError, updateGitProjectCount } from 'insomnia-api'; +import { models, type Project,services } from 'insomnia-data'; import { href, redirect } from 'react-router'; import { database } from '~/common/database'; import { isNotNullOrUndefined } from '~/common/misc'; import { projectLock } from '~/common/project'; -import { models, type Project,services } from '~/insomnia-data'; import { SegmentEvent } from '~/ui/analytics'; import { showToast } from '~/ui/components/toast-notification'; import { invariant } from '~/utils/invariant'; diff --git a/packages/insomnia/src/routes/organization._index.tsx b/packages/insomnia/src/routes/organization._index.tsx index bd9e4563aa..69f66043e9 100644 --- a/packages/insomnia/src/routes/organization._index.tsx +++ b/packages/insomnia/src/routes/organization._index.tsx @@ -1,8 +1,8 @@ import type { Organization } from 'insomnia-api'; +import { models, services } from 'insomnia-data'; import { href, redirect } from 'react-router'; import * as session from '~/account/session'; -import { models, services } from '~/insomnia-data'; import { migrateProjectsUnderOrganization, syncOrganizations } from '~/ui/organization-utils'; import { invariant } from '~/utils/invariant'; diff --git a/packages/insomnia/src/routes/organization.sync-organizations-and-projects.tsx b/packages/insomnia/src/routes/organization.sync-organizations-and-projects.tsx index 0fa1e3a259..dd4a492026 100644 --- a/packages/insomnia/src/routes/organization.sync-organizations-and-projects.tsx +++ b/packages/insomnia/src/routes/organization.sync-organizations-and-projects.tsx @@ -1,8 +1,8 @@ import type { Organization } from 'insomnia-api'; +import { models, type Project, services } from 'insomnia-data'; import { href, redirect } from 'react-router'; import { database } from '~/common/database'; -import { models, type Project, services } from '~/insomnia-data'; import { migrateProjectsUnderOrganization, syncOrganizations, syncProjects } from '~/ui/organization-utils'; import { invariant } from '~/utils/invariant'; import { AsyncTask, createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.sync.tsx b/packages/insomnia/src/routes/organization.sync.tsx index e5ccff29ac..68c6d7b276 100644 --- a/packages/insomnia/src/routes/organization.sync.tsx +++ b/packages/insomnia/src/routes/organization.sync.tsx @@ -1,4 +1,5 @@ -import { services } from '~/insomnia-data'; +import { services } from 'insomnia-data'; + import { syncOrganizations } from '~/ui/organization-utils'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.tsx b/packages/insomnia/src/routes/organization.tsx index 05d2c7debd..61e7ab0bbb 100644 --- a/packages/insomnia/src/routes/organization.tsx +++ b/packages/insomnia/src/routes/organization.tsx @@ -1,4 +1,5 @@ import { type Billing, type CurrentPlan, type FeatureList, type Organization, type UserProfile } from 'insomnia-api'; +import { models, services, type Settings } from 'insomnia-data'; import React, { Fragment, useCallback, useEffect, useState } from 'react'; import { Button, @@ -15,7 +16,6 @@ import { href, NavLink, Outlet, useLocation, useNavigate, useParams, useRouteLoa import * as reactUse from 'react-use'; import { getAppWebsiteBaseURL } from '~/common/constants'; -import { models, services, type Settings } from '~/insomnia-data'; import { useRootLoaderData } from '~/root'; import { useWorkspaceLoaderData } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId'; import { useSyncOrganizationsAndProjectsActionFetcher } from '~/routes/organization.sync-organizations-and-projects'; diff --git a/packages/insomnia/src/routes/remote-files.tsx b/packages/insomnia/src/routes/remote-files.tsx index 10a08f5b0e..874309d621 100644 --- a/packages/insomnia/src/routes/remote-files.tsx +++ b/packages/insomnia/src/routes/remote-files.tsx @@ -1,8 +1,8 @@ import { getUserFiles, type Organization, type RemoteFile } from 'insomnia-api'; +import { models, type Project,services } from 'insomnia-data'; import { href } from 'react-router'; import { database } from '~/common/database'; -import { models, type Project,services } from '~/insomnia-data'; import { createFetcherLoadHook } from '~/utils/router'; import type { Route } from './+types/remote-files'; diff --git a/packages/insomnia/src/routes/resource.usage.tsx b/packages/insomnia/src/routes/resource.usage.tsx index 900b28f1c3..d67f8232a5 100644 --- a/packages/insomnia/src/routes/resource.usage.tsx +++ b/packages/insomnia/src/routes/resource.usage.tsx @@ -6,9 +6,9 @@ import { getResourceUsage, getTrialEligibility, } from 'insomnia-api'; +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { createFetcherLoadHook } from '~/utils/router'; async function getCurrentEnterprise(sessionId: string) { diff --git a/packages/insomnia/src/routes/settings.update.tsx b/packages/insomnia/src/routes/settings.update.tsx index 8452d064fc..c9cf85766f 100644 --- a/packages/insomnia/src/routes/settings.update.tsx +++ b/packages/insomnia/src/routes/settings.update.tsx @@ -1,4 +1,5 @@ -import { services, type Settings } from '~/insomnia-data'; +import { services, type Settings } from 'insomnia-data'; + import { SegmentEvent } from '~/ui/analytics'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/trial.check.tsx b/packages/insomnia/src/routes/trial.check.tsx index 452394b650..cd2ceda865 100644 --- a/packages/insomnia/src/routes/trial.check.tsx +++ b/packages/insomnia/src/routes/trial.check.tsx @@ -1,7 +1,7 @@ import { getTrialEligibility } from 'insomnia-api'; +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { createFetcherLoadHook } from '~/utils/router'; import type { Route } from './+types/settings.update'; diff --git a/packages/insomnia/src/routes/trial.start.tsx b/packages/insomnia/src/routes/trial.start.tsx index 2b249193cc..e8ef3eebe7 100644 --- a/packages/insomnia/src/routes/trial.start.tsx +++ b/packages/insomnia/src/routes/trial.start.tsx @@ -1,6 +1,6 @@ import { startTrial } from 'insomnia-api'; +import { services } from 'insomnia-data'; -import { services } from '~/insomnia-data'; import { syncCurrentPlan } from '~/ui/organization-utils'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/untracked-projects.tsx b/packages/insomnia/src/routes/untracked-projects.tsx index 12120cff21..9c842ea3c0 100644 --- a/packages/insomnia/src/routes/untracked-projects.tsx +++ b/packages/insomnia/src/routes/untracked-projects.tsx @@ -1,7 +1,7 @@ import type { Organization } from 'insomnia-api'; +import { models, type Project, services, type Workspace } from 'insomnia-data'; import { database } from '~/common/database'; -import { models, type Project, services, type Workspace } from '~/insomnia-data'; import { createFetcherLoadHook } from '~/utils/router'; import type { Route } from './+types/untracked-projects'; diff --git a/packages/insomnia/src/sync/__schemas__/model-schemas.ts b/packages/insomnia/src/sync/__schemas__/model-schemas.ts index c9d685c861..31cbb792cc 100644 --- a/packages/insomnia/src/sync/__schemas__/model-schemas.ts +++ b/packages/insomnia/src/sync/__schemas__/model-schemas.ts @@ -1,6 +1,5 @@ import type { Schema } from '@develohpanda/fluent-builder'; import clone from 'clone'; - import { type AllTypes, type BaseModel, @@ -10,7 +9,7 @@ import { type Request, type RequestGroup, type Workspace, -} from '~/insomnia-data'; +} from 'insomnia-data'; const { environment, grpcRequest, request, requestGroup, workspace } = models; const { EnvironmentKvPairDataType, EnvironmentType } = environment; diff --git a/packages/insomnia/src/sync/git/__tests__/ne-db-client.test.ts b/packages/insomnia/src/sync/git/__tests__/ne-db-client.test.ts index fb5ef32dcd..10bf2e8c68 100644 --- a/packages/insomnia/src/sync/git/__tests__/ne-db-client.test.ts +++ b/packages/insomnia/src/sync/git/__tests__/ne-db-client.test.ts @@ -8,11 +8,10 @@ import path from 'node:path'; import { createBuilder } from '@develohpanda/fluent-builder'; +import { database as db, models, services } from 'insomnia-data'; import { afterAll, beforeEach, describe, expect, it, vi } from 'vitest'; import YAML from 'yaml'; -import { database as db, models, services } from '~/insomnia-data'; - import { workspaceModelSchema } from '../../__schemas__/model-schemas'; import { GIT_CLONE_DIR, GIT_INSOMNIA_DIR, GIT_INSOMNIA_DIR_NAME } from '../git-vcs'; import { NeDBClient } from '../ne-db-client'; diff --git a/packages/insomnia/src/sync/git/__tests__/parse-git-path.test.ts b/packages/insomnia/src/sync/git/__tests__/parse-git-path.test.ts index 14da043b17..4d6dd4e8cc 100644 --- a/packages/insomnia/src/sync/git/__tests__/parse-git-path.test.ts +++ b/packages/insomnia/src/sync/git/__tests__/parse-git-path.test.ts @@ -1,7 +1,6 @@ +import { models } from 'insomnia-data'; import { describe, expect, it } from 'vitest'; -import { models } from '~/insomnia-data'; - import { GIT_INSOMNIA_DIR } from '../git-vcs'; import parseGitPath from '../parse-git-path'; diff --git a/packages/insomnia/src/sync/git/get-oauth2-format-name.ts b/packages/insomnia/src/sync/git/get-oauth2-format-name.ts index 20b50a7c41..ebc9e116c6 100644 --- a/packages/insomnia/src/sync/git/get-oauth2-format-name.ts +++ b/packages/insomnia/src/sync/git/get-oauth2-format-name.ts @@ -1,4 +1,4 @@ -import { type GitRepoCredentials, type OauthProviderName } from '~/insomnia-data'; +import { type GitRepoCredentials, type OauthProviderName } from 'insomnia-data'; export const getOauth2FormatName = (credentials?: GitRepoCredentials | null): OauthProviderName | undefined => { if (credentials && 'oauth2format' in credentials) { diff --git a/packages/insomnia/src/sync/git/git-vcs.ts b/packages/insomnia/src/sync/git/git-vcs.ts index 16ccd68827..f1165692da 100644 --- a/packages/insomnia/src/sync/git/git-vcs.ts +++ b/packages/insomnia/src/sync/git/git-vcs.ts @@ -2,11 +2,11 @@ import path from 'node:path'; import type { Change } from 'diff'; import { diffLines } from 'diff'; +import { type GitAuthor, type GitRemoteConfig } from 'insomnia-data'; import * as git from 'isomorphic-git'; import { parse, stringify } from 'yaml'; import { migrateToLatestYaml } from '~/common/insomnia-schema-migrations'; -import { type GitAuthor, type GitRemoteConfig } from '~/insomnia-data'; import { GitVCSOperationErrors } from '~/sync/git/git-vcs-operation-errors'; import type { WriteFileMap } from '~/sync/git/project-routable-fs-client'; diff --git a/packages/insomnia/src/sync/git/migrations.ts b/packages/insomnia/src/sync/git/migrations.ts index 90b2f6ec86..3a46b56496 100644 --- a/packages/insomnia/src/sync/git/migrations.ts +++ b/packages/insomnia/src/sync/git/migrations.ts @@ -24,8 +24,9 @@ * @see providers/ for provider implementations */ +import { type GitCredentials, type GitRepository, models, services } from 'insomnia-data'; + import { database } from '~/common/database'; -import { type GitCredentials, type GitRepository, models, services } from '~/insomnia-data'; import type ElectronStorage from '~/main/electron-storage'; import { initElectronStorage } from '~/main/window-utils'; diff --git a/packages/insomnia/src/sync/git/ne-db-client.ts b/packages/insomnia/src/sync/git/ne-db-client.ts index d553fb34e1..065a902a5e 100644 --- a/packages/insomnia/src/sync/git/ne-db-client.ts +++ b/packages/insomnia/src/sync/git/ne-db-client.ts @@ -15,11 +15,10 @@ import path from 'node:path'; +import { type BaseModel,models } from 'insomnia-data'; import type { PromiseFsClient } from 'isomorphic-git'; import YAML from 'yaml'; -import { type BaseModel,models } from '~/insomnia-data'; - import { database as db } from '../../common/database'; import { resetKeys } from '../ignore-keys'; import { GIT_INSOMNIA_DIR_NAME } from './git-vcs'; diff --git a/packages/insomnia/src/sync/git/parse-git-path.ts b/packages/insomnia/src/sync/git/parse-git-path.ts index a477d269e9..dd34a35979 100644 --- a/packages/insomnia/src/sync/git/parse-git-path.ts +++ b/packages/insomnia/src/sync/git/parse-git-path.ts @@ -1,6 +1,6 @@ import path from 'node:path'; -import { type AllTypes, models } from '~/insomnia-data'; +import { type AllTypes, models } from 'insomnia-data'; import { GIT_CLONE_DIR } from './git-vcs'; diff --git a/packages/insomnia/src/sync/git/project-ne-db-client.ts b/packages/insomnia/src/sync/git/project-ne-db-client.ts index 8373f7ccc5..5d88084e79 100644 --- a/packages/insomnia/src/sync/git/project-ne-db-client.ts +++ b/packages/insomnia/src/sync/git/project-ne-db-client.ts @@ -1,10 +1,9 @@ import path from 'node:path'; +import { models, services, type Workspace, type WorkspaceMeta } from 'insomnia-data'; import type { PromiseFsClient } from 'isomorphic-git'; import YAML from 'yaml'; -import { models, services, type Workspace, type WorkspaceMeta } from '~/insomnia-data'; - import { database, database as db } from '../../common/database'; import { extractErrorMessages } from '../../common/import'; import { type InsomniaFile, InsomniaFileTypeValues } from '../../common/import-v5-parser'; diff --git a/packages/insomnia/src/sync/git/providers/custom.ts b/packages/insomnia/src/sync/git/providers/custom.ts index 22bb0a97e5..f22f8eee3d 100644 --- a/packages/insomnia/src/sync/git/providers/custom.ts +++ b/packages/insomnia/src/sync/git/providers/custom.ts @@ -1,7 +1,6 @@ +import { type GitCredentials,models } from 'insomnia-data'; import type { GitAuth } from 'isomorphic-git'; -import { type GitCredentials,models } from '~/insomnia-data'; - import type { CustomProviderConfig, GitRemoteProvider, ValidationResult } from './types'; /** diff --git a/packages/insomnia/src/sync/git/providers/github.ts b/packages/insomnia/src/sync/git/providers/github.ts index 70b56b5bbe..c1a8a6757e 100644 --- a/packages/insomnia/src/sync/git/providers/github.ts +++ b/packages/insomnia/src/sync/git/providers/github.ts @@ -1,11 +1,11 @@ import { shell } from 'electron'; import { net } from 'electron/main'; +import type { GitCredentials, GitCredentialsV2 } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; import type { GitAuth } from 'isomorphic-git'; import { v4 } from 'uuid'; import { getApiBaseURL, getAppWebsiteBaseURL, PLAYWRIGHT } from '~/common/constants'; -import type { GitCredentials, GitCredentialsV2 } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; import { expiresAtFromOAuthExpiresIn } from '~/sync/git/utils'; import type { diff --git a/packages/insomnia/src/sync/git/providers/gitlab.ts b/packages/insomnia/src/sync/git/providers/gitlab.ts index b7c2d346f8..f1dc5bca5f 100644 --- a/packages/insomnia/src/sync/git/providers/gitlab.ts +++ b/packages/insomnia/src/sync/git/providers/gitlab.ts @@ -2,12 +2,12 @@ import { createHash, randomBytes } from 'node:crypto'; import { shell } from 'electron'; import { net } from 'electron/main'; +import type { BaseGitCredentialsV2, GitCredentials, GitCredentialsV2 } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; import type { GitAuth } from 'isomorphic-git'; import { v4 } from 'uuid'; import { getApiBaseURL, INSOMNIA_GITLAB_CLIENT_ID, INSOMNIA_GITLAB_REDIRECT_URI, PLAYWRIGHT } from '~/common/constants'; -import type { BaseGitCredentialsV2, GitCredentials, GitCredentialsV2 } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; import { expiresAtFromOAuthExpiresIn } from '~/sync/git/utils'; import type { diff --git a/packages/insomnia/src/sync/git/providers/index.ts b/packages/insomnia/src/sync/git/providers/index.ts index 028f02c123..df919e77eb 100644 --- a/packages/insomnia/src/sync/git/providers/index.ts +++ b/packages/insomnia/src/sync/git/providers/index.ts @@ -29,10 +29,10 @@ export type { } from './types'; // Export credential types from model -export type { GitCredentials as GitCredentialData, OauthProviderName } from '~/insomnia-data'; +export type { GitCredentials as GitCredentialData, OauthProviderName } from 'insomnia-data'; // Export type guards from model -import { models } from '~/insomnia-data'; +import { models } from 'insomnia-data'; export const { isGitCredentialsV2, isGitCredentialsV1, isOAuthCredential, supportsRenewal } = models.gitCredentials; // Export registry class diff --git a/packages/insomnia/src/sync/git/providers/registry.ts b/packages/insomnia/src/sync/git/providers/registry.ts index 0a196e9d75..d58fe6706c 100644 --- a/packages/insomnia/src/sync/git/providers/registry.ts +++ b/packages/insomnia/src/sync/git/providers/registry.ts @@ -1,7 +1,7 @@ import type { GitProviderOption, GitRemoteProvider, GitRemoteProviderType, ValidationResult } from './types'; // Re-export types from git-credentials model for convenience -export type { GitCredentials as GitCredentialData, GitRemoteProviderType, ProviderEmail } from '~/insomnia-data'; +export type { GitCredentials as GitCredentialData, GitRemoteProviderType, ProviderEmail } from 'insomnia-data'; export class GitRemoteProviderRegistry { private providers = new Map(); diff --git a/packages/insomnia/src/sync/git/providers/types.ts b/packages/insomnia/src/sync/git/providers/types.ts index e7b8425d01..af0fa81d60 100644 --- a/packages/insomnia/src/sync/git/providers/types.ts +++ b/packages/insomnia/src/sync/git/providers/types.ts @@ -1,8 +1,7 @@ import type { IconProp } from '@fortawesome/fontawesome-svg-core'; +import { type GitCredentials } from 'insomnia-data'; import type { GitAuth } from 'isomorphic-git'; -import { type GitCredentials } from '~/insomnia-data'; - /** * Supported Git remote provider types */ diff --git a/packages/insomnia/src/sync/git/shallow-clone.ts b/packages/insomnia/src/sync/git/shallow-clone.ts index da149909ed..9386b6a8ac 100644 --- a/packages/insomnia/src/sync/git/shallow-clone.ts +++ b/packages/insomnia/src/sync/git/shallow-clone.ts @@ -1,7 +1,6 @@ +import { type GitRepository } from 'insomnia-data'; import * as git from 'isomorphic-git'; -import { type GitRepository } from '~/insomnia-data'; - import { GIT_CLONE_DIR, GIT_INTERNAL_DIR } from './git-vcs'; import { httpClient } from './http-client'; import { gitCallbacks } from './utils'; diff --git a/packages/insomnia/src/sync/git/utils.ts b/packages/insomnia/src/sync/git/utils.ts index 40d46570d2..fd834febd8 100644 --- a/packages/insomnia/src/sync/git/utils.ts +++ b/packages/insomnia/src/sync/git/utils.ts @@ -1,6 +1,6 @@ +import { type GitAuthor, models, services } from 'insomnia-data'; import type { AuthCallback, AuthFailureCallback, AuthSuccessCallback, GitAuth, MessageCallback } from 'isomorphic-git'; -import { type GitAuthor, models, services } from '~/insomnia-data'; import { gitRemoteProviderRegistry, isGitCredentialsV1 } from '~/sync/git/providers'; import { invariant } from '~/utils/invariant'; diff --git a/packages/insomnia/src/sync/ignore-keys.ts b/packages/insomnia/src/sync/ignore-keys.ts index b361165d35..90bf1d387f 100644 --- a/packages/insomnia/src/sync/ignore-keys.ts +++ b/packages/insomnia/src/sync/ignore-keys.ts @@ -1,4 +1,4 @@ -import { type BaseModel, models, type Workspace } from '~/insomnia-data'; +import { type BaseModel, models, type Workspace } from 'insomnia-data'; // Key for VCS to delete before computing changes const DELETE_KEY: keyof BaseModel = 'modified'; diff --git a/packages/insomnia/src/sync/store/drivers/graceful-rename.ts b/packages/insomnia/src/sync/store/drivers/graceful-rename.ts index 218dd2256e..08b4652495 100644 --- a/packages/insomnia/src/sync/store/drivers/graceful-rename.ts +++ b/packages/insomnia/src/sync/store/drivers/graceful-rename.ts @@ -1,6 +1,6 @@ import fs from 'node:fs/promises'; -import { isWindows } from '~/insomnia-data/common'; +import { isWindows } from 'insomnia-data/common'; // Based on node-graceful-fs and vs-code's take on renaming files in a way that is more resilient to Windows locking renames // https://github.com/microsoft/vscode/pull/188899/files#diff-2bf233effbb62ea789bb7c4739d222a43ccd97ed9f1219f75bb07e9dee91c1a7R529 // On Windows, A/V software can lock the directory, causing this diff --git a/packages/insomnia/src/sync/types.ts b/packages/insomnia/src/sync/types.ts index 70d1c8a5ec..c6edc4e34e 100644 --- a/packages/insomnia/src/sync/types.ts +++ b/packages/insomnia/src/sync/types.ts @@ -1,4 +1,4 @@ -import { type BaseModel } from '~/insomnia-data'; +import { type BaseModel } from 'insomnia-data'; export interface Team { id: string; diff --git a/packages/insomnia/src/sync/vcs/initialize-backend-project.ts b/packages/insomnia/src/sync/vcs/initialize-backend-project.ts index bd004cb2d6..10016fafe0 100644 --- a/packages/insomnia/src/sync/vcs/initialize-backend-project.ts +++ b/packages/insomnia/src/sync/vcs/initialize-backend-project.ts @@ -1,4 +1,4 @@ -import { type BaseModel, models, type Project, services, type Workspace } from '~/insomnia-data'; +import { type BaseModel, models, type Project, services, type Workspace } from 'insomnia-data'; import { database } from '../../common/database'; import type { StatusCandidate } from '../types'; diff --git a/packages/insomnia/src/sync/vcs/migrate-projects-into-organization.ts b/packages/insomnia/src/sync/vcs/migrate-projects-into-organization.ts index 98c6508131..47fb6db34b 100644 --- a/packages/insomnia/src/sync/vcs/migrate-projects-into-organization.ts +++ b/packages/insomnia/src/sync/vcs/migrate-projects-into-organization.ts @@ -1,4 +1,4 @@ -import { models, type Project, type RemoteProject,services } from '~/insomnia-data'; +import { models, type Project, type RemoteProject,services } from 'insomnia-data'; import { database } from '../../common/database'; diff --git a/packages/insomnia/src/sync/vcs/pull-backend-project.ts b/packages/insomnia/src/sync/vcs/pull-backend-project.ts index fc61a12be8..b0d1109874 100644 --- a/packages/insomnia/src/sync/vcs/pull-backend-project.ts +++ b/packages/insomnia/src/sync/vcs/pull-backend-project.ts @@ -1,4 +1,4 @@ -import { models, type RemoteProject, services } from '~/insomnia-data'; +import { models, type RemoteProject, services } from 'insomnia-data'; import { DEFAULT_BRANCH_NAME } from '../../common/constants'; import { database } from '../../common/database'; diff --git a/packages/insomnia/src/sync/vcs/util.ts b/packages/insomnia/src/sync/vcs/util.ts index 066c6a8054..8d9f67868b 100644 --- a/packages/insomnia/src/sync/vcs/util.ts +++ b/packages/insomnia/src/sync/vcs/util.ts @@ -1,9 +1,8 @@ import crypto from 'node:crypto'; import clone from 'clone'; - -import { type BaseModel } from '~/insomnia-data'; -import { strings } from '~/insomnia-data/common'; +import { type BaseModel } from 'insomnia-data'; +import { strings } from 'insomnia-data/common'; import { deleteKeys, resetKeys, shouldIgnoreKey } from '../ignore-keys'; import { deterministicStringify } from '../lib/deterministic-stringify'; diff --git a/packages/insomnia/src/sync/vcs/vcs.ts b/packages/insomnia/src/sync/vcs/vcs.ts index 909407623d..c852c19a64 100644 --- a/packages/insomnia/src/sync/vcs/vcs.ts +++ b/packages/insomnia/src/sync/vcs/vcs.ts @@ -6,9 +6,9 @@ import path from 'node:path'; import clone from 'clone'; import { runVcsGraphQL } from 'insomnia-api'; +import { type BaseModel } from 'insomnia-data'; import { PLAYWRIGHT } from '~/common/constants'; -import { type BaseModel } from '~/insomnia-data'; import * as crypt from '../../account/crypt'; import * as session from '../../account/session'; diff --git a/packages/insomnia/src/templating/base-extension-worker.ts b/packages/insomnia/src/templating/base-extension-worker.ts index 5d3867f92b..b7bd8759ed 100644 --- a/packages/insomnia/src/templating/base-extension-worker.ts +++ b/packages/insomnia/src/templating/base-extension-worker.ts @@ -1,4 +1,4 @@ -import type { CloudProviderCredential, Request, RequestGroup, Response, Workspace } from '~/insomnia-data'; +import type { CloudProviderCredential, Request, RequestGroup, Response, Workspace } from 'insomnia-data'; import packageJson from '../../package.json'; import type { NodeCurlRequestOptions } from '../plugins/context/network'; diff --git a/packages/insomnia/src/templating/base-extension.ts b/packages/insomnia/src/templating/base-extension.ts index f7571c9538..1c56445fd7 100644 --- a/packages/insomnia/src/templating/base-extension.ts +++ b/packages/insomnia/src/templating/base-extension.ts @@ -3,9 +3,9 @@ import crypto from 'node:crypto'; import os from 'node:os'; import iconv from 'iconv-lite'; +import { models, type Request, type RequestGroup, services, type Workspace } from 'insomnia-data'; import { jarFromCookies } from '~/common/cookies'; -import { models, type Request, type RequestGroup, services, type Workspace } from '~/insomnia-data'; import { database as db } from '../common/database'; import * as pluginApp from '../plugins/context/app'; diff --git a/packages/insomnia/src/templating/types.ts b/packages/insomnia/src/templating/types.ts index eaeadc35fb..3f6301b4a0 100644 --- a/packages/insomnia/src/templating/types.ts +++ b/packages/insomnia/src/templating/types.ts @@ -1,7 +1,5 @@ import type { BinaryToTextEncoding } from 'node:crypto'; -import type { Cookie } from 'tough-cookie'; - import type { CloudProviderCredential, CookieJar, @@ -18,7 +16,8 @@ import type { UserUploadEnvironment, WebSocketRequest, Workspace, -} from '~/insomnia-data'; +} from 'insomnia-data'; +import type { Cookie } from 'tough-cookie'; import type { NodeCurlRequestOptions, NodeCurlResponseType } from '../plugins/context/network'; import type { PluginStore } from '../plugins/context/store'; diff --git a/packages/insomnia/src/templating/utils.ts b/packages/insomnia/src/templating/utils.ts index 602d5f6e5b..9fa01bda40 100644 --- a/packages/insomnia/src/templating/utils.ts +++ b/packages/insomnia/src/templating/utils.ts @@ -1,6 +1,6 @@ import type { EditorFromTextArea, MarkerRange } from 'codemirror'; +import { models, services } from 'insomnia-data'; -import { models, services } from '~/insomnia-data'; import { decryptSecretValue, decryptVaultKeyFromSession } from '~/utils/vault'; import type { NunjucksParsedTag, NunjucksParsedTagArg, RenderPurpose } from '../templating/types'; diff --git a/packages/insomnia/src/ui/components/.client/codemirror/code-editor.tsx b/packages/insomnia/src/ui/components/.client/codemirror/code-editor.tsx index 2f2d60c310..d5d3d21ee1 100644 --- a/packages/insomnia/src/ui/components/.client/codemirror/code-editor.tsx +++ b/packages/insomnia/src/ui/components/.client/codemirror/code-editor.tsx @@ -11,6 +11,7 @@ import CodeMirror, { import type { GraphQLInfoOptions } from 'codemirror-graphql/info'; import type { ModifiedGraphQLJumpOptions } from 'codemirror-graphql/jump'; import deepEqual from 'deep-equal'; +import { isMac, type KeyCombination } from 'insomnia-data/common'; import { JSONPath } from 'jsonpath-plus'; import React, { forwardRef, memo, useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react'; import { Button, Menu, MenuItem, MenuTrigger, Popover, Toolbar } from 'react-aria-components'; @@ -19,7 +20,6 @@ import vkBeautify from 'vkbeautify'; import { DEBOUNCE_MILLIS } from '~/common/constants'; import * as misc from '~/common/misc'; -import { isMac, type KeyCombination } from '~/insomnia-data/common'; import { getTemplateTags } from '~/plugins'; import { useRootLoaderData } from '~/root'; import { getTagDefinitions } from '~/templating/index'; diff --git a/packages/insomnia/src/ui/components/.client/codemirror/extensions/autocomplete.ts b/packages/insomnia/src/ui/components/.client/codemirror/extensions/autocomplete.ts index 90affd58ec..2a8a799c79 100644 --- a/packages/insomnia/src/ui/components/.client/codemirror/extensions/autocomplete.ts +++ b/packages/insomnia/src/ui/components/.client/codemirror/extensions/autocomplete.ts @@ -1,9 +1,9 @@ import 'codemirror/addon/mode/overlay'; import CodeMirror, { type EnvironmentAutocompleteOptions, type Hint, type ShowHintOptions } from 'codemirror'; +import { getPlatformKeyCombinations } from 'insomnia-data/common'; import { escapeRegex, fnOrString, isNotNullOrUndefined } from '~/common/misc'; -import { getPlatformKeyCombinations } from '~/insomnia-data/common'; import type { NunjucksParsedTag } from '~/templating/types'; import { getDefaultFill } from '~/templating/utils'; diff --git a/packages/insomnia/src/ui/components/.client/codemirror/one-line-editor.tsx b/packages/insomnia/src/ui/components/.client/codemirror/one-line-editor.tsx index 55a211b2bc..f350ba3ea3 100644 --- a/packages/insomnia/src/ui/components/.client/codemirror/one-line-editor.tsx +++ b/packages/insomnia/src/ui/components/.client/codemirror/one-line-editor.tsx @@ -3,12 +3,12 @@ import './base-imports'; import classnames from 'classnames'; import clone from 'clone'; import CodeMirror, { type EditorConfiguration, type EditorEventMap } from 'codemirror'; +import { isMac, type KeyCombination } from 'insomnia-data/common'; import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useRef } from 'react'; import * as reactUse from 'react-use'; import { DEBOUNCE_MILLIS } from '~/common/constants'; import * as misc from '~/common/misc'; -import { isMac, type KeyCombination } from '~/insomnia-data/common'; import { getTemplateTags } from '~/plugins'; import { useRootLoaderData } from '~/root'; import { getTagDefinitions } from '~/templating/index'; diff --git a/packages/insomnia/src/ui/components/base/dropdown/dropdown-hint.tsx b/packages/insomnia/src/ui/components/base/dropdown/dropdown-hint.tsx index 3946949fb0..f977fce3d9 100644 --- a/packages/insomnia/src/ui/components/base/dropdown/dropdown-hint.tsx +++ b/packages/insomnia/src/ui/components/base/dropdown/dropdown-hint.tsx @@ -1,4 +1,4 @@ -import type { PlatformKeyCombinations } from '~/insomnia-data/common'; +import type { PlatformKeyCombinations } from 'insomnia-data/common'; import { Hotkey } from '../../hotkey'; diff --git a/packages/insomnia/src/ui/components/base/dropdown/item-content.tsx b/packages/insomnia/src/ui/components/base/dropdown/item-content.tsx index fbfc2b384c..6999980311 100644 --- a/packages/insomnia/src/ui/components/base/dropdown/item-content.tsx +++ b/packages/insomnia/src/ui/components/base/dropdown/item-content.tsx @@ -1,7 +1,6 @@ +import type { PlatformKeyCombinations } from 'insomnia-data/common'; import React, { type CSSProperties, type FC, type PropsWithChildren, type ReactNode } from 'react'; -import type { PlatformKeyCombinations } from '~/insomnia-data/common'; - import { SvgIcon } from '../../svg-icon'; import { PromptButton } from '../prompt-button'; import { DropdownHint } from './dropdown-hint'; diff --git a/packages/insomnia/src/ui/components/command-palette.tsx b/packages/insomnia/src/ui/components/command-palette.tsx index be10fe9a13..63bb5f1089 100644 --- a/packages/insomnia/src/ui/components/command-palette.tsx +++ b/packages/insomnia/src/ui/components/command-palette.tsx @@ -1,3 +1,5 @@ +import { models } from 'insomnia-data'; +import { constructKeyCombinationDisplay, getPlatformKeyCombinations } from 'insomnia-data/common'; import React, { memo, useEffect, useRef } from 'react'; import { useState } from 'react'; import { @@ -21,8 +23,6 @@ import { import { useNavigate, useParams } from 'react-router'; import { scopeToBgColorMap, scopeToIconMap, scopeToLabelMap, scopeToTextColorMap } from '~/common/get-workspace-label'; -import { models } from '~/insomnia-data'; -import { constructKeyCombinationDisplay, getPlatformKeyCombinations } from '~/insomnia-data/common'; import { useRootLoaderData } from '~/root'; import { useCommandsLoaderFetcher } from '~/routes/commands'; import { useInsomniaSyncPullRemoteFileActionFetcher } from '~/routes/organization.$organizationId.insomnia-sync.pull-remote-file'; diff --git a/packages/insomnia/src/ui/components/dropdowns/auth-dropdown.tsx b/packages/insomnia/src/ui/components/dropdowns/auth-dropdown.tsx index 2de0dc281a..6e1da2dc02 100644 --- a/packages/insomnia/src/ui/components/dropdowns/auth-dropdown.tsx +++ b/packages/insomnia/src/ui/components/dropdowns/auth-dropdown.tsx @@ -1,4 +1,5 @@ import type { IconName } from '@fortawesome/fontawesome-svg-core'; +import { type AuthTypeAPIKey, type AuthTypeAwsIam, type AuthTypeBasic, type AuthTypeNTLM, type RequestAuthentication } from 'insomnia-data'; import React, { type FC, useCallback } from 'react'; import { Button, @@ -13,8 +14,6 @@ import { } from 'react-aria-components'; import { useParams } from 'react-router'; -import { type AuthTypeAPIKey, type AuthTypeAwsIam, type AuthTypeBasic, type AuthTypeNTLM, type RequestAuthentication } from '~/insomnia-data'; - import { type AuthTypes, HAWK_ALGORITHM_SHA256 } from '../../../common/constants'; import { getAuthObjectOrNull } from '../../../network/authentication'; import { SIGNATURE_METHOD_HMAC_SHA1 } from '../../../network/o-auth-1/constants'; diff --git a/packages/insomnia/src/ui/components/dropdowns/content-type-dropdown.tsx b/packages/insomnia/src/ui/components/dropdowns/content-type-dropdown.tsx index 42c3691c13..dffaf2d006 100644 --- a/packages/insomnia/src/ui/components/dropdowns/content-type-dropdown.tsx +++ b/packages/insomnia/src/ui/components/dropdowns/content-type-dropdown.tsx @@ -1,4 +1,6 @@ import type { IconName } from '@fortawesome/fontawesome-svg-core'; +import { type Request, type RequestBody, type RequestHeader, type RequestParameter } from 'insomnia-data'; +import { deconstructQueryStringToParams } from 'insomnia-data/common'; import React, { type FC } from 'react'; import { Button, @@ -13,9 +15,6 @@ import { } from 'react-aria-components'; import { useParams } from 'react-router'; -import { type Request, type RequestBody, type RequestHeader, type RequestParameter } from '~/insomnia-data'; -import { deconstructQueryStringToParams } from '~/insomnia-data/common'; - import { CONTENT_TYPE_EDN, CONTENT_TYPE_FILE, diff --git a/packages/insomnia/src/ui/components/dropdowns/git-project-sync-dropdown.tsx b/packages/insomnia/src/ui/components/dropdowns/git-project-sync-dropdown.tsx index 0013dbd0e9..55759076de 100644 --- a/packages/insomnia/src/ui/components/dropdowns/git-project-sync-dropdown.tsx +++ b/packages/insomnia/src/ui/components/dropdowns/git-project-sync-dropdown.tsx @@ -1,4 +1,5 @@ import type { IconName, IconProp } from '@fortawesome/fontawesome-svg-core'; +import { type GitProject, type GitRepository, models } from 'insomnia-data'; import { type FC, useEffect, useMemo, useRef, useState } from 'react'; import { Button, @@ -15,7 +16,6 @@ import { import { useParams, useRevalidator } from 'react-router'; import * as reactUse from 'react-use'; -import { type GitProject, type GitRepository,models } from '~/insomnia-data'; import { useGitProjectCheckoutBranchActionFetcher } from '~/routes/git.branch.checkout'; import { useGitProjectFetchActionFetcher } from '~/routes/git.fetch'; import { useGitProjectPushActionFetcher } from '~/routes/git.push'; diff --git a/packages/insomnia/src/ui/components/dropdowns/git-sync-dropdown.tsx b/packages/insomnia/src/ui/components/dropdowns/git-sync-dropdown.tsx index 382cc4e61d..403b43e3a7 100644 --- a/packages/insomnia/src/ui/components/dropdowns/git-sync-dropdown.tsx +++ b/packages/insomnia/src/ui/components/dropdowns/git-sync-dropdown.tsx @@ -1,4 +1,5 @@ import type { IconName, IconProp } from '@fortawesome/fontawesome-svg-core'; +import { type GitRepository } from 'insomnia-data'; import { type FC, useEffect, useState } from 'react'; import { Button, @@ -14,7 +15,6 @@ import { import { useParams, useRevalidator } from 'react-router'; import * as reactUse from 'react-use'; -import { type GitRepository } from '~/insomnia-data'; import { useGitProjectCheckoutBranchActionFetcher } from '~/routes/git.branch.checkout'; import { useGitProjectFetchActionFetcher } from '~/routes/git.fetch'; import { useGitProjectPushActionFetcher } from '~/routes/git.push'; diff --git a/packages/insomnia/src/ui/components/dropdowns/mcp-actions-dropdown.tsx b/packages/insomnia/src/ui/components/dropdowns/mcp-actions-dropdown.tsx index 1c94fb2cf2..f7b25a101b 100644 --- a/packages/insomnia/src/ui/components/dropdowns/mcp-actions-dropdown.tsx +++ b/packages/insomnia/src/ui/components/dropdowns/mcp-actions-dropdown.tsx @@ -1,10 +1,10 @@ import type { IconName } from '@fortawesome/fontawesome-svg-core'; +import type { McpRequest, McpServerPrimitiveTypes } from 'insomnia-data'; +import type { PlatformKeyCombinations } from 'insomnia-data/common'; import React from 'react'; import { Button, Collection, Header, Menu, MenuItem, MenuSection, MenuTrigger, Popover } from 'react-aria-components'; import type { McpServerData } from '~/common/mcp-utils'; -import type { McpRequest, McpServerPrimitiveTypes } from '~/insomnia-data'; -import type { PlatformKeyCombinations } from '~/insomnia-data/common'; import { Icon } from '../icon'; import type { PrimitiveTypeItem } from '../mcp/types'; diff --git a/packages/insomnia/src/ui/components/dropdowns/preview-mode-dropdown.tsx b/packages/insomnia/src/ui/components/dropdowns/preview-mode-dropdown.tsx index 3385879e8f..648b5941db 100644 --- a/packages/insomnia/src/ui/components/dropdowns/preview-mode-dropdown.tsx +++ b/packages/insomnia/src/ui/components/dropdowns/preview-mode-dropdown.tsx @@ -1,9 +1,8 @@ +import { models, services } from 'insomnia-data'; +import { getPreviewModeName, PREVIEW_MODE_SOURCE, PREVIEW_MODES } from 'insomnia-data/common'; import React, { type FC, useCallback } from 'react'; import { Button } from 'react-aria-components'; -import { models, services } from '~/insomnia-data'; -import { getPreviewModeName, PREVIEW_MODE_SOURCE, PREVIEW_MODES } from '~/insomnia-data/common'; - import { exportHarCurrentRequest } from '../../../common/har'; import { type RequestLoaderData, diff --git a/packages/insomnia/src/ui/components/dropdowns/project-dropdown.tsx b/packages/insomnia/src/ui/components/dropdowns/project-dropdown.tsx index 7d787b1fd1..37b948b9a8 100644 --- a/packages/insomnia/src/ui/components/dropdowns/project-dropdown.tsx +++ b/packages/insomnia/src/ui/components/dropdowns/project-dropdown.tsx @@ -1,9 +1,9 @@ import type { IconName } from '@fortawesome/fontawesome-svg-core'; import type { StorageRules } from 'insomnia-api'; +import { type GitRepository, models, type Project } from 'insomnia-data'; import React, { type FC, Fragment, useEffect, useState } from 'react'; import { Button, Menu, MenuItem, MenuTrigger, Popover, Tooltip, TooltipTrigger } from 'react-aria-components'; -import { type GitRepository, models, type Project } from '~/insomnia-data'; import { useProjectDeleteActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.delete'; import { Icon } from '../icon'; diff --git a/packages/insomnia/src/ui/components/dropdowns/request-actions-dropdown.tsx b/packages/insomnia/src/ui/components/dropdowns/request-actions-dropdown.tsx index fc327b6ad0..928638425d 100644 --- a/packages/insomnia/src/ui/components/dropdowns/request-actions-dropdown.tsx +++ b/packages/insomnia/src/ui/components/dropdowns/request-actions-dropdown.tsx @@ -1,8 +1,4 @@ import type { IconName } from '@fortawesome/fontawesome-svg-core'; -import React, { Fragment, useCallback, useState } from 'react'; -import { Button, Collection, Header, Menu, MenuItem, MenuSection, MenuTrigger, Popover } from 'react-aria-components'; -import { useParams } from 'react-router'; - import { type Environment, type GrpcRequest, @@ -12,8 +8,12 @@ import { services, type SocketIORequest, type WebSocketRequest, -} from '~/insomnia-data'; -import type { PlatformKeyCombinations } from '~/insomnia-data/common'; +} from 'insomnia-data'; +import type { PlatformKeyCombinations } from 'insomnia-data/common'; +import React, { Fragment, useCallback, useState } from 'react'; +import { Button, Collection, Header, Menu, MenuItem, MenuSection, MenuTrigger, Popover } from 'react-aria-components'; +import { useParams } from 'react-router'; + import { useRootLoaderData } from '~/root'; import { useWorkspaceLoaderData } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId'; import { useRequestDuplicateActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.duplicate'; diff --git a/packages/insomnia/src/ui/components/dropdowns/request-group-actions-dropdown.tsx b/packages/insomnia/src/ui/components/dropdowns/request-group-actions-dropdown.tsx index 3388d7cbd6..a9adbe12f0 100644 --- a/packages/insomnia/src/ui/components/dropdowns/request-group-actions-dropdown.tsx +++ b/packages/insomnia/src/ui/components/dropdowns/request-group-actions-dropdown.tsx @@ -1,10 +1,10 @@ import type { IconName } from '@fortawesome/fontawesome-svg-core'; +import { type Request, type RequestGroup, services } from 'insomnia-data'; +import type { PlatformKeyCombinations } from 'insomnia-data/common'; import React, { Fragment, useRef, useState } from 'react'; import { Button, Collection, Header, Menu, MenuItem, MenuSection, MenuTrigger, Popover } from 'react-aria-components'; import { useParams } from 'react-router'; -import { type Request, type RequestGroup, services } from '~/insomnia-data'; -import type { PlatformKeyCombinations } from '~/insomnia-data/common'; import { useRootLoaderData } from '~/root'; import { useRequestNewActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.new'; import { useRequestGroupDeleteActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.delete'; diff --git a/packages/insomnia/src/ui/components/dropdowns/response-history-dropdown.tsx b/packages/insomnia/src/ui/components/dropdowns/response-history-dropdown.tsx index f26ef1b75b..385523370a 100644 --- a/packages/insomnia/src/ui/components/dropdowns/response-history-dropdown.tsx +++ b/packages/insomnia/src/ui/components/dropdowns/response-history-dropdown.tsx @@ -1,9 +1,5 @@ import { differenceInHours, differenceInMinutes, isThisWeek, isToday } from 'date-fns'; -import React, { useCallback, useEffect, useRef, useState } from 'react'; -import { Button } from 'react-aria-components'; -import { useParams } from 'react-router'; - -import { type McpResponse } from '~/insomnia-data'; +import { type McpResponse } from 'insomnia-data'; import { models, type Request, @@ -13,7 +9,11 @@ import { type SocketIOResponse, type WebSocketRequest, type WebSocketResponse, -} from '~/insomnia-data'; +} from 'insomnia-data'; +import React, { useCallback, useEffect, useRef, useState } from 'react'; +import { Button } from 'react-aria-components'; +import { useParams } from 'react-router'; + import { useRequestResponseDeleteActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.response.delete'; import { useRequestResponseDeleteAllActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.response.delete-all'; diff --git a/packages/insomnia/src/ui/components/dropdowns/sync-dropdown.tsx b/packages/insomnia/src/ui/components/dropdowns/sync-dropdown.tsx index 34c5653bec..07e914aba5 100644 --- a/packages/insomnia/src/ui/components/dropdowns/sync-dropdown.tsx +++ b/packages/insomnia/src/ui/components/dropdowns/sync-dropdown.tsx @@ -1,4 +1,5 @@ import type { IconProp } from '@fortawesome/fontawesome-svg-core'; +import { type Project, type Workspace } from 'insomnia-data'; import React, { type FC, Fragment, useCallback, useEffect, useState } from 'react'; import { Button, @@ -15,7 +16,6 @@ import { import { useParams } from 'react-router'; import * as reactUse from 'react-use'; -import { type Project, type Workspace } from '~/insomnia-data'; import { useInsomniaSyncBranchCheckoutActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.branch.checkout'; import { useInsomniaSyncPullActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.pull'; import { useInsomniaSyncPushActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.push'; diff --git a/packages/insomnia/src/ui/components/dropdowns/workspace-card-dropdown.tsx b/packages/insomnia/src/ui/components/dropdowns/workspace-card-dropdown.tsx index 9457b0d501..29eea5dcdc 100644 --- a/packages/insomnia/src/ui/components/dropdowns/workspace-card-dropdown.tsx +++ b/packages/insomnia/src/ui/components/dropdowns/workspace-card-dropdown.tsx @@ -3,11 +3,11 @@ import { exportMcpClientToFile, exportMockServerToFile, } from 'insomnia/src/ui/components/settings/import-export'; +import { type ApiSpec, type MockServer, models, type Project, type Workspace } from 'insomnia-data'; import React, { type FC, Fragment, useCallback, useState } from 'react'; import { Button, Dialog, Heading, Label, Modal, ModalOverlay, Radio, RadioGroup } from 'react-aria-components'; import { href, useParams } from 'react-router'; -import { type ApiSpec, type MockServer, models, type Project, type Workspace } from '~/insomnia-data'; import { useWorkspaceDeleteActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.delete'; import { useWorkspaceUpdateActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.update'; import { useTabNavigate } from '~/ui/hooks/use-insomnia-tab'; diff --git a/packages/insomnia/src/ui/components/dropdowns/workspace-dropdown.tsx b/packages/insomnia/src/ui/components/dropdowns/workspace-dropdown.tsx index 7499462262..e40e92044a 100644 --- a/packages/insomnia/src/ui/components/dropdowns/workspace-dropdown.tsx +++ b/packages/insomnia/src/ui/components/dropdowns/workspace-dropdown.tsx @@ -4,6 +4,8 @@ import { exportMcpClientToFile, exportMockServerToFile, } from 'insomnia/src/ui/components/settings/import-export'; +import { models, type Workspace } from 'insomnia-data'; +import type { PlatformKeyCombinations } from 'insomnia-data/common'; import { type FC, type ReactNode, useCallback, useEffect, useState } from 'react'; import { Button, @@ -21,8 +23,6 @@ import { } from 'react-aria-components'; import { href, useNavigate, useParams } from 'react-router'; -import { models, type Workspace } from '~/insomnia-data'; -import type { PlatformKeyCombinations } from '~/insomnia-data/common'; import { useWorkspaceDeleteActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.delete'; import { useWorkspaceUpdateActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.update'; diff --git a/packages/insomnia/src/ui/components/dropdowns/workspace-sync-dropdown.tsx b/packages/insomnia/src/ui/components/dropdowns/workspace-sync-dropdown.tsx index 07cff3f43f..bba76ec9d1 100644 --- a/packages/insomnia/src/ui/components/dropdowns/workspace-sync-dropdown.tsx +++ b/packages/insomnia/src/ui/components/dropdowns/workspace-sync-dropdown.tsx @@ -1,6 +1,6 @@ +import { models } from 'insomnia-data'; import React, { type FC } from 'react'; -import { models } from '~/insomnia-data'; import { useRootLoaderData } from '~/root'; import { useWorkspaceLoaderData } from '../../../routes/organization.$organizationId.project.$projectId.workspace.$workspaceId'; diff --git a/packages/insomnia/src/ui/components/editors/auth/auth-wrapper.tsx b/packages/insomnia/src/ui/components/editors/auth/auth-wrapper.tsx index aade50883c..142bf8cd99 100644 --- a/packages/insomnia/src/ui/components/editors/auth/auth-wrapper.tsx +++ b/packages/insomnia/src/ui/components/editors/auth/auth-wrapper.tsx @@ -1,8 +1,8 @@ +import { type RequestAuthentication } from 'insomnia-data'; import React, { type FC, type ReactNode } from 'react'; import { Toolbar } from 'react-aria-components'; import type { AuthTypes } from '~/common/constants'; -import { type RequestAuthentication } from '~/insomnia-data'; import { SingleTokenAuth } from '~/ui/components/editors/auth/single-token-auth'; import { getAuthObjectOrNull } from '../../../../network/authentication'; diff --git a/packages/insomnia/src/ui/components/editors/auth/components/auth-accordion.tsx b/packages/insomnia/src/ui/components/editors/auth/components/auth-accordion.tsx index e88b915897..cbff5001c7 100644 --- a/packages/insomnia/src/ui/components/editors/auth/components/auth-accordion.tsx +++ b/packages/insomnia/src/ui/components/editors/auth/components/auth-accordion.tsx @@ -1,7 +1,7 @@ import classnames from 'classnames'; +import { type RequestAccordionKeys } from 'insomnia-data'; import React, { type FC, type PropsWithChildren } from 'react'; -import { type RequestAccordionKeys } from '~/insomnia-data'; import { type RequestLoaderData, useRequestLoaderData, diff --git a/packages/insomnia/src/ui/components/editors/auth/components/auth-select-row.tsx b/packages/insomnia/src/ui/components/editors/auth/components/auth-select-row.tsx index cb6d3adc96..c0c878612b 100644 --- a/packages/insomnia/src/ui/components/editors/auth/components/auth-select-row.tsx +++ b/packages/insomnia/src/ui/components/editors/auth/components/auth-select-row.tsx @@ -1,7 +1,7 @@ +import { type RequestAuthentication } from 'insomnia-data'; import React, { type ChangeEvent, type FC, type ReactNode, useCallback } from 'react'; import { toKebabCase } from '~/common/misc'; -import { type RequestAuthentication } from '~/insomnia-data'; import { getAuthObjectOrNull } from '~/network/authentication'; import { type RequestLoaderData, diff --git a/packages/insomnia/src/ui/components/editors/auth/o-auth-1-auth.tsx b/packages/insomnia/src/ui/components/editors/auth/o-auth-1-auth.tsx index 124b35f4a5..9885e6e679 100644 --- a/packages/insomnia/src/ui/components/editors/auth/o-auth-1-auth.tsx +++ b/packages/insomnia/src/ui/components/editors/auth/o-auth-1-auth.tsx @@ -1,7 +1,6 @@ +import { type AuthTypeOAuth1 } from 'insomnia-data'; import React, { type FC } from 'react'; -import { type AuthTypeOAuth1 } from '~/insomnia-data'; - import { type OAuth1SignatureMethod, SIGNATURE_METHOD_HMAC_SHA1, diff --git a/packages/insomnia/src/ui/components/editors/auth/o-auth-2-auth.tsx b/packages/insomnia/src/ui/components/editors/auth/o-auth-2-auth.tsx index 4085cfb0c4..c3533fb5d8 100644 --- a/packages/insomnia/src/ui/components/editors/auth/o-auth-2-auth.tsx +++ b/packages/insomnia/src/ui/components/editors/auth/o-auth-2-auth.tsx @@ -1,7 +1,6 @@ +import { type AuthTypeOAuth2, type OAuth2ResponseType, type OAuth2Token, type RequestAuthentication,services } from 'insomnia-data'; import React, { type ChangeEvent, type FC, type ReactNode, useEffect, useMemo, useState } from 'react'; -import { type AuthTypeOAuth2, type OAuth2ResponseType, type OAuth2Token, type RequestAuthentication,services } from '~/insomnia-data'; - import { getOauthRedirectUrl } from '../../../../common/constants'; import { toKebabCase } from '../../../../common/misc'; import accessTokenUrls from '../../../../datasets/access-token-urls'; diff --git a/packages/insomnia/src/ui/components/editors/body/body-editor.tsx b/packages/insomnia/src/ui/components/editors/body/body-editor.tsx index 147fb1ebbf..30977cc26b 100644 --- a/packages/insomnia/src/ui/components/editors/body/body-editor.tsx +++ b/packages/insomnia/src/ui/components/editors/body/body-editor.tsx @@ -1,12 +1,11 @@ import clone from 'clone'; +import { models, type Request, type RequestBodyParameter } from 'insomnia-data'; +import { getContentTypeFromHeaders } from 'insomnia-data/common'; import { lookup } from 'mime-types'; import React, { type FC, useCallback } from 'react'; import { Toolbar } from 'react-aria-components'; import { useParams } from 'react-router'; -import { models, type Request, type RequestBodyParameter } from '~/insomnia-data'; -import { getContentTypeFromHeaders } from '~/insomnia-data/common'; - import { CONTENT_TYPE_FILE, CONTENT_TYPE_FORM_DATA, diff --git a/packages/insomnia/src/ui/components/editors/body/graph-ql-editor.tsx b/packages/insomnia/src/ui/components/editors/body/graph-ql-editor.tsx index e9cbf2d05b..f943dd29cd 100644 --- a/packages/insomnia/src/ui/components/editors/body/graph-ql-editor.tsx +++ b/packages/insomnia/src/ui/components/editors/body/graph-ql-editor.tsx @@ -16,13 +16,13 @@ import { typeFromAST, } from 'graphql'; import type { Maybe } from 'graphql-language-service'; +import { type Request, services } from 'insomnia-data'; import React, { type FC, useCallback, useEffect, useRef, useState } from 'react'; import { Button, Group, Heading, Toolbar, Tooltip, TooltipTrigger } from 'react-aria-components'; import ReactDOM from 'react-dom'; import { Panel, PanelGroup, PanelResizeHandle } from 'react-resizable-panels'; import * as reactUse from 'react-use'; -import { type Request, services } from '~/insomnia-data'; import { CodeEditor, type CodeEditorHandle } from '~/ui/components/.client/codemirror/code-editor'; import { CONTENT_TYPE_JSON } from '../../../../common/constants'; diff --git a/packages/insomnia/src/ui/components/editors/environment-editor.tsx b/packages/insomnia/src/ui/components/editors/environment-editor.tsx index b7b1a1cb3e..6f6b88c445 100644 --- a/packages/insomnia/src/ui/components/editors/environment-editor.tsx +++ b/packages/insomnia/src/ui/components/editors/environment-editor.tsx @@ -1,7 +1,7 @@ +import { isWindows } from 'insomnia-data/common'; import orderedJSON from 'json-order'; import React, { forwardRef, useCallback, useImperativeHandle, useRef, useState } from 'react'; -import { isWindows } from '~/insomnia-data/common'; import { CodeEditor, type CodeEditorHandle } from '~/ui/components/.client/codemirror/code-editor'; import { checkNestedKeys } from '~/utils/environment-utils'; diff --git a/packages/insomnia/src/ui/components/editors/environment-key-value-editor/key-value-editor.tsx b/packages/insomnia/src/ui/components/editors/environment-key-value-editor/key-value-editor.tsx index 87770cae81..a4ba461353 100644 --- a/packages/insomnia/src/ui/components/editors/environment-key-value-editor/key-value-editor.tsx +++ b/packages/insomnia/src/ui/components/editors/environment-key-value-editor/key-value-editor.tsx @@ -1,3 +1,4 @@ +import { type EnvironmentKvPairData, type EnvironmentKvPairDataType, models } from 'insomnia-data'; import React, { useEffect, useMemo, useRef, useState } from 'react'; import { Button, @@ -13,7 +14,6 @@ import { useDragAndDrop, } from 'react-aria-components'; -import { type EnvironmentKvPairData, type EnvironmentKvPairDataType, models } from '~/insomnia-data'; import { OneLineEditor } from '~/ui/components/.client/codemirror/one-line-editor'; import { checkNestedKeys, ensureKeyIsValid } from '~/utils/environment-utils'; diff --git a/packages/insomnia/src/ui/components/editors/mock-response-extractor.tsx b/packages/insomnia/src/ui/components/editors/mock-response-extractor.tsx index b33f192b55..de4bfbdc40 100644 --- a/packages/insomnia/src/ui/components/editors/mock-response-extractor.tsx +++ b/packages/insomnia/src/ui/components/editors/mock-response-extractor.tsx @@ -1,8 +1,8 @@ +import { models } from 'insomnia-data'; import React, { useState } from 'react'; import { Button } from 'react-aria-components'; import { useNavigate, useParams } from 'react-router'; -import { models } from '~/insomnia-data'; import { useOrganizationLoaderData } from '~/routes/organization'; import { useRequestLoaderData } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId'; import { diff --git a/packages/insomnia/src/ui/components/editors/mock-response-headers-editor.tsx b/packages/insomnia/src/ui/components/editors/mock-response-headers-editor.tsx index b5e8216a4c..76c9955821 100644 --- a/packages/insomnia/src/ui/components/editors/mock-response-headers-editor.tsx +++ b/packages/insomnia/src/ui/components/editors/mock-response-headers-editor.tsx @@ -1,7 +1,7 @@ +import { type RequestHeader } from 'insomnia-data'; import React, { type FC, useCallback } from 'react'; import { useParams } from 'react-router'; -import { type RequestHeader } from '~/insomnia-data'; import { useMockRouteLoaderData, useMockRoutePatcher, diff --git a/packages/insomnia/src/ui/components/editors/request-headers-editor.tsx b/packages/insomnia/src/ui/components/editors/request-headers-editor.tsx index 03526f5d5e..45c8678076 100644 --- a/packages/insomnia/src/ui/components/editors/request-headers-editor.tsx +++ b/packages/insomnia/src/ui/components/editors/request-headers-editor.tsx @@ -1,7 +1,7 @@ +import { type RequestHeader } from 'insomnia-data'; import React, { type FC, useCallback } from 'react'; import { useParams } from 'react-router'; -import { type RequestHeader } from '~/insomnia-data'; import { CodeEditor } from '~/ui/components/.client/codemirror/code-editor'; import { getCommonHeaderNames, getCommonHeaderValues } from '../../../common/common-headers'; diff --git a/packages/insomnia/src/ui/components/editors/request-parameters-editor.tsx b/packages/insomnia/src/ui/components/editors/request-parameters-editor.tsx index 59ff415e84..80252f15dd 100644 --- a/packages/insomnia/src/ui/components/editors/request-parameters-editor.tsx +++ b/packages/insomnia/src/ui/components/editors/request-parameters-editor.tsx @@ -1,7 +1,7 @@ +import { type RequestParameter } from 'insomnia-data'; import { type FC, useCallback } from 'react'; import { useParams } from 'react-router'; -import { type RequestParameter } from '~/insomnia-data'; import { type RequestLoaderData, useRequestLoaderData, diff --git a/packages/insomnia/src/ui/components/editors/request-script-editor.tsx b/packages/insomnia/src/ui/components/editors/request-script-editor.tsx index a746640988..3575fbd53f 100644 --- a/packages/insomnia/src/ui/components/editors/request-script-editor.tsx +++ b/packages/insomnia/src/ui/components/editors/request-script-editor.tsx @@ -1,4 +1,5 @@ import type { Snippet } from 'codemirror'; +import type { Settings } from 'insomnia-data'; import React, { type FC, useRef } from 'react'; import { Button, @@ -12,7 +13,6 @@ import { Toolbar, } from 'react-aria-components'; -import type { Settings } from '~/insomnia-data'; import { translateHandlersInScript } from '~/main/importers/importers/translate-postman-script'; import { CodeEditor, type CodeEditorHandle } from '~/ui/components/.client/codemirror/code-editor'; diff --git a/packages/insomnia/src/ui/components/environment-picker.tsx b/packages/insomnia/src/ui/components/environment-picker.tsx index c5aa7ae572..07d7a61c56 100644 --- a/packages/insomnia/src/ui/components/environment-picker.tsx +++ b/packages/insomnia/src/ui/components/environment-picker.tsx @@ -1,4 +1,5 @@ import type { IconName } from '@fortawesome/fontawesome-svg-core'; +import { models } from 'insomnia-data'; import { Fragment } from 'react'; import { Button, @@ -14,7 +15,6 @@ import { } from 'react-aria-components'; import { useNavigate, useParams } from 'react-router'; -import { models } from '~/insomnia-data'; import { useSetActiveEnvironmentFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.set-active'; import { useEnvironmentSetActiveGlobalActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.set-active-global'; diff --git a/packages/insomnia/src/ui/components/git-credentials/git-custom-credential-form.tsx b/packages/insomnia/src/ui/components/git-credentials/git-custom-credential-form.tsx index 25a1b70093..a655e64db2 100644 --- a/packages/insomnia/src/ui/components/git-credentials/git-custom-credential-form.tsx +++ b/packages/insomnia/src/ui/components/git-credentials/git-custom-credential-form.tsx @@ -1,7 +1,7 @@ +import { type CustomGitCredentialV2 } from 'insomnia-data'; import { Form } from 'react-aria-components'; import { Button } from '~/basic-components/button'; -import { type CustomGitCredentialV2 } from '~/insomnia-data'; import { useGitCredentialsUpdateActionFetcher } from '~/routes/git-credentials.$id.update'; import { useGitCredentialsCreateActionFetcher } from '~/routes/git-credentials.create'; import { Input } from '~/ui/components/base/input'; diff --git a/packages/insomnia/src/ui/components/git/connection-info.tsx b/packages/insomnia/src/ui/components/git/connection-info.tsx index 5df1d681fa..1c452f0c58 100644 --- a/packages/insomnia/src/ui/components/git/connection-info.tsx +++ b/packages/insomnia/src/ui/components/git/connection-info.tsx @@ -1,9 +1,9 @@ import type { IconProp } from '@fortawesome/fontawesome-svg-core'; +import { type GitRepository } from 'insomnia-data'; import { useEffect, useState } from 'react'; import { Button, Separator } from 'react-aria-components'; import { Icon } from '~/basic-components/icon'; -import { type GitRepository } from '~/insomnia-data'; import { showSettingsModal } from '~/ui/components/modals/settings-modal'; export const GitConnectionInfo = ({ diff --git a/packages/insomnia/src/ui/components/git/git-oauth-auth-banner.tsx b/packages/insomnia/src/ui/components/git/git-oauth-auth-banner.tsx index 128751ec2b..90af584235 100644 --- a/packages/insomnia/src/ui/components/git/git-oauth-auth-banner.tsx +++ b/packages/insomnia/src/ui/components/git/git-oauth-auth-banner.tsx @@ -1,11 +1,11 @@ import type { IconProp } from '@fortawesome/fontawesome-svg-core'; +import type { GitCredentials, GitRepository } from 'insomnia-data'; import type { FC } from 'react'; import { useEffect, useState } from 'react'; import { Button, Dialog, Heading, Modal, ModalOverlay } from 'react-aria-components'; import { Banner } from '~/basic-components/banner'; import { Icon } from '~/basic-components/icon'; -import type { GitCredentials, GitRepository } from '~/insomnia-data'; import { useInitSignInToGitProviderFetcher } from '~/routes/git-credentials.init-sign-in'; import { useGitProviderUpdateSignInFetcher } from '~/routes/git-credentials.update-sign-in'; diff --git a/packages/insomnia/src/ui/components/git/git-oauth-auth-utils.ts b/packages/insomnia/src/ui/components/git/git-oauth-auth-utils.ts index 9f63200a50..b00c55b000 100644 --- a/packages/insomnia/src/ui/components/git/git-oauth-auth-utils.ts +++ b/packages/insomnia/src/ui/components/git/git-oauth-auth-utils.ts @@ -1,5 +1,6 @@ -import type { GitCredentials, GitRepository } from '~/insomnia-data'; -import { models } from '~/insomnia-data'; +import type { GitCredentials, GitRepository } from 'insomnia-data'; +import { models } from 'insomnia-data'; + import { getOauth2FormatName } from '~/sync/git/get-oauth2-format-name'; const { isGitCredentialsV2, isOAuthCredential } = models.gitCredentials; diff --git a/packages/insomnia/src/ui/components/github-app-config-link.tsx b/packages/insomnia/src/ui/components/github-app-config-link.tsx index 171dac6f52..ace17964aa 100644 --- a/packages/insomnia/src/ui/components/github-app-config-link.tsx +++ b/packages/insomnia/src/ui/components/github-app-config-link.tsx @@ -1,4 +1,5 @@ -import { type GitRepository } from '~/insomnia-data'; +import { type GitRepository } from 'insomnia-data'; + import { getOauth2FormatName } from '~/sync/git/get-oauth2-format-name'; import { getAppWebsiteBaseURL } from '../../common/constants'; diff --git a/packages/insomnia/src/ui/components/hotkey.tsx b/packages/insomnia/src/ui/components/hotkey.tsx index 4be0eb5c5d..aeced04466 100644 --- a/packages/insomnia/src/ui/components/hotkey.tsx +++ b/packages/insomnia/src/ui/components/hotkey.tsx @@ -1,9 +1,8 @@ import classnames from 'classnames'; +import type { KeyCombination, PlatformKeyCombinations } from 'insomnia-data/common'; +import { constructKeyCombinationDisplay, getPlatformKeyCombinations, isMac } from 'insomnia-data/common'; import React, { type FC, memo } from 'react'; -import type { KeyCombination, PlatformKeyCombinations } from '~/insomnia-data/common'; -import { constructKeyCombinationDisplay, getPlatformKeyCombinations, isMac } from '~/insomnia-data/common'; - interface Props { /** One of these two must be given. If both is given, keyCombination will be used. */ keyCombination?: KeyCombination; diff --git a/packages/insomnia/src/ui/components/keydown-binder.ts b/packages/insomnia/src/ui/components/keydown-binder.ts index 3f9316ea47..b88016f1fd 100644 --- a/packages/insomnia/src/ui/components/keydown-binder.ts +++ b/packages/insomnia/src/ui/components/keydown-binder.ts @@ -1,3 +1,5 @@ +import type { KeyboardShortcut, KeyCombination } from 'insomnia-data/common'; +import { getPlatformKeyCombinations, keyboardKeys } from 'insomnia-data/common'; import { useEffect } from 'react'; import { createKeybindingsHandler as _createKeybindingsHandler, @@ -6,8 +8,6 @@ import { tinykeys, } from 'tinykeys'; -import type { KeyboardShortcut, KeyCombination } from '~/insomnia-data/common'; -import { getPlatformKeyCombinations, keyboardKeys } from '~/insomnia-data/common'; import { useRootLoaderData } from '~/root'; const keyCombinationToTinyKeyString = ({ ctrl, alt, shift, meta, keyCode }: KeyCombination): string => diff --git a/packages/insomnia/src/ui/components/mcp/event-view.tsx b/packages/insomnia/src/ui/components/mcp/event-view.tsx index 222e0f8c18..f51fdafa3a 100644 --- a/packages/insomnia/src/ui/components/mcp/event-view.tsx +++ b/packages/insomnia/src/ui/components/mcp/event-view.tsx @@ -4,18 +4,17 @@ import { ElicitRequestSchema, } from '@modelcontextprotocol/sdk/types.js'; import { type RJSFSchema } from '@rjsf/utils'; -import React, { useCallback, useEffect, useRef, useState } from 'react'; -import { Button } from 'react-aria-components'; -import { useParams } from 'react-router'; - -import { services } from '~/insomnia-data'; +import { services } from 'insomnia-data'; import { getPreviewModeName, PREVIEW_MODE_FRIENDLY, PREVIEW_MODE_RAW, PREVIEW_MODE_SOURCE, PREVIEW_MODES, -} from '~/insomnia-data/common'; +} from 'insomnia-data/common'; +import React, { useCallback, useEffect, useRef, useState } from 'react'; +import { Button } from 'react-aria-components'; +import { useParams } from 'react-router'; import { METHOD_CALL_TOOL } from '../../../common/mcp-utils'; import type { McpEvent } from '../../../main/mcp/types'; diff --git a/packages/insomnia/src/ui/components/mcp/mcp-pane.tsx b/packages/insomnia/src/ui/components/mcp/mcp-pane.tsx index 7266c5342c..265bb7b257 100644 --- a/packages/insomnia/src/ui/components/mcp/mcp-pane.tsx +++ b/packages/insomnia/src/ui/components/mcp/mcp-pane.tsx @@ -1,5 +1,6 @@ import { useVirtualizer } from '@tanstack/react-virtual'; import cn from 'classnames'; +import type { McpRequest, McpServerPrimitiveTypes } from 'insomnia-data'; import { useCallback, useEffect, useMemo, useRef, useState } from 'react'; import { Breadcrumb, @@ -28,7 +29,6 @@ import { METHOD_LIST_TOOLS, } from '~/common/mcp-utils'; import { fuzzyMatchAll } from '~/common/misc'; -import type { McpRequest, McpServerPrimitiveTypes } from '~/insomnia-data'; import type { McpEvent, McpMessageEvent } from '~/main/mcp/types'; import { useRootLoaderData } from '~/root'; import { useWorkspaceLoaderData } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId'; diff --git a/packages/insomnia/src/ui/components/mcp/mcp-request-pane.tsx b/packages/insomnia/src/ui/components/mcp/mcp-request-pane.tsx index aab54ef0cb..63ad85d879 100644 --- a/packages/insomnia/src/ui/components/mcp/mcp-request-pane.tsx +++ b/packages/insomnia/src/ui/components/mcp/mcp-request-pane.tsx @@ -1,5 +1,7 @@ import { type RJSFSchema } from '@rjsf/utils'; import type { EditorChange } from 'codemirror'; +import type { McpPayload } from 'insomnia-data'; +import { type Environment, type EnvironmentKvPairData } from 'insomnia-data'; import React, { type FC, useCallback, useEffect, useMemo, useRef, useState } from 'react'; import { Button, Heading, Tab, TabList, TabPanel, Tabs, Toolbar } from 'react-aria-components'; import { Panel, PanelGroup, PanelResizeHandle } from 'react-resizable-panels'; @@ -7,8 +9,6 @@ import { useLatest } from 'react-use'; import { docsMcpClient } from '~/common/documentation'; import { buildResourceJsonSchema, fillUriTemplate } from '~/common/mcp-utils'; -import type { McpPayload } from '~/insomnia-data'; -import { type Environment, type EnvironmentKvPairData } from '~/insomnia-data'; import type { McpReadyState } from '~/main/mcp/types'; import { useWorkspaceLoaderData } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId'; import { Link } from '~/ui/components/base/link'; diff --git a/packages/insomnia/src/ui/components/mcp/mcp-roots-panel.tsx b/packages/insomnia/src/ui/components/mcp/mcp-roots-panel.tsx index fa3d49bccb..e5b5218a96 100644 --- a/packages/insomnia/src/ui/components/mcp/mcp-roots-panel.tsx +++ b/packages/insomnia/src/ui/components/mcp/mcp-roots-panel.tsx @@ -1,8 +1,8 @@ import type { Root } from '@modelcontextprotocol/sdk/types.js'; +import type { McpRequest } from 'insomnia-data'; import { useState } from 'react'; import { Button, Heading, ListBox, ListBoxItem, Toolbar } from 'react-aria-components'; -import type { McpRequest } from '~/insomnia-data'; import type { McpReadyState } from '~/main/mcp/types'; import { SegmentEvent } from '~/ui/analytics'; import { PromptButton } from '~/ui/components/base/prompt-button'; diff --git a/packages/insomnia/src/ui/components/mcp/mcp-url-bar.tsx b/packages/insomnia/src/ui/components/mcp/mcp-url-bar.tsx index 8417b56cd4..d966948d07 100644 --- a/packages/insomnia/src/ui/components/mcp/mcp-url-bar.tsx +++ b/packages/insomnia/src/ui/components/mcp/mcp-url-bar.tsx @@ -1,11 +1,11 @@ +import { type McpRequest, models } from 'insomnia-data'; +import { type AuthTypeOAuth2, type Project } from 'insomnia-data'; import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useLayoutEffect, useRef } from 'react'; import { OverlayContainer } from 'react-aria'; import { Button as RaButton, Heading, Radio, RadioGroup } from 'react-aria-components'; import { useParams } from 'react-router'; import { useLatest } from 'react-use'; -import { type McpRequest, models } from '~/insomnia-data'; -import { type AuthTypeOAuth2, type Project } from '~/insomnia-data'; import type { McpReadyState } from '~/main/mcp/types'; import { _buildBearerHeader } from '~/network/authentication'; import { getBasicAuthHeader } from '~/network/basic-auth/get-header'; diff --git a/packages/insomnia/src/ui/components/mcp/types.ts b/packages/insomnia/src/ui/components/mcp/types.ts index d897703b31..c952f5cfe4 100644 --- a/packages/insomnia/src/ui/components/mcp/types.ts +++ b/packages/insomnia/src/ui/components/mcp/types.ts @@ -1,6 +1,5 @@ import type { Prompt, Resource, ResourceTemplate, Tool } from '@modelcontextprotocol/sdk/types.js'; - -import type { McpServerPrimitiveTypes } from '~/insomnia-data'; +import type { McpServerPrimitiveTypes } from 'insomnia-data'; interface CommonItemProps { itemLevel: number; diff --git a/packages/insomnia/src/ui/components/mocks/mock-response-pane.tsx b/packages/insomnia/src/ui/components/mocks/mock-response-pane.tsx index 1443e06ecc..cffc022b35 100644 --- a/packages/insomnia/src/ui/components/mocks/mock-response-pane.tsx +++ b/packages/insomnia/src/ui/components/mocks/mock-response-pane.tsx @@ -1,11 +1,11 @@ import { fetchMockbinLogs, type MockbinLogOutput } from 'insomnia-api'; +import { type MockRoute, type MockServer, type Response, type ResponseTimelineEntry, services } from 'insomnia-data'; +import type { PreviewMode } from 'insomnia-data/common'; +import { getPreviewModeName, PREVIEW_MODE_FRIENDLY, PREVIEW_MODES } from 'insomnia-data/common'; import React, { Fragment, useCallback, useEffect, useState } from 'react'; import { Button, Tab, TabList, TabPanel, Tabs, Toolbar } from 'react-aria-components'; import * as reactUse from 'react-use'; -import { type MockRoute, type MockServer, type Response, type ResponseTimelineEntry, services } from '~/insomnia-data'; -import type { PreviewMode } from '~/insomnia-data/common'; -import { getPreviewModeName, PREVIEW_MODE_FRIENDLY, PREVIEW_MODES } from '~/insomnia-data/common'; import { useRootLoaderData } from '~/root'; import { useRequestNewMockSendActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.new-mock-send'; import { useMockRouteLoaderData } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId'; diff --git a/packages/insomnia/src/ui/components/mocks/mock-url-bar.tsx b/packages/insomnia/src/ui/components/mocks/mock-url-bar.tsx index feb1575d90..e3b58152e9 100644 --- a/packages/insomnia/src/ui/components/mocks/mock-url-bar.tsx +++ b/packages/insomnia/src/ui/components/mocks/mock-url-bar.tsx @@ -1,8 +1,8 @@ +import { models, services } from 'insomnia-data'; import React, { useEffect, useRef, useState } from 'react'; import { Button } from 'react-aria-components'; import * as reactUse from 'react-use'; -import { models, services } from '~/insomnia-data'; import { useRootLoaderData } from '~/root'; import { useMockRouteLoaderData } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId'; diff --git a/packages/insomnia/src/ui/components/modals/__tests__/import-export.test.ts b/packages/insomnia/src/ui/components/modals/__tests__/import-export.test.ts index 53419a1919..7ed007a2f2 100644 --- a/packages/insomnia/src/ui/components/modals/__tests__/import-export.test.ts +++ b/packages/insomnia/src/ui/components/modals/__tests__/import-export.test.ts @@ -1,8 +1,7 @@ import { exportRequestsHAR, exportWorkspacesHAR } from 'insomnia/src/common/har'; +import { database as db, services } from 'insomnia-data'; import { beforeEach, describe, expect, it } from 'vitest'; -import { database as db, services } from '~/insomnia-data'; - // @vitest-environment jsdom describe('exportWorkspacesHAR() and exportRequestsHAR()', () => { beforeEach(async () => { diff --git a/packages/insomnia/src/ui/components/modals/add-key-combination-modal.tsx b/packages/insomnia/src/ui/components/modals/add-key-combination-modal.tsx index 9e520937c6..8969e184da 100644 --- a/packages/insomnia/src/ui/components/modals/add-key-combination-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/add-key-combination-modal.tsx @@ -1,9 +1,8 @@ import classnames from 'classnames'; +import type { KeyboardShortcut, KeyCombination } from 'insomnia-data/common'; +import { constructKeyCombinationDisplay, isModifierKeyCode, keyboardKeys } from 'insomnia-data/common'; import React, { forwardRef, type KeyboardEvent, useImperativeHandle, useRef, useState } from 'react'; -import type { KeyboardShortcut, KeyCombination } from '~/insomnia-data/common'; -import { constructKeyCombinationDisplay, isModifierKeyCode, keyboardKeys } from '~/insomnia-data/common'; - import { Modal, type ModalHandle, type ModalProps } from '../base/modal'; import { ModalBody } from '../base/modal-body'; import { ModalHeader } from '../base/modal-header'; diff --git a/packages/insomnia/src/ui/components/modals/add-request-to-collection-modal.tsx b/packages/insomnia/src/ui/components/modals/add-request-to-collection-modal.tsx index 60104adb82..2d6277d286 100644 --- a/packages/insomnia/src/ui/components/modals/add-request-to-collection-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/add-request-to-collection-modal.tsx @@ -1,9 +1,9 @@ +import { type BaseModel, models, type Project, services } from 'insomnia-data'; +import { strings } from 'insomnia-data/common'; import React, { type FC, type MouseEventHandler, useEffect, useRef, useState } from 'react'; import { OverlayContainer } from 'react-aria'; import { useParams } from 'react-router'; -import { type BaseModel, models, type Project, services } from '~/insomnia-data'; -import { strings } from '~/insomnia-data/common'; import { useRequestNewActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.new'; import { database } from '../../../common/database'; diff --git a/packages/insomnia/src/ui/components/modals/cloud-credential-modal/aws-credential-form.tsx b/packages/insomnia/src/ui/components/modals/cloud-credential-modal/aws-credential-form.tsx index b1af2f68ce..39a34a26d8 100644 --- a/packages/insomnia/src/ui/components/modals/cloud-credential-modal/aws-credential-form.tsx +++ b/packages/insomnia/src/ui/components/modals/cloud-credential-modal/aws-credential-form.tsx @@ -1,14 +1,13 @@ -import React, { useState } from 'react'; -import { Button, Input, Label, TextField } from 'react-aria-components'; - -import type { AWSCredentialType } from '~/insomnia-data'; +import type { AWSCredentialType } from 'insomnia-data'; import { type AWSFileCredential, type AWSTemporaryCredential, type CloudProviderCredential, type CloudProviderName, models, -} from '~/insomnia-data'; +} from 'insomnia-data'; +import React, { useState } from 'react'; +import { Button, Input, Label, TextField } from 'react-aria-components'; import { HelpTooltip } from '../../help-tooltip'; import { Icon } from '../../icon'; diff --git a/packages/insomnia/src/ui/components/modals/cloud-credential-modal/cloud-credential-modal.tsx b/packages/insomnia/src/ui/components/modals/cloud-credential-modal/cloud-credential-modal.tsx index ca88cd9359..f3ba8716b0 100644 --- a/packages/insomnia/src/ui/components/modals/cloud-credential-modal/cloud-credential-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/cloud-credential-modal/cloud-credential-modal.tsx @@ -1,7 +1,7 @@ +import { type CloudProviderCredential,models } from 'insomnia-data'; import React, { useEffect, useState } from 'react'; import { Button, Dialog, Heading, Modal, ModalOverlay } from 'react-aria-components'; -import { type CloudProviderCredential,models } from '~/insomnia-data'; import { useUpdateCloudCredentialActionFetcher } from '~/routes/cloud-credentials.$cloudCredentialId.update'; import { useCreateCloudCredentialActionFetcher } from '~/routes/cloud-credentials.create'; diff --git a/packages/insomnia/src/ui/components/modals/cloud-credential-modal/gcp-credential-form.tsx b/packages/insomnia/src/ui/components/modals/cloud-credential-modal/gcp-credential-form.tsx index 239ae0749d..b22153c454 100644 --- a/packages/insomnia/src/ui/components/modals/cloud-credential-modal/gcp-credential-form.tsx +++ b/packages/insomnia/src/ui/components/modals/cloud-credential-modal/gcp-credential-form.tsx @@ -1,8 +1,7 @@ +import { type CloudProviderCredential, type CloudProviderName } from 'insomnia-data'; import React, { useState } from 'react'; import { Button, Input, Label, TextField } from 'react-aria-components'; -import { type CloudProviderCredential, type CloudProviderName } from '~/insomnia-data'; - import { HelpTooltip } from '../../help-tooltip'; import { Icon } from '../../icon'; diff --git a/packages/insomnia/src/ui/components/modals/cloud-credential-modal/hashicorp-credential-form.tsx b/packages/insomnia/src/ui/components/modals/cloud-credential-modal/hashicorp-credential-form.tsx index 7d0829039a..86ba9ae111 100644 --- a/packages/insomnia/src/ui/components/modals/cloud-credential-modal/hashicorp-credential-form.tsx +++ b/packages/insomnia/src/ui/components/modals/cloud-credential-modal/hashicorp-credential-form.tsx @@ -1,6 +1,3 @@ -import React, { useState } from 'react'; -import { Button, Input, Label, TextField } from 'react-aria-components'; - import { type CloudProviderCredential, type CloudProviderName, @@ -12,7 +9,9 @@ import { models, type VaultAppRoleCredential, type VaultTokenCredential, -} from '~/insomnia-data'; +} from 'insomnia-data'; +import React, { useState } from 'react'; +import { Button, Input, Label, TextField } from 'react-aria-components'; import { HelpTooltip } from '../../help-tooltip'; import { Icon } from '../../icon'; diff --git a/packages/insomnia/src/ui/components/modals/cookies-modal.tsx b/packages/insomnia/src/ui/components/modals/cookies-modal.tsx index 30ccf8d1c1..6d7eacde9b 100644 --- a/packages/insomnia/src/ui/components/modals/cookies-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/cookies-modal.tsx @@ -1,5 +1,6 @@ import clone from 'clone'; import { isValid } from 'date-fns'; +import { type Cookie, type CookieJar } from 'insomnia-data'; import React, { useState } from 'react'; import { Button, @@ -21,7 +22,6 @@ import { useParams } from 'react-router'; import { Cookie as ToughCookie } from 'tough-cookie'; import { v4 as uuidv4 } from 'uuid'; -import { type Cookie, type CookieJar } from '~/insomnia-data'; import { useUpdateCookieJarActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.update-cookie-jar'; import { OneLineEditor } from '~/ui/components/.client/codemirror/one-line-editor'; diff --git a/packages/insomnia/src/ui/components/modals/export-requests-modal.tsx b/packages/insomnia/src/ui/components/modals/export-requests-modal.tsx index 0a5d8f2979..54c90c6cef 100644 --- a/packages/insomnia/src/ui/components/modals/export-requests-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/export-requests-modal.tsx @@ -1,10 +1,9 @@ import { exportRequestsToFile } from 'insomnia/src/ui/components/settings/import-export'; +import { type GrpcRequest, models, type Request, type RequestGroup, type SocketIORequest, type WebSocketRequest } from 'insomnia-data'; import React, { type FC, type ReactNode, useEffect, useState } from 'react'; import { Button, Checkbox, Dialog, Heading, Modal, ModalOverlay } from 'react-aria-components'; import { useParams } from 'react-router'; -import { type GrpcRequest, models, type Request, type RequestGroup, type SocketIORequest, type WebSocketRequest } from '~/insomnia-data'; - import { type Child, useWorkspaceLoaderFetcher, diff --git a/packages/insomnia/src/ui/components/modals/generate-code-modal.tsx b/packages/insomnia/src/ui/components/modals/generate-code-modal.tsx index 35ea29af21..9e68787a65 100644 --- a/packages/insomnia/src/ui/components/modals/generate-code-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/generate-code-modal.tsx @@ -1,8 +1,8 @@ import type { HTTPSnippetClient, HTTPSnippetTarget } from 'httpsnippet'; +import { type Request } from 'insomnia-data'; import { forwardRef, useCallback, useImperativeHandle, useRef, useState } from 'react'; import { Button } from 'react-aria-components'; -import { type Request } from '~/insomnia-data'; import { SegmentEvent } from '~/ui/analytics'; import { CodeEditor, type CodeEditorHandle } from '~/ui/components/.client/codemirror/code-editor'; diff --git a/packages/insomnia/src/ui/components/modals/git-project-migration-modal.tsx b/packages/insomnia/src/ui/components/modals/git-project-migration-modal.tsx index 95f36e95d5..4f76a04d84 100644 --- a/packages/insomnia/src/ui/components/modals/git-project-migration-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/git-project-migration-modal.tsx @@ -1,3 +1,4 @@ +import { type WorkspaceScope } from 'insomnia-data'; import React, { type FC } from 'react'; import { Button, @@ -14,7 +15,6 @@ import { } from 'react-aria-components'; import { useParams } from 'react-router'; -import { type WorkspaceScope } from '~/insomnia-data'; import { useGitProjectMigrateLegacyInsomniaFolderActionFetcher } from '~/routes/git.migrate-legacy-insomnia-folder-to-file'; import { diff --git a/packages/insomnia/src/ui/components/modals/git-repository-settings-modal/git-repository-settings-modal.tsx b/packages/insomnia/src/ui/components/modals/git-repository-settings-modal/git-repository-settings-modal.tsx index ce7a99b5ee..f7a41fd3b1 100644 --- a/packages/insomnia/src/ui/components/modals/git-repository-settings-modal/git-repository-settings-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/git-repository-settings-modal/git-repository-settings-modal.tsx @@ -1,8 +1,8 @@ +import { type GitRepository } from 'insomnia-data'; import { useEffect, useRef } from 'react'; import { OverlayContainer } from 'react-aria'; import { useParams } from 'react-router'; -import { type GitRepository } from '~/insomnia-data'; import { useGitProjectResetActionFetcher } from '~/routes/git.reset'; import { GitConnectionInfo } from '~/ui/components/git/connection-info'; import { useGitCredentials } from '~/ui/hooks/use-git-credentials'; diff --git a/packages/insomnia/src/ui/components/modals/import-modal/import-modal.tsx b/packages/insomnia/src/ui/components/modals/import-modal/import-modal.tsx index d869eef87f..9393ff4091 100644 --- a/packages/insomnia/src/ui/components/modals/import-modal/import-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/import-modal/import-modal.tsx @@ -1,12 +1,12 @@ import classNames from 'classnames'; import { formatDistanceToNowStrict } from 'date-fns'; +import { models } from 'insomnia-data'; import React, { type FC, Fragment, type ReactNode, useEffect, useId, useMemo, useRef, useState } from 'react'; import { type DirectoryDropItem, type FileDropItem, OverlayContainer, useDrop } from 'react-aria'; import { Heading, Link } from 'react-aria-components'; import { useNavigate, useParams } from 'react-router'; import { isNotNullOrUndefined } from '~/common/misc'; -import { models } from '~/insomnia-data'; import { useImportResourcesFetcher } from '~/routes/import.resources'; import { useScanResourcesFetcher } from '~/routes/import.scan'; import { useProjectListWorkspacesLoaderFetcher } from '~/routes/organization.$organizationId.project.$projectId.list-workspaces'; diff --git a/packages/insomnia/src/ui/components/modals/import-modal/import-projects-modal.tsx b/packages/insomnia/src/ui/components/modals/import-modal/import-projects-modal.tsx index 092a82ae34..b0895cf843 100644 --- a/packages/insomnia/src/ui/components/modals/import-modal/import-projects-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/import-modal/import-projects-modal.tsx @@ -1,4 +1,5 @@ import classnames from 'classnames'; +import { models, type Project } from 'insomnia-data'; import React, { useEffect, useMemo, useRef, useState } from 'react'; import { type DirectoryDropItem, type FileDropItem, OverlayContainer, useDrop } from 'react-aria'; import { Label, ProgressBar } from 'react-aria-components'; @@ -8,7 +9,6 @@ import * as reactUse from 'react-use'; import { database } from '~/common/database'; import type { ScanResult } from '~/common/import'; import { selectFileOrFolder } from '~/common/select-file-or-folder'; -import { models, type Project } from '~/insomnia-data'; import { importScannedResources } from '~/routes/import.resources'; import { scanImportResources } from '~/routes/import.scan'; import { useOrganizationLoaderData } from '~/routes/organization'; diff --git a/packages/insomnia/src/ui/components/modals/input-vault-key-modal.tsx b/packages/insomnia/src/ui/components/modals/input-vault-key-modal.tsx index 870611a51f..cf2ce58f51 100644 --- a/packages/insomnia/src/ui/components/modals/input-vault-key-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/input-vault-key-modal.tsx @@ -1,7 +1,7 @@ +import { services } from 'insomnia-data'; import React, { useEffect, useState } from 'react'; import { Button, Dialog, Heading, Input, Modal, ModalOverlay } from 'react-aria-components'; -import { services } from '~/insomnia-data'; import { useRootLoaderData } from '~/root'; import { useResetVaultKeyFetcher } from '~/routes/auth.reset-vault-key'; import { useValidateVaultKeyActionFetcher } from '~/routes/auth.validate-vault-key'; diff --git a/packages/insomnia/src/ui/components/modals/invite-modal/invite-form.tsx b/packages/insomnia/src/ui/components/modals/invite-modal/invite-form.tsx index 73340b0dc1..4bf9ea2faf 100644 --- a/packages/insomnia/src/ui/components/modals/invite-modal/invite-form.tsx +++ b/packages/insomnia/src/ui/components/modals/invite-modal/invite-form.tsx @@ -1,5 +1,6 @@ import classNames from 'classnames'; import { checkSeats, type CheckSeatsResponse, needsToIncreaseSeats, needsToUpgrade, type Role } from 'insomnia-api'; +import { models } from 'insomnia-data'; import React, { useEffect, useMemo, useRef, useState } from 'react'; import { Button, @@ -17,7 +18,6 @@ import { useParams, useSearchParams } from 'react-router'; import { getAppWebsiteBaseURL } from '~/common/constants'; import { docsPricingLearnMoreLink } from '~/common/documentation'; import { debounce } from '~/common/misc'; -import { models } from '~/insomnia-data'; import { useRootLoaderData } from '~/root'; import { useOrganizationLoaderData } from '~/routes/organization'; import { useCollaboratorsSearchLoaderFetcher } from '~/routes/organization.$organizationId.collaborators-search'; diff --git a/packages/insomnia/src/ui/components/modals/mock-route-modal.tsx b/packages/insomnia/src/ui/components/modals/mock-route-modal.tsx index fdae0f5fcb..541ce8fb5c 100644 --- a/packages/insomnia/src/ui/components/modals/mock-route-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/mock-route-modal.tsx @@ -1,3 +1,4 @@ +import { type ResponseHeader } from 'insomnia-data'; import React from 'react'; import { Button, @@ -13,7 +14,6 @@ import { } from 'react-aria-components'; import { useParams } from 'react-router'; -import { type ResponseHeader } from '~/insomnia-data'; import { useMockRouteUpdateActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId.update'; import { useMockRouteNewActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.new'; diff --git a/packages/insomnia/src/ui/components/modals/new-workspace-modal.tsx b/packages/insomnia/src/ui/components/modals/new-workspace-modal.tsx index fd6cbca432..4e37788d02 100644 --- a/packages/insomnia/src/ui/components/modals/new-workspace-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/new-workspace-modal.tsx @@ -1,4 +1,5 @@ import type { StorageRules } from 'insomnia-api'; +import { type ApiSpec, models, type Project, type WorkspaceScope } from 'insomnia-data'; import React, { useEffect, useState } from 'react'; import { Button, @@ -21,7 +22,6 @@ import { } from 'react-aria-components'; import { useParams } from 'react-router'; -import { type ApiSpec, models, type Project, type WorkspaceScope } from '~/insomnia-data'; import { useGitProjectRepositoryTreeLoaderFetcher } from '~/routes/git.repository-tree'; import { useWorkspaceNewActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.new'; import { Badge } from '~/ui/components/base/badge'; diff --git a/packages/insomnia/src/ui/components/modals/nunjucks-modal.tsx b/packages/insomnia/src/ui/components/modals/nunjucks-modal.tsx index 9cf9af4aeb..dfb4ec2bdb 100644 --- a/packages/insomnia/src/ui/components/modals/nunjucks-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/nunjucks-modal.tsx @@ -1,7 +1,6 @@ +import { type Workspace } from 'insomnia-data'; import React, { forwardRef, useImperativeHandle, useRef, useState } from 'react'; -import { type Workspace } from '~/insomnia-data'; - import { Modal, type ModalHandle, type ModalProps } from '../base/modal'; import { ModalBody } from '../base/modal-body'; import { ModalFooter } from '../base/modal-footer'; diff --git a/packages/insomnia/src/ui/components/modals/paste-curl-modal.tsx b/packages/insomnia/src/ui/components/modals/paste-curl-modal.tsx index 8f1fc89dcc..5b1d2ef173 100644 --- a/packages/insomnia/src/ui/components/modals/paste-curl-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/paste-curl-modal.tsx @@ -1,7 +1,7 @@ +import { type Request } from 'insomnia-data'; import React, { useEffect, useRef, useState } from 'react'; import { OverlayContainer } from 'react-aria'; -import { type Request } from '~/insomnia-data'; import { CodeEditor } from '~/ui/components/.client/codemirror/code-editor'; import { Modal, type ModalHandle, type ModalProps } from '../base/modal'; diff --git a/packages/insomnia/src/ui/components/modals/project-modal.tsx b/packages/insomnia/src/ui/components/modals/project-modal.tsx index 2b44028db1..f4aefb13c9 100644 --- a/packages/insomnia/src/ui/components/modals/project-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/project-modal.tsx @@ -1,9 +1,9 @@ import type { StorageRules } from 'insomnia-api'; +import { type GitRepository, type Project } from 'insomnia-data'; import React, { useEffect } from 'react'; import { Button, Dialog, Heading, Modal, ModalOverlay } from 'react-aria-components'; import { useNavigation } from 'react-router'; -import { type GitRepository, type Project } from '~/insomnia-data'; import { useActiveView } from '~/ui/components/project/utils'; import { useGitCredentials } from '~/ui/hooks/use-git-credentials'; diff --git a/packages/insomnia/src/ui/components/modals/proto-files-modal.tsx b/packages/insomnia/src/ui/components/modals/proto-files-modal.tsx index 7f335b225e..c280094244 100644 --- a/packages/insomnia/src/ui/components/modals/proto-files-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/proto-files-modal.tsx @@ -1,9 +1,8 @@ import * as protoLoader from '@grpc/proto-loader'; +import { models, type ProtoDirectory, type ProtoFile,services } from 'insomnia-data'; import React, { type FC, useEffect, useRef, useState } from 'react'; import { useParams } from 'react-router'; -import { models, type ProtoDirectory, type ProtoFile,services } from '~/insomnia-data'; - import { type ChangeBufferEvent, database as db } from '../../../common/database'; import { selectFileOrFolder } from '../../../common/select-file-or-folder'; import { ProtoDirectoryLoader } from '../../../network/grpc/proto-directory-loader'; diff --git a/packages/insomnia/src/ui/components/modals/request-group-settings-modal.tsx b/packages/insomnia/src/ui/components/modals/request-group-settings-modal.tsx index afe6e91d9d..80d03f98b1 100644 --- a/packages/insomnia/src/ui/components/modals/request-group-settings-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/request-group-settings-modal.tsx @@ -1,8 +1,8 @@ +import { type RequestGroup } from 'insomnia-data'; import React, { useEffect, useRef, useState } from 'react'; import { OverlayContainer } from 'react-aria'; import { useNavigate, useParams } from 'react-router'; -import { type RequestGroup } from '~/insomnia-data'; import { useProjectListWorkspacesLoaderFetcher } from '~/routes/organization.$organizationId.project.$projectId.list-workspaces'; import { useRequestGroupDuplicateActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.duplicate'; diff --git a/packages/insomnia/src/ui/components/modals/request-render-error-modal.tsx b/packages/insomnia/src/ui/components/modals/request-render-error-modal.tsx index 3bc07b483d..648cf2b192 100644 --- a/packages/insomnia/src/ui/components/modals/request-render-error-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/request-render-error-modal.tsx @@ -1,9 +1,8 @@ +import type { McpRequest } from 'insomnia-data'; +import { type GrpcRequest, type Request, type SocketIORequest, type WebSocketRequest } from 'insomnia-data'; import { JSONPath } from 'jsonpath-plus'; import React, { forwardRef, useImperativeHandle, useRef, useState } from 'react'; -import type { McpRequest } from '~/insomnia-data'; -import { type GrpcRequest, type Request, type SocketIORequest, type WebSocketRequest } from '~/insomnia-data'; - import { docsTemplateTags } from '../../../common/documentation'; import type { RenderError } from '../../../templating/render-error'; import { Link } from '../base/link'; diff --git a/packages/insomnia/src/ui/components/modals/request-settings-modal.tsx b/packages/insomnia/src/ui/components/modals/request-settings-modal.tsx index 263c6cf3ee..df2b2c1ab1 100644 --- a/packages/insomnia/src/ui/components/modals/request-settings-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/request-settings-modal.tsx @@ -1,8 +1,4 @@ -import React, { useEffect, useRef, useState } from 'react'; -import { OverlayContainer } from 'react-aria'; -import { useNavigate, useParams } from 'react-router'; - -import type { McpRequest } from '~/insomnia-data'; +import type { McpRequest } from 'insomnia-data'; import { type GrpcRequest, models, @@ -10,7 +6,11 @@ import { services, type SocketIORequest, type WebSocketRequest, -} from '~/insomnia-data'; +} from 'insomnia-data'; +import React, { useEffect, useRef, useState } from 'react'; +import { OverlayContainer } from 'react-aria'; +import { useNavigate, useParams } from 'react-router'; + import { useProjectListWorkspacesLoaderFetcher } from '~/routes/organization.$organizationId.project.$projectId.list-workspaces'; import { useRequestDuplicateActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.duplicate'; import { useReadyState } from '~/ui/hooks/use-ready-state'; diff --git a/packages/insomnia/src/ui/components/modals/response-debug-modal.tsx b/packages/insomnia/src/ui/components/modals/response-debug-modal.tsx index 73cec9eaa3..2e031a0cc4 100644 --- a/packages/insomnia/src/ui/components/modals/response-debug-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/response-debug-modal.tsx @@ -1,7 +1,6 @@ +import { type Response, type ResponseTimelineEntry, services } from 'insomnia-data'; import React, { forwardRef, useImperativeHandle, useRef, useState } from 'react'; -import { type Response, type ResponseTimelineEntry, services } from '~/insomnia-data'; - import { ResponseTimelineViewer } from '../../components/viewers/response-timeline-viewer'; import { Modal, type ModalHandle, type ModalProps } from '../base/modal'; import { ModalBody } from '../base/modal-body'; diff --git a/packages/insomnia/src/ui/components/modals/sync-delete-modal.tsx b/packages/insomnia/src/ui/components/modals/sync-delete-modal.tsx index 28be875455..57720fd356 100644 --- a/packages/insomnia/src/ui/components/modals/sync-delete-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/sync-delete-modal.tsx @@ -1,8 +1,7 @@ +import { strings } from 'insomnia-data/common'; import React, { useEffect, useRef, useState } from 'react'; import { OverlayContainer } from 'react-aria'; -import { strings } from '~/insomnia-data/common'; - import { useWorkspaceLoaderData } from '../../../routes/organization.$organizationId.project.$projectId.workspace.$workspaceId'; import { interceptAccessError } from '../../../sync/vcs/util'; import type { VCS } from '../../../sync/vcs/vcs'; diff --git a/packages/insomnia/src/ui/components/modals/sync-staging-modal.tsx b/packages/insomnia/src/ui/components/modals/sync-staging-modal.tsx index c91f234359..60f88144f6 100644 --- a/packages/insomnia/src/ui/components/modals/sync-staging-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/sync-staging-modal.tsx @@ -1,3 +1,4 @@ +import { models } from 'insomnia-data'; import React, { useEffect, useState } from 'react'; import { Button, @@ -16,7 +17,6 @@ import { import { useParams } from 'react-router'; import { stringify } from 'yaml'; -import { models } from '~/insomnia-data'; import { useInsomniaSyncCreateSnapshotActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.create-snapshot'; import { useInsomniaSyncStageActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.stage'; import { useInsomniaSyncUnstageActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.unstage'; diff --git a/packages/insomnia/src/ui/components/modals/workspace-certificates-modal.tsx b/packages/insomnia/src/ui/components/modals/workspace-certificates-modal.tsx index 0a3ae1f1da..8bd771dc2a 100644 --- a/packages/insomnia/src/ui/components/modals/workspace-certificates-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/workspace-certificates-modal.tsx @@ -1,3 +1,5 @@ +import type { CaCertificate } from 'insomnia-data'; +import { type ClientCertificate } from 'insomnia-data'; import React, { Fragment, type ReactNode, useEffect, useId, useState } from 'react'; import { Button, @@ -18,8 +20,6 @@ import { } from 'react-aria-components'; import { useParams } from 'react-router'; -import type { CaCertificate } from '~/insomnia-data'; -import { type ClientCertificate } from '~/insomnia-data'; import { useCaCertDeleteActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.cacert.delete'; import { useCACertNewActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.cacert.new'; import { useCACertUpdateActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.cacert.update'; diff --git a/packages/insomnia/src/ui/components/modals/workspace-duplicate-modal.tsx b/packages/insomnia/src/ui/components/modals/workspace-duplicate-modal.tsx index 2c1597493b..9e5c191f0e 100644 --- a/packages/insomnia/src/ui/components/modals/workspace-duplicate-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/workspace-duplicate-modal.tsx @@ -1,9 +1,9 @@ +import { type BaseModel, models, type Project, type Workspace } from 'insomnia-data'; +import { strings } from 'insomnia-data/common'; import React, { type FC, type MouseEventHandler, useEffect, useRef, useState } from 'react'; import { OverlayContainer } from 'react-aria'; import { href, useParams } from 'react-router'; -import { type BaseModel, models, type Project, type Workspace } from '~/insomnia-data'; -import { strings } from '~/insomnia-data/common'; import { useOrganizationLoaderData } from '~/routes/organization'; import { useWorkspaceMoveActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.move'; diff --git a/packages/insomnia/src/ui/components/modals/workspace-environments-edit-modal.tsx b/packages/insomnia/src/ui/components/modals/workspace-environments-edit-modal.tsx index 0712ec194c..195aeead9b 100644 --- a/packages/insomnia/src/ui/components/modals/workspace-environments-edit-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/workspace-environments-edit-modal.tsx @@ -1,4 +1,5 @@ import type { IconName, IconProp } from '@fortawesome/fontawesome-svg-core'; +import { type Environment, type EnvironmentKvPairData, type EnvironmentType, models } from 'insomnia-data'; import React, { Fragment, useMemo, useRef, useState } from 'react'; import { Button, @@ -20,7 +21,6 @@ import { } from 'react-aria-components'; import { useParams } from 'react-router'; -import { type Environment, type EnvironmentKvPairData, type EnvironmentType, models } from '~/insomnia-data'; import { useEnvironmentCreateActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.create'; import { useEnvironmentDeleteActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.delete'; import { useEnvironmentDuplicateActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.duplicate'; diff --git a/packages/insomnia/src/ui/components/modals/workspace-settings-modal.tsx b/packages/insomnia/src/ui/components/modals/workspace-settings-modal.tsx index 5fe2130802..ca819513d9 100644 --- a/packages/insomnia/src/ui/components/modals/workspace-settings-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/workspace-settings-modal.tsx @@ -1,4 +1,5 @@ import type { StorageRules } from 'insomnia-api'; +import { type MockServer, models, type Project, services, type Workspace } from 'insomnia-data'; import { useEffect, useState } from 'react'; import { Button, @@ -16,7 +17,6 @@ import { } from 'react-aria-components'; import { useParams } from 'react-router'; -import { type MockServer, models, type Project, services, type Workspace } from '~/insomnia-data'; import { useGitProjectRepositoryTreeLoaderFetcher } from '~/routes/git.repository-tree'; import { useOrganizationLoaderData } from '~/routes/organization'; import { useWorkspaceUpdateActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.update'; diff --git a/packages/insomnia/src/ui/components/panes/grpc-request-pane.tsx b/packages/insomnia/src/ui/components/panes/grpc-request-pane.tsx index 5db70a8a89..d4e7df96c5 100644 --- a/packages/insomnia/src/ui/components/panes/grpc-request-pane.tsx +++ b/packages/insomnia/src/ui/components/panes/grpc-request-pane.tsx @@ -1,10 +1,10 @@ +import { models,services } from 'insomnia-data'; +import { type GrpcRequest, type GrpcRequestHeader, type RequestGroup } from 'insomnia-data'; import React, { type FunctionComponent, useRef, useState } from 'react'; import { Tab, TabList, TabPanel, Tabs } from 'react-aria-components'; import { useParams } from 'react-router'; import * as reactUse from 'react-use'; -import { models,services } from '~/insomnia-data'; -import { type GrpcRequest, type GrpcRequestHeader, type RequestGroup } from '~/insomnia-data'; import { useRootLoaderData } from '~/root'; import { CodeEditor, type CodeEditorHandle } from '~/ui/components/.client/codemirror/code-editor'; import { OneLineEditor } from '~/ui/components/.client/codemirror/one-line-editor'; diff --git a/packages/insomnia/src/ui/components/panes/placeholder-response-pane.tsx b/packages/insomnia/src/ui/components/panes/placeholder-response-pane.tsx index 3181cbc219..67091c57ea 100644 --- a/packages/insomnia/src/ui/components/panes/placeholder-response-pane.tsx +++ b/packages/insomnia/src/ui/components/panes/placeholder-response-pane.tsx @@ -1,6 +1,6 @@ +import { type KeyboardShortcut, keyboardShortcutDescriptions } from 'insomnia-data/common'; import React, { type FC, type PropsWithChildren } from 'react'; -import { type KeyboardShortcut, keyboardShortcutDescriptions } from '~/insomnia-data/common'; import { useRootLoaderData } from '~/root'; import { Hotkey } from '../hotkey'; diff --git a/packages/insomnia/src/ui/components/panes/request-group-pane.tsx b/packages/insomnia/src/ui/components/panes/request-group-pane.tsx index da9fdc8b34..80f5c47a45 100644 --- a/packages/insomnia/src/ui/components/panes/request-group-pane.tsx +++ b/packages/insomnia/src/ui/components/panes/request-group-pane.tsx @@ -1,7 +1,7 @@ +import { type EnvironmentKvPairData, type EnvironmentType, models, type Settings } from 'insomnia-data'; import React, { type FC, useRef, useState } from 'react'; import { Heading, Tab, TabList, TabPanel, Tabs, ToggleButton } from 'react-aria-components'; -import { type EnvironmentKvPairData, type EnvironmentType, models, type Settings } from '~/insomnia-data'; import { useToggleEnvironmentType } from '~/ui/hooks/use-toggle-environment-type'; import { getDataFromKVPair } from '~/utils/environment-utils'; diff --git a/packages/insomnia/src/ui/components/panes/request-pane.tsx b/packages/insomnia/src/ui/components/panes/request-pane.tsx index f2445402de..5815fd7b48 100644 --- a/packages/insomnia/src/ui/components/panes/request-pane.tsx +++ b/packages/insomnia/src/ui/components/panes/request-pane.tsx @@ -1,12 +1,12 @@ +import type { Settings } from 'insomnia-data'; +import { models, type RequestParameter, services } from 'insomnia-data'; +import { deconstructQueryStringToParams, getContentTypeFromHeaders } from 'insomnia-data/common'; import React, { type FC, Fragment, useRef, useState } from 'react'; import { Button, Heading, Tab, TabList, TabPanel, Tabs, ToggleButton } from 'react-aria-components'; import { Panel, PanelGroup, PanelResizeHandle } from 'react-resizable-panels'; import { useParams } from 'react-router'; import * as reactUse from 'react-use'; -import type { Settings } from '~/insomnia-data'; -import { models, type RequestParameter, services } from '~/insomnia-data'; -import { deconstructQueryStringToParams, getContentTypeFromHeaders } from '~/insomnia-data/common'; import { OneLineEditor } from '~/ui/components/.client/codemirror/one-line-editor'; import { getAuthObjectOrNull } from '../../../network/authentication'; diff --git a/packages/insomnia/src/ui/components/panes/request-test-result-pane.tsx b/packages/insomnia/src/ui/components/panes/request-test-result-pane.tsx index 6fce15910d..a627545ebc 100644 --- a/packages/insomnia/src/ui/components/panes/request-test-result-pane.tsx +++ b/packages/insomnia/src/ui/components/panes/request-test-result-pane.tsx @@ -1,8 +1,7 @@ +import type { RequestTestResult } from 'insomnia-data'; import React, { type FC, useState } from 'react'; import { Toolbar } from 'react-aria-components'; -import type { RequestTestResult } from '~/insomnia-data'; - import { fuzzyMatch } from '../../../common/misc'; type TargetTestType = 'all' | 'passed' | 'failed' | 'skipped'; diff --git a/packages/insomnia/src/ui/components/panes/response-pane.tsx b/packages/insomnia/src/ui/components/panes/response-pane.tsx index 5ddc86589e..0d09c05ec0 100644 --- a/packages/insomnia/src/ui/components/panes/response-pane.tsx +++ b/packages/insomnia/src/ui/components/panes/response-pane.tsx @@ -1,8 +1,8 @@ +import { type ResponseTimelineEntry, services } from 'insomnia-data'; +import { PREVIEW_MODE_SOURCE } from 'insomnia-data/common'; import { type FC, useCallback, useEffect, useMemo, useState } from 'react'; import { Tab, TabList, TabPanel, Tabs, Toolbar } from 'react-aria-components'; -import { type ResponseTimelineEntry, services } from '~/insomnia-data'; -import { PREVIEW_MODE_SOURCE } from '~/insomnia-data/common'; import { useRootLoaderData } from '~/root'; import { SegmentEvent } from '~/ui/analytics'; diff --git a/packages/insomnia/src/ui/components/panes/runner-result-history-pane.tsx b/packages/insomnia/src/ui/components/panes/runner-result-history-pane.tsx index 131b6bcf83..81b82aecfb 100644 --- a/packages/insomnia/src/ui/components/panes/runner-result-history-pane.tsx +++ b/packages/insomnia/src/ui/components/panes/runner-result-history-pane.tsx @@ -1,4 +1,5 @@ import { format } from 'date-fns'; +import { type RunnerTestResult } from 'insomnia-data'; import React, { type FC } from 'react'; import { Cell, @@ -12,8 +13,6 @@ import { TooltipTrigger, } from 'react-aria-components'; -import { type RunnerTestResult } from '~/insomnia-data'; - import { PromptButton } from '../base/prompt-button'; import { Icon } from '../icon'; import { getTimeAndUnit } from '../tags/time-tag'; diff --git a/packages/insomnia/src/ui/components/panes/runner-test-result-pane.tsx b/packages/insomnia/src/ui/components/panes/runner-test-result-pane.tsx index 4472cf2ebe..897dc86c66 100644 --- a/packages/insomnia/src/ui/components/panes/runner-test-result-pane.tsx +++ b/packages/insomnia/src/ui/components/panes/runner-test-result-pane.tsx @@ -1,8 +1,7 @@ +import { type BaseRunnerTestResult, type RunnerResultPerRequest } from 'insomnia-data'; import React, { type FC, useState } from 'react'; import { Toolbar } from 'react-aria-components'; -import { type BaseRunnerTestResult, type RunnerResultPerRequest } from '~/insomnia-data'; - import { RequestTestResultRows } from './request-test-result-pane'; type TargetTestType = 'all' | 'passed' | 'failed' | 'skipped'; diff --git a/packages/insomnia/src/ui/components/project/git-repo-form.tsx b/packages/insomnia/src/ui/components/project/git-repo-form.tsx index 76be69d9e4..4c63ac8be9 100644 --- a/packages/insomnia/src/ui/components/project/git-repo-form.tsx +++ b/packages/insomnia/src/ui/components/project/git-repo-form.tsx @@ -1,3 +1,4 @@ +import { type GitCredentials,models } from 'insomnia-data'; import { type FC, Fragment, useEffect, useState } from 'react'; import { Button, @@ -12,7 +13,6 @@ import { } from 'react-aria-components'; import { Icon } from '~/basic-components/icon'; -import { type GitCredentials,models } from '~/insomnia-data'; import { useAllConnectedReposLoaderFetcher } from '~/routes/git.all-connected-repos'; import type { useGitProjectInitCloneActionFetcher } from '~/routes/git.init-clone'; import type { GitProviderOption, ProviderEmail } from '~/sync/git/providers/types'; diff --git a/packages/insomnia/src/ui/components/project/project-create-form.tsx b/packages/insomnia/src/ui/components/project/project-create-form.tsx index 65a06b27eb..74af360aa1 100644 --- a/packages/insomnia/src/ui/components/project/project-create-form.tsx +++ b/packages/insomnia/src/ui/components/project/project-create-form.tsx @@ -1,10 +1,10 @@ import type { StorageRules } from 'insomnia-api'; +import { type GitCredentials } from 'insomnia-data'; import type { FC } from 'react'; import React, { useEffect, useState } from 'react'; import { Button, Input, Label, TextField } from 'react-aria-components'; import { useParams } from 'react-router'; -import { type GitCredentials } from '~/insomnia-data'; import { useGitProjectInitCloneActionFetcher } from '~/routes/git.init-clone'; import { useProjectNewActionFetcher } from '~/routes/organization.$organizationId.project.new'; import type { GitProviderOption } from '~/sync/git/providers/types'; diff --git a/packages/insomnia/src/ui/components/project/project-list-sidebar.tsx b/packages/insomnia/src/ui/components/project/project-list-sidebar.tsx index 6c72310fe3..2db5df1cbf 100644 --- a/packages/insomnia/src/ui/components/project/project-list-sidebar.tsx +++ b/packages/insomnia/src/ui/components/project/project-list-sidebar.tsx @@ -1,9 +1,9 @@ import type { StorageRules } from 'insomnia-api'; +import { type GitRepository, models, type Project } from 'insomnia-data'; import { Button, GridList, GridListItem, Heading, Input, SearchField } from 'react-aria-components'; import { useNavigate } from 'react-router'; import * as reactUse from 'react-use'; -import { type GitRepository, models, type Project } from '~/insomnia-data'; import { SegmentEvent } from '~/ui/analytics'; import { AvatarGroup } from '../avatar'; diff --git a/packages/insomnia/src/ui/components/project/project-settings-form.tsx b/packages/insomnia/src/ui/components/project/project-settings-form.tsx index a4f8ba563f..80ff5ef65e 100644 --- a/packages/insomnia/src/ui/components/project/project-settings-form.tsx +++ b/packages/insomnia/src/ui/components/project/project-settings-form.tsx @@ -1,4 +1,5 @@ import type { StorageRules } from 'insomnia-api'; +import { type GitCredentials, type GitRepository, models, type Project, type ProviderEmail } from 'insomnia-data'; import type { FC } from 'react'; import { Fragment, useEffect, useMemo, useState } from 'react'; import { @@ -17,7 +18,6 @@ import { useParams } from 'react-router'; import { Banner } from '~/basic-components/banner'; import { Divider } from '~/basic-components/divider'; import { LearnMoreLink } from '~/basic-components/link'; -import { type GitCredentials, type GitRepository, models, type Project, type ProviderEmail } from '~/insomnia-data'; import { useGitProjectInitCloneActionFetcher } from '~/routes/git.init-clone'; import { useGitProjectRepoFetcher } from '~/routes/git.repo'; import { useGitProviderEmailsLoaderFetcher } from '~/routes/git-provider.emails'; diff --git a/packages/insomnia/src/ui/components/project/project-type-warning.tsx b/packages/insomnia/src/ui/components/project/project-type-warning.tsx index bb62eb5517..8cf3aa92aa 100644 --- a/packages/insomnia/src/ui/components/project/project-type-warning.tsx +++ b/packages/insomnia/src/ui/components/project/project-type-warning.tsx @@ -1,4 +1,5 @@ import type { StorageRules } from 'insomnia-api'; +import { models } from 'insomnia-data'; import { useParams } from 'react-router'; import { Banner } from '~/basic-components/banner'; @@ -6,7 +7,6 @@ import { Button } from '~/basic-components/button'; import { LearnMoreLink } from '~/basic-components/link'; import { getAppWebsiteBaseURL } from '~/common/constants'; import { docsPricingLearnMoreLink } from '~/common/documentation'; -import { models } from '~/insomnia-data'; import { useRootLoaderData } from '~/root'; import { useOrganizationLoaderData } from '~/routes/organization'; import type { ProjectType } from '~/ui/components/project/utils'; diff --git a/packages/insomnia/src/ui/components/proto-file/proto-file-list.tsx b/packages/insomnia/src/ui/components/proto-file/proto-file-list.tsx index 3a2b8e2440..4d0cf2487e 100644 --- a/packages/insomnia/src/ui/components/proto-file/proto-file-list.tsx +++ b/packages/insomnia/src/ui/components/proto-file/proto-file-list.tsx @@ -1,8 +1,7 @@ +import { type ProtoDirectory, type ProtoFile } from 'insomnia-data'; import React, { type FunctionComponent } from 'react'; import { Checkbox } from 'react-aria-components'; -import { type ProtoDirectory, type ProtoFile } from '~/insomnia-data'; - import { Button } from '../themed-button'; export type SelectProtoFileHandler = (id: string) => void; diff --git a/packages/insomnia/src/ui/components/rendered-query-string.tsx b/packages/insomnia/src/ui/components/rendered-query-string.tsx index eaaf436da9..5ad1054f49 100644 --- a/packages/insomnia/src/ui/components/rendered-query-string.tsx +++ b/packages/insomnia/src/ui/components/rendered-query-string.tsx @@ -1,7 +1,4 @@ import classNames from 'classnames'; -import { type FC, useCallback, useEffect, useState } from 'react'; -import { Link } from 'react-aria-components'; - import { models, type Request, @@ -10,7 +7,10 @@ import { type RequestParameter, type SocketIORequest, type WebSocketRequest, -} from '~/insomnia-data'; +} from 'insomnia-data'; +import { type FC, useCallback, useEffect, useState } from 'react'; +import { Link } from 'react-aria-components'; + import { SegmentEvent } from '~/ui/analytics'; import { showSettingsModal } from '~/ui/components/modals/settings-modal'; diff --git a/packages/insomnia/src/ui/components/request-url-bar.tsx b/packages/insomnia/src/ui/components/request-url-bar.tsx index 907754cec8..e999e46ae0 100644 --- a/packages/insomnia/src/ui/components/request-url-bar.tsx +++ b/packages/insomnia/src/ui/components/request-url-bar.tsx @@ -1,10 +1,10 @@ +import { models, type Request, type RequestGroup, services } from 'insomnia-data'; import { forwardRef, useCallback, useEffect, useImperativeHandle, useRef, useState } from 'react'; import { Button, Link } from 'react-aria-components'; import { useParams, useSearchParams } from 'react-router'; import * as reactUse from 'react-use'; import { SECURITY_SETTINGS_PATH_LABEL } from '~/common/misc'; -import { models, type Request, type RequestGroup, services } from '~/insomnia-data'; import { useRootLoaderData } from '~/root'; import { type ConnectActionParams, diff --git a/packages/insomnia/src/ui/components/settings/boolean-setting.tsx b/packages/insomnia/src/ui/components/settings/boolean-setting.tsx index 5ec9569eba..0429b5aa82 100644 --- a/packages/insomnia/src/ui/components/settings/boolean-setting.tsx +++ b/packages/insomnia/src/ui/components/settings/boolean-setting.tsx @@ -1,6 +1,6 @@ +import type { SettingsOfType } from 'insomnia-data/common'; import React, { type FC, type ReactNode } from 'react'; -import type { SettingsOfType } from '~/insomnia-data/common'; import { useRootLoaderData } from '~/root'; import { useSettingsPatcher } from '../../hooks/use-request'; diff --git a/packages/insomnia/src/ui/components/settings/cloud-service-credentials.tsx b/packages/insomnia/src/ui/components/settings/cloud-service-credentials.tsx index 780d219b3f..6c52be642d 100644 --- a/packages/insomnia/src/ui/components/settings/cloud-service-credentials.tsx +++ b/packages/insomnia/src/ui/components/settings/cloud-service-credentials.tsx @@ -1,7 +1,7 @@ +import { type CloudProviderCredential, type CloudProviderName,models } from 'insomnia-data'; import React, { useEffect, useState } from 'react'; import { Button, Menu, MenuItem, MenuTrigger, Popover } from 'react-aria-components'; -import { type CloudProviderCredential, type CloudProviderName,models } from '~/insomnia-data'; import { useRootLoaderData } from '~/root'; import { useDeleteCloudCredentialActionFetcher } from '~/routes/cloud-credentials.$cloudCredentialId.delete'; diff --git a/packages/insomnia/src/ui/components/settings/credentials.tsx b/packages/insomnia/src/ui/components/settings/credentials.tsx index 20b862b12c..753cb6824b 100644 --- a/packages/insomnia/src/ui/components/settings/credentials.tsx +++ b/packages/insomnia/src/ui/components/settings/credentials.tsx @@ -1,4 +1,11 @@ import type { IconProp } from '@fortawesome/fontawesome-svg-core'; +import { + type GitCredentials, + type GitCredentialsV2, + type GitRemoteProviderType, + models, + type ProviderEmail, +} from 'insomnia-data'; import { Fragment, useEffect, useRef, useState } from 'react'; import { Button, @@ -21,13 +28,6 @@ import { import { Button as BasicButton } from '~/basic-components/button'; import { Icon } from '~/basic-components/icon'; -import { - type GitCredentials, - type GitCredentialsV2, - type GitRemoteProviderType, - models, - type ProviderEmail, -} from '~/insomnia-data'; import { useGitCredentialsLoaderFetcher } from '~/routes/git-credentials'; import { useGitCredentialsDeleteActionFetcher } from '~/routes/git-credentials.$id.delete'; import { useRelatedProjectsByGitCredentialsIdLoaderFetcher } from '~/routes/git-credentials.$id.related-projects'; diff --git a/packages/insomnia/src/ui/components/settings/enum-setting.tsx b/packages/insomnia/src/ui/components/settings/enum-setting.tsx index 82fbea41f9..f12de6bf8b 100644 --- a/packages/insomnia/src/ui/components/settings/enum-setting.tsx +++ b/packages/insomnia/src/ui/components/settings/enum-setting.tsx @@ -1,6 +1,6 @@ +import type { SettingsOfType } from 'insomnia-data/common'; import React, { type PropsWithChildren, type ReactNode } from 'react'; -import type { SettingsOfType } from '~/insomnia-data/common'; import { useRootLoaderData } from '~/root'; import { useSettingsPatcher } from '../../hooks/use-request'; diff --git a/packages/insomnia/src/ui/components/settings/general.tsx b/packages/insomnia/src/ui/components/settings/general.tsx index 6d181064bd..1d069118fc 100644 --- a/packages/insomnia/src/ui/components/settings/general.tsx +++ b/packages/insomnia/src/ui/components/settings/general.tsx @@ -1,6 +1,6 @@ +import { type HttpVersion, HttpVersions, isMac, strings, UpdateChannel } from 'insomnia-data/common'; import React, { type FC, Fragment } from 'react'; -import { type HttpVersion, HttpVersions, isMac, strings, UpdateChannel } from '~/insomnia-data/common'; import { useRootLoaderData } from '~/root'; import { diff --git a/packages/insomnia/src/ui/components/settings/import-export.tsx b/packages/insomnia/src/ui/components/settings/import-export.tsx index e4acfb8065..52079a5c3d 100644 --- a/packages/insomnia/src/ui/components/settings/import-export.tsx +++ b/packages/insomnia/src/ui/components/settings/import-export.tsx @@ -13,12 +13,12 @@ import { ExportRequestsModal } from 'insomnia/src/ui/components/modals/export-re import { ImportModal } from 'insomnia/src/ui/components/modals/import-modal/import-modal'; import { SelectModal } from 'insomnia/src/ui/components/modals/select-modal'; import type { Organization } from 'insomnia-api'; +import { type BaseModel, type Environment, models, type Project, services, type Workspace } from 'insomnia-data'; +import { strings } from 'insomnia-data/common'; import React, { type FC, Fragment, useEffect, useState } from 'react'; import { Button, Heading, ListBox, ListBoxItem, Popover, Select, SelectValue } from 'react-aria-components'; import { href, useParams } from 'react-router'; -import { type BaseModel, type Environment, models, type Project, services, type Workspace } from '~/insomnia-data'; -import { strings } from '~/insomnia-data/common'; import { useRootLoaderData } from '~/root'; import { useOrganizationLoaderData } from '~/routes/organization'; import { useProjectListWorkspacesLoaderFetcher } from '~/routes/organization.$organizationId.project.$projectId.list-workspaces'; diff --git a/packages/insomnia/src/ui/components/settings/masked-setting.tsx b/packages/insomnia/src/ui/components/settings/masked-setting.tsx index 8d69d99822..c09c5662d2 100644 --- a/packages/insomnia/src/ui/components/settings/masked-setting.tsx +++ b/packages/insomnia/src/ui/components/settings/masked-setting.tsx @@ -1,7 +1,7 @@ +import type { SettingsOfType } from 'insomnia-data/common'; import React, { type FC } from 'react'; import * as reactUse from 'react-use'; -import type { SettingsOfType } from '~/insomnia-data/common'; import { useRootLoaderData } from '~/root'; import { useSettingsPatcher } from '../../hooks/use-request'; diff --git a/packages/insomnia/src/ui/components/settings/number-setting.tsx b/packages/insomnia/src/ui/components/settings/number-setting.tsx index f56c67ab57..a3a0337f52 100644 --- a/packages/insomnia/src/ui/components/settings/number-setting.tsx +++ b/packages/insomnia/src/ui/components/settings/number-setting.tsx @@ -1,6 +1,6 @@ +import type { SettingsOfType } from 'insomnia-data/common'; import React, { type ChangeEventHandler, type FC, type InputHTMLAttributes, useCallback } from 'react'; -import type { SettingsOfType } from '~/insomnia-data/common'; import { useRootLoaderData } from '~/root'; import { useSettingsPatcher } from '../../hooks/use-request'; diff --git a/packages/insomnia/src/ui/components/settings/shortcuts.tsx b/packages/insomnia/src/ui/components/settings/shortcuts.tsx index 087a7aa82a..72356230e6 100644 --- a/packages/insomnia/src/ui/components/settings/shortcuts.tsx +++ b/packages/insomnia/src/ui/components/settings/shortcuts.tsx @@ -1,14 +1,14 @@ -import React, { type FC } from 'react'; -import { Button } from 'react-aria-components'; - -import type { HotKeyRegistry, KeyboardShortcut, KeyCombination } from '~/insomnia-data/common'; +import type { HotKeyRegistry, KeyboardShortcut, KeyCombination } from 'insomnia-data/common'; import { areSameKeyCombinations, constructKeyCombinationDisplay, getPlatformKeyCombinations, keyboardShortcutDescriptions, newDefaultRegistry, -} from '~/insomnia-data/common'; +} from 'insomnia-data/common'; +import React, { type FC } from 'react'; +import { Button } from 'react-aria-components'; + import { useRootLoaderData } from '~/root'; import { generateId } from '../../../common/misc'; diff --git a/packages/insomnia/src/ui/components/settings/text-array-setting.tsx b/packages/insomnia/src/ui/components/settings/text-array-setting.tsx index 2e92678658..23fb1331db 100644 --- a/packages/insomnia/src/ui/components/settings/text-array-setting.tsx +++ b/packages/insomnia/src/ui/components/settings/text-array-setting.tsx @@ -1,7 +1,7 @@ +import type { SettingsOfType } from 'insomnia-data/common'; import React, { type FC, type InputHTMLAttributes, useCallback, useState } from 'react'; import { ListBox, ListBoxItem } from 'react-aria-components'; -import type { SettingsOfType } from '~/insomnia-data/common'; import { useRootLoaderData } from '~/root'; import { invariant } from '~/utils/invariant'; diff --git a/packages/insomnia/src/ui/components/settings/text-setting.tsx b/packages/insomnia/src/ui/components/settings/text-setting.tsx index cbf38abe0f..c8cf72c74a 100644 --- a/packages/insomnia/src/ui/components/settings/text-setting.tsx +++ b/packages/insomnia/src/ui/components/settings/text-setting.tsx @@ -1,6 +1,6 @@ +import type { SettingsOfType } from 'insomnia-data/common'; import React, { type ChangeEventHandler, type FC, type InputHTMLAttributes, useCallback } from 'react'; -import type { SettingsOfType } from '~/insomnia-data/common'; import { useRootLoaderData } from '~/root'; import { useSettingsPatcher } from '../../hooks/use-request'; diff --git a/packages/insomnia/src/ui/components/socket-io/body-tab-pane.tsx b/packages/insomnia/src/ui/components/socket-io/body-tab-pane.tsx index 68ba80e57f..accec481d5 100644 --- a/packages/insomnia/src/ui/components/socket-io/body-tab-pane.tsx +++ b/packages/insomnia/src/ui/components/socket-io/body-tab-pane.tsx @@ -1,3 +1,4 @@ +import { type SocketIOPayload, type SocketIORequest } from 'insomnia-data'; import React, { useMemo, useRef, useState } from 'react'; import { Button, @@ -19,7 +20,6 @@ import { } from 'react-aria-components'; import { v4 as uuidv4 } from 'uuid'; -import { type SocketIOPayload, type SocketIORequest } from '~/insomnia-data'; import { CodeEditor } from '~/ui/components/.client/codemirror/code-editor'; import { CONTENT_TYPE_JSON, CONTENT_TYPE_PLAINTEXT } from '../../../common/constants'; diff --git a/packages/insomnia/src/ui/components/socket-io/event-tab-pane.tsx b/packages/insomnia/src/ui/components/socket-io/event-tab-pane.tsx index fe2d9d70e2..06cbc2b900 100644 --- a/packages/insomnia/src/ui/components/socket-io/event-tab-pane.tsx +++ b/packages/insomnia/src/ui/components/socket-io/event-tab-pane.tsx @@ -1,9 +1,8 @@ import classNames from 'classnames'; +import { type SocketIOEventListener, type SocketIORequest } from 'insomnia-data'; import React, { useMemo } from 'react'; import { Button, GridList, GridListItem, Input, Switch } from 'react-aria-components'; -import { type SocketIOEventListener, type SocketIORequest } from '~/insomnia-data'; - import { generateId } from '../../../common/misc'; import { useRequestPatcher } from '../../hooks/use-request'; import { Icon } from '../icon'; diff --git a/packages/insomnia/src/ui/components/socket-io/event-view.tsx b/packages/insomnia/src/ui/components/socket-io/event-view.tsx index cad3659e16..83bb0f87e2 100644 --- a/packages/insomnia/src/ui/components/socket-io/event-view.tsx +++ b/packages/insomnia/src/ui/components/socket-io/event-view.tsx @@ -1,7 +1,6 @@ +import { services } from 'insomnia-data'; import React, { type FC } from 'react'; -import { services } from '~/insomnia-data'; - import { CONTENT_TYPE_JSON } from '../../../common/constants'; import type { SocketIOEvent, SocketIOMessageEvent } from '../../../main/network/socket-io'; import { diff --git a/packages/insomnia/src/ui/components/socket-io/request-pane.tsx b/packages/insomnia/src/ui/components/socket-io/request-pane.tsx index af1e3a582a..694e0bf4ee 100644 --- a/packages/insomnia/src/ui/components/socket-io/request-pane.tsx +++ b/packages/insomnia/src/ui/components/socket-io/request-pane.tsx @@ -1,11 +1,11 @@ +import { type Environment, models, type RequestPathParameter } from 'insomnia-data'; +import { deconstructQueryStringToParams } from 'insomnia-data/common'; import React, { type FC, Fragment } from 'react'; import { Button, Heading, Tab, TabList, TabPanel, Tabs, ToggleButton } from 'react-aria-components'; import { Panel, PanelGroup, PanelResizeHandle } from 'react-resizable-panels'; import { useParams } from 'react-router'; import * as reactUse from 'react-use'; -import { type Environment, models, type RequestPathParameter } from '~/insomnia-data'; -import { deconstructQueryStringToParams } from '~/insomnia-data/common'; import { getAuthObjectOrNull } from '~/network/authentication'; import { useRootLoaderData } from '~/root'; import { useWorkspaceLoaderData } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId'; diff --git a/packages/insomnia/src/ui/components/tabs/tab-list.tsx b/packages/insomnia/src/ui/components/tabs/tab-list.tsx index 8f65a7e6af..16bed40545 100644 --- a/packages/insomnia/src/ui/components/tabs/tab-list.tsx +++ b/packages/insomnia/src/ui/components/tabs/tab-list.tsx @@ -1,3 +1,4 @@ +import { type BaseModel, type MockRoute, models, type Request, services } from 'insomnia-data'; import React, { useCallback, useEffect, useState } from 'react'; import { Button, @@ -12,7 +13,6 @@ import { } from 'react-aria-components'; import { useParams } from 'react-router'; -import { type BaseModel, type MockRoute, models, type Request, services } from '~/insomnia-data'; import { useRequestNewActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.new'; import { useInsomniaTab } from '~/ui/hooks/use-insomnia-tab'; diff --git a/packages/insomnia/src/ui/components/tabs/tab.tsx b/packages/insomnia/src/ui/components/tabs/tab.tsx index eb4a3bbb73..3739ca8019 100644 --- a/packages/insomnia/src/ui/components/tabs/tab.tsx +++ b/packages/insomnia/src/ui/components/tabs/tab.tsx @@ -1,10 +1,9 @@ import type { IconProp } from '@fortawesome/fontawesome-svg-core'; import classNames from 'classnames'; +import { models } from 'insomnia-data'; import React, { useCallback } from 'react'; import { Button, GridListItem } from 'react-aria-components'; -import { models } from '~/insomnia-data'; - import { scrollElementIntoView } from '../../../utils'; import { useInsomniaTabContext } from '../../context/app/insomnia-tab-context'; import { Icon } from '../icon'; diff --git a/packages/insomnia/src/ui/components/tags/method-tag.tsx b/packages/insomnia/src/ui/components/tags/method-tag.tsx index afd92852e9..1627a8ff41 100644 --- a/packages/insomnia/src/ui/components/tags/method-tag.tsx +++ b/packages/insomnia/src/ui/components/tags/method-tag.tsx @@ -1,8 +1,7 @@ +import { type McpRequest, models } from 'insomnia-data'; +import { type GrpcRequest, type Request, type SocketIORequest, type WebSocketRequest } from 'insomnia-data'; import React, { type FC, memo } from 'react'; -import { type McpRequest, models } from '~/insomnia-data'; -import { type GrpcRequest, type Request, type SocketIORequest, type WebSocketRequest } from '~/insomnia-data'; - import { CONTENT_TYPE_GRAPHQL, METHOD_DELETE, METHOD_OPTIONS } from '../../../common/constants'; interface Props { diff --git a/packages/insomnia/src/ui/components/templating/external-vault/external-vault-form.tsx b/packages/insomnia/src/ui/components/templating/external-vault/external-vault-form.tsx index 40fbff7944..39878b35b7 100644 --- a/packages/insomnia/src/ui/components/templating/external-vault/external-vault-form.tsx +++ b/packages/insomnia/src/ui/components/templating/external-vault/external-vault-form.tsx @@ -1,8 +1,7 @@ +import { type CloudProviderCredential, type CloudProviderName,models } from 'insomnia-data'; import React, { useMemo, useState } from 'react'; import { Button } from 'react-aria-components'; -import { type CloudProviderCredential, type CloudProviderName,models } from '~/insomnia-data'; - import { debounce } from '../../../../common/misc'; import { Icon } from '../../icon'; import { CloudCredentialModal } from '../../modals/cloud-credential-modal/cloud-credential-modal'; diff --git a/packages/insomnia/src/ui/components/templating/external-vault/hashicorp-vault-form.tsx b/packages/insomnia/src/ui/components/templating/external-vault/hashicorp-vault-form.tsx index 3af6afb7a2..28bbbcbd93 100644 --- a/packages/insomnia/src/ui/components/templating/external-vault/hashicorp-vault-form.tsx +++ b/packages/insomnia/src/ui/components/templating/external-vault/hashicorp-vault-form.tsx @@ -1,6 +1,6 @@ +import { type CloudProviderCredential,models } from 'insomnia-data'; import React from 'react'; -import { type CloudProviderCredential,models } from '~/insomnia-data'; import { useRootLoaderData } from '~/root'; import type { NunjucksParsedTag } from '~/templating/types'; diff --git a/packages/insomnia/src/ui/components/templating/tag-editor-arg-sub-form.tsx b/packages/insomnia/src/ui/components/templating/tag-editor-arg-sub-form.tsx index 5705f0f03c..30ecefdf1a 100644 --- a/packages/insomnia/src/ui/components/templating/tag-editor-arg-sub-form.tsx +++ b/packages/insomnia/src/ui/components/templating/tag-editor-arg-sub-form.tsx @@ -1,7 +1,6 @@ +import { type BaseModel } from 'insomnia-data'; import React from 'react'; -import { type BaseModel } from '~/insomnia-data'; - import type { NunjucksParsedTag } from '../../../templating/types'; import { isBase64String, isValidJSONString } from '../../../utils/string-check'; import { ExternalVaultForm } from './external-vault/external-vault-form'; diff --git a/packages/insomnia/src/ui/components/templating/tag-editor.tsx b/packages/insomnia/src/ui/components/templating/tag-editor.tsx index 94de3f384b..d05acc2940 100644 --- a/packages/insomnia/src/ui/components/templating/tag-editor.tsx +++ b/packages/insomnia/src/ui/components/templating/tag-editor.tsx @@ -1,10 +1,6 @@ import classnames from 'classnames'; import clone from 'clone'; import { localTemplateTags } from 'insomnia/src/templating/local-template-tags'; -import React, { type FC, useCallback, useEffect, useState } from 'react'; -import { Button, Link } from 'react-aria-components'; -import * as reactUse from 'react-use'; - import { type BaseModel, type CloudProviderCredential, @@ -13,7 +9,11 @@ import { type RequestGroup, services, type Workspace, -} from '~/insomnia-data'; +} from 'insomnia-data'; +import React, { type FC, useCallback, useEffect, useState } from 'react'; +import { Button, Link } from 'react-aria-components'; +import * as reactUse from 'react-use'; + import { showSettingsModal } from '~/ui/components/modals/settings-modal'; import { database as db } from '../../../common/database'; diff --git a/packages/insomnia/src/ui/components/templating/variable-editor.tsx b/packages/insomnia/src/ui/components/templating/variable-editor.tsx index 39fe6e32c3..54e2adc830 100644 --- a/packages/insomnia/src/ui/components/templating/variable-editor.tsx +++ b/packages/insomnia/src/ui/components/templating/variable-editor.tsx @@ -1,7 +1,6 @@ +import { models } from 'insomnia-data'; import React, { type FC, useEffect, useMemo, useState } from 'react'; -import { models } from '~/insomnia-data'; - import { NUNJUCKS_TEMPLATE_GLOBAL_PROPERTY_NAME } from '../../../templating'; import type { RenderPurpose } from '../../../templating/types'; import { useNunjucks } from '../../context/nunjucks/use-nunjucks'; diff --git a/packages/insomnia/src/ui/components/viewers/response-headers-viewer.tsx b/packages/insomnia/src/ui/components/viewers/response-headers-viewer.tsx index e1e9383919..5718d374c1 100644 --- a/packages/insomnia/src/ui/components/viewers/response-headers-viewer.tsx +++ b/packages/insomnia/src/ui/components/viewers/response-headers-viewer.tsx @@ -1,7 +1,6 @@ +import { type ResponseHeader } from 'insomnia-data'; import React, { type FC, Fragment, useMemo } from 'react'; -import { type ResponseHeader } from '~/insomnia-data'; - import { CopyButton } from '../base/copy-button'; import { Link } from '../base/link'; diff --git a/packages/insomnia/src/ui/components/viewers/response-multipart-viewer.tsx b/packages/insomnia/src/ui/components/viewers/response-multipart-viewer.tsx index 9659bb02c9..5ff5f1cb95 100644 --- a/packages/insomnia/src/ui/components/viewers/response-multipart-viewer.tsx +++ b/packages/insomnia/src/ui/components/viewers/response-multipart-viewer.tsx @@ -1,10 +1,10 @@ import { format } from 'date-fns'; import type { SaveDialogOptions } from 'electron'; +import { getContentTypeFromHeaders, PREVIEW_MODE_FRIENDLY } from 'insomnia-data/common'; import { extension as mimeExtension } from 'mime-types'; import React, { type FC, useCallback, useEffect, useState } from 'react'; import { Button } from 'react-aria-components'; -import { getContentTypeFromHeaders, PREVIEW_MODE_FRIENDLY } from '~/insomnia-data/common'; import type { Part } from '~/main/multipart-buffer-to-array'; import { Dropdown, DropdownItem, ItemContent } from '../base/dropdown'; diff --git a/packages/insomnia/src/ui/components/viewers/response-timeline-viewer.tsx b/packages/insomnia/src/ui/components/viewers/response-timeline-viewer.tsx index c2ee3e511b..0793e6391a 100644 --- a/packages/insomnia/src/ui/components/viewers/response-timeline-viewer.tsx +++ b/packages/insomnia/src/ui/components/viewers/response-timeline-viewer.tsx @@ -1,6 +1,6 @@ +import type { ResponseTimelineEntry } from 'insomnia-data'; import React, { type FC, useEffect, useRef } from 'react'; -import type { ResponseTimelineEntry } from '~/insomnia-data'; import { CodeEditor, type CodeEditorHandle } from '~/ui/components/.client/codemirror/code-editor'; interface Props { diff --git a/packages/insomnia/src/ui/components/viewers/response-viewer.tsx b/packages/insomnia/src/ui/components/viewers/response-viewer.tsx index 945c38dd09..0d6c8a1f6c 100644 --- a/packages/insomnia/src/ui/components/viewers/response-viewer.tsx +++ b/packages/insomnia/src/ui/components/viewers/response-viewer.tsx @@ -1,7 +1,7 @@ import iconv from 'iconv-lite'; +import { PREVIEW_MODE_FRIENDLY, PREVIEW_MODE_RAW } from 'insomnia-data/common'; import { Fragment, useCallback, useRef, useState } from 'react'; -import { PREVIEW_MODE_FRIENDLY, PREVIEW_MODE_RAW } from '~/insomnia-data/common'; import { SegmentEvent } from '~/ui/analytics'; import { CodeEditor, type CodeEditorHandle } from '~/ui/components/.client/codemirror/code-editor'; diff --git a/packages/insomnia/src/ui/components/websockets/action-bar.tsx b/packages/insomnia/src/ui/components/websockets/action-bar.tsx index f4ec01013e..1bf3003fa1 100644 --- a/packages/insomnia/src/ui/components/websockets/action-bar.tsx +++ b/packages/insomnia/src/ui/components/websockets/action-bar.tsx @@ -1,7 +1,7 @@ +import { services, type SocketIORequest, type WebSocketRequest } from 'insomnia-data'; import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useLayoutEffect, useRef } from 'react'; import { useParams } from 'react-router'; -import { services, type SocketIORequest, type WebSocketRequest } from '~/insomnia-data'; import { type ConnectActionParams, useRequestConnectActionFetcher, diff --git a/packages/insomnia/src/ui/components/websockets/disconnect-button.tsx b/packages/insomnia/src/ui/components/websockets/disconnect-button.tsx index 875f5081f7..6a1774a100 100644 --- a/packages/insomnia/src/ui/components/websockets/disconnect-button.tsx +++ b/packages/insomnia/src/ui/components/websockets/disconnect-button.tsx @@ -1,8 +1,7 @@ +import { models } from 'insomnia-data'; import React, { type FC } from 'react'; import { Button } from 'react-aria-components'; -import { models } from '~/insomnia-data'; - import { Dropdown as OriginalDropdown, DropdownItem, ItemContent } from '../base/dropdown'; export const DisconnectButton: FC<{ requestId: string }> = ({ requestId }) => { diff --git a/packages/insomnia/src/ui/components/websockets/event-view.tsx b/packages/insomnia/src/ui/components/websockets/event-view.tsx index 775044a0f0..3d0c2e13c1 100644 --- a/packages/insomnia/src/ui/components/websockets/event-view.tsx +++ b/packages/insomnia/src/ui/components/websockets/event-view.tsx @@ -1,7 +1,7 @@ +import { PREVIEW_MODE_FRIENDLY, PREVIEW_MODE_RAW, PREVIEW_MODE_SOURCE } from 'insomnia-data/common'; import React, { type FC, useCallback, useRef } from 'react'; import { useParams } from 'react-router'; -import { PREVIEW_MODE_FRIENDLY, PREVIEW_MODE_RAW, PREVIEW_MODE_SOURCE } from '~/insomnia-data/common'; import { CodeEditor, type CodeEditorHandle } from '~/ui/components/.client/codemirror/code-editor'; import type { CurlEvent, CurlMessageEvent } from '../../../main/network/curl'; diff --git a/packages/insomnia/src/ui/components/websockets/realtime-response-pane.tsx b/packages/insomnia/src/ui/components/websockets/realtime-response-pane.tsx index ae51f9c0ac..6af112a26d 100644 --- a/packages/insomnia/src/ui/components/websockets/realtime-response-pane.tsx +++ b/packages/insomnia/src/ui/components/websockets/realtime-response-pane.tsx @@ -1,9 +1,4 @@ import classnames from 'classnames'; -import React, { type FC, useEffect, useMemo, useState } from 'react'; -import { Button, Input, SearchField, Tab, TabList, TabPanel, Tabs } from 'react-aria-components'; -import { Panel, PanelGroup, PanelResizeHandle } from 'react-resizable-panels'; - -import { docsMcpAuthentication } from '~/common/documentation'; import type { McpResponse, RequestVersion, @@ -11,9 +6,14 @@ import type { ResponseTimelineEntry, SocketIOResponse, WebSocketResponse, -} from '~/insomnia-data'; -import { models } from '~/insomnia-data'; -import { deserializeNDJSON } from '~/insomnia-data/common'; +} from 'insomnia-data'; +import { models } from 'insomnia-data'; +import { deserializeNDJSON } from 'insomnia-data/common'; +import React, { type FC, useEffect, useMemo, useState } from 'react'; +import { Button, Input, SearchField, Tab, TabList, TabPanel, Tabs } from 'react-aria-components'; +import { Panel, PanelGroup, PanelResizeHandle } from 'react-resizable-panels'; + +import { docsMcpAuthentication } from '~/common/documentation'; import { useMcpReadyState } from '~/ui/hooks/use-mcp-ready-state'; import { useRealtimeConnectionNotifications } from '~/ui/hooks/use-realtime-connection-notifications'; diff --git a/packages/insomnia/src/ui/components/websockets/websocket-preview-dropdown.tsx b/packages/insomnia/src/ui/components/websockets/websocket-preview-dropdown.tsx index 0bda90ba72..9e4b6eea88 100644 --- a/packages/insomnia/src/ui/components/websockets/websocket-preview-dropdown.tsx +++ b/packages/insomnia/src/ui/components/websockets/websocket-preview-dropdown.tsx @@ -1,9 +1,8 @@ +import type { PreviewMode } from 'insomnia-data/common'; +import { getPreviewModeName, PREVIEW_MODES } from 'insomnia-data/common'; import React, { type FC } from 'react'; import { Button } from 'react-aria-components'; -import type { PreviewMode } from '~/insomnia-data/common'; -import { getPreviewModeName, PREVIEW_MODES } from '~/insomnia-data/common'; - import { Dropdown, DropdownItem, DropdownSection, ItemContent } from '../base/dropdown'; interface Props { diff --git a/packages/insomnia/src/ui/components/websockets/websocket-request-pane.tsx b/packages/insomnia/src/ui/components/websockets/websocket-request-pane.tsx index 8e3a435c64..98701b5849 100644 --- a/packages/insomnia/src/ui/components/websockets/websocket-request-pane.tsx +++ b/packages/insomnia/src/ui/components/websockets/websocket-request-pane.tsx @@ -1,11 +1,11 @@ +import { type Environment, models, type RequestPathParameter, services, type WebSocketRequest } from 'insomnia-data'; +import { deconstructQueryStringToParams } from 'insomnia-data/common'; import React, { type FC, Fragment, useEffect, useRef, useState } from 'react'; import { Button, Heading, Tab, TabList, TabPanel, Tabs, ToggleButton, Toolbar } from 'react-aria-components'; import { Panel, PanelGroup, PanelResizeHandle } from 'react-resizable-panels'; import { useParams } from 'react-router'; import * as reactUse from 'react-use'; -import { type Environment, models, type RequestPathParameter, services, type WebSocketRequest } from '~/insomnia-data'; -import { deconstructQueryStringToParams } from '~/insomnia-data/common'; import { useRootLoaderData } from '~/root'; import { useWorkspaceLoaderData } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId'; import { CodeEditor, type CodeEditorHandle } from '~/ui/components/.client/codemirror/code-editor'; diff --git a/packages/insomnia/src/ui/context/app/insomnia-tab-context.tsx b/packages/insomnia/src/ui/context/app/insomnia-tab-context.tsx index 56212b0e83..f13c4ce758 100644 --- a/packages/insomnia/src/ui/context/app/insomnia-tab-context.tsx +++ b/packages/insomnia/src/ui/context/app/insomnia-tab-context.tsx @@ -1,8 +1,8 @@ +import { models } from 'insomnia-data'; import React, { createContext, type FC, type PropsWithChildren, useCallback, useContext, useRef } from 'react'; import { useNavigate, useParams } from 'react-router'; import * as reactUse from 'react-use'; -import { models } from '~/insomnia-data'; import type { BaseTab } from '~/ui/components/tabs/tab'; import type { OrganizationTabs } from '~/ui/components/tabs/tab-list'; import uiEventBus from '~/ui/event-bus'; diff --git a/packages/insomnia/src/ui/database.client.ts b/packages/insomnia/src/ui/database.client.ts index 2d6b05225f..f07f848aec 100644 --- a/packages/insomnia/src/ui/database.client.ts +++ b/packages/insomnia/src/ui/database.client.ts @@ -1,8 +1,8 @@ // Bridge Database implementation for renderer process // Uses window.database.invoke API exposed by contextBridge from preload -import type { IDatabase, Operation, Query } from '~/insomnia-data'; -import { type AllTypes, type BaseModel } from '~/insomnia-data'; +import type { IDatabase, Operation, Query } from 'insomnia-data'; +import { type AllTypes, type BaseModel } from 'insomnia-data'; /** * Bridge database implementation for renderer process. diff --git a/packages/insomnia/src/ui/hooks/theme.ts b/packages/insomnia/src/ui/hooks/theme.ts index 81f9d568bb..6ac274c992 100644 --- a/packages/insomnia/src/ui/hooks/theme.ts +++ b/packages/insomnia/src/ui/hooks/theme.ts @@ -1,7 +1,7 @@ +import type { ThemeSettings } from 'insomnia-data'; import { useCallback, useEffect, useState } from 'react'; import * as reactUse from 'react-use'; -import type { ThemeSettings } from '~/insomnia-data'; import { useRootLoaderData } from '~/root'; import { SegmentEvent } from '~/ui/analytics'; diff --git a/packages/insomnia/src/ui/hooks/use-close-connection.ts b/packages/insomnia/src/ui/hooks/use-close-connection.ts index 7739d1f74d..e1b02f7702 100644 --- a/packages/insomnia/src/ui/hooks/use-close-connection.ts +++ b/packages/insomnia/src/ui/hooks/use-close-connection.ts @@ -1,7 +1,6 @@ +import { models, services } from 'insomnia-data'; import { useCallback, useEffect } from 'react'; -import { models, services } from '~/insomnia-data'; - import { useInsomniaTabContext } from '../context/app/insomnia-tab-context'; import uiEventBus from '../event-bus'; diff --git a/packages/insomnia/src/ui/hooks/use-filtered-requests.ts b/packages/insomnia/src/ui/hooks/use-filtered-requests.ts index 4efaaf4fdb..5e3caa54db 100644 --- a/packages/insomnia/src/ui/hooks/use-filtered-requests.ts +++ b/packages/insomnia/src/ui/hooks/use-filtered-requests.ts @@ -1,7 +1,6 @@ +import { type BaseModel, models } from 'insomnia-data'; import { useMemo } from 'react'; -import { type BaseModel, models } from '~/insomnia-data'; - import { fuzzyMatchAll } from '../../common/misc'; interface SearchableFields { diff --git a/packages/insomnia/src/ui/hooks/use-insomnia-tab.ts b/packages/insomnia/src/ui/hooks/use-insomnia-tab.ts index ff67089006..e2548d2e40 100644 --- a/packages/insomnia/src/ui/hooks/use-insomnia-tab.ts +++ b/packages/insomnia/src/ui/hooks/use-insomnia-tab.ts @@ -1,9 +1,5 @@ import type { Organization } from 'insomnia-api'; -import { useCallback, useEffect, useMemo } from 'react'; -import { href, matchPath, useLocation, useNavigate, useSearchParams } from 'react-router'; - -import { database } from '~/common/database'; -import { type McpRequest, models, services } from '~/insomnia-data'; +import { type McpRequest, models, services } from 'insomnia-data'; import { type GrpcRequest, type MockRoute, @@ -15,7 +11,11 @@ import { type UnitTestSuite, type WebSocketRequest, type Workspace, -} from '~/insomnia-data'; +} from 'insomnia-data'; +import { useCallback, useEffect, useMemo } from 'react'; +import { href, matchPath, useLocation, useNavigate, useSearchParams } from 'react-router'; + +import { database } from '~/common/database'; import { formatMethodName, getRequestMethodShortHand } from '~/ui/components/tags/method-tag'; import { showResourceNotFoundToast } from '~/ui/components/toast-notification'; diff --git a/packages/insomnia/src/ui/hooks/use-organization-features.tsx b/packages/insomnia/src/ui/hooks/use-organization-features.tsx index 20ef91bdb4..9625b5d078 100644 --- a/packages/insomnia/src/ui/hooks/use-organization-features.tsx +++ b/packages/insomnia/src/ui/hooks/use-organization-features.tsx @@ -1,7 +1,7 @@ +import { models } from 'insomnia-data'; import { useCallback, useEffect, useState } from 'react'; import { useParams } from 'react-router'; -import { models } from '~/insomnia-data'; import { fallbackBilling, fallbackFeatures, diff --git a/packages/insomnia/src/ui/hooks/use-plan.tsx b/packages/insomnia/src/ui/hooks/use-plan.tsx index b9014113d5..dc993168d2 100644 --- a/packages/insomnia/src/ui/hooks/use-plan.tsx +++ b/packages/insomnia/src/ui/hooks/use-plan.tsx @@ -1,7 +1,7 @@ import { type PersonalPlanType } from 'insomnia-api'; +import { models } from 'insomnia-data'; import { useParams } from 'react-router'; -import { models } from '~/insomnia-data'; import { useRootLoaderData } from '~/root'; import { useOrganizationLoaderData } from '~/routes/organization'; diff --git a/packages/insomnia/src/ui/hooks/use-request.ts b/packages/insomnia/src/ui/hooks/use-request.ts index b293a1caaf..866ea8279e 100644 --- a/packages/insomnia/src/ui/hooks/use-request.ts +++ b/packages/insomnia/src/ui/hooks/use-request.ts @@ -1,6 +1,4 @@ -import { useParams } from 'react-router'; - -import type { McpPayload, McpRequest, Settings } from '~/insomnia-data'; +import type { McpPayload, McpRequest, Settings } from 'insomnia-data'; import { type GrpcRequest, type GrpcRequestMeta, @@ -12,7 +10,9 @@ import { type SocketIORequest, type WebSocketRequest, type WorkspaceMeta, -} from '~/insomnia-data'; +} from 'insomnia-data'; +import { useParams } from 'react-router'; + import { useRequestUpdateActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.update'; import { useRequestUpdateMetaActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.update-meta'; import { useRequestUpdatePayloadActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.update-payload'; diff --git a/packages/insomnia/src/ui/hooks/use-runner-request-list.tsx b/packages/insomnia/src/ui/hooks/use-runner-request-list.tsx index d0ca82e4df..dc6aac6c76 100644 --- a/packages/insomnia/src/ui/hooks/use-runner-request-list.tsx +++ b/packages/insomnia/src/ui/hooks/use-runner-request-list.tsx @@ -1,6 +1,6 @@ +import { models, type Request } from 'insomnia-data'; import { useEffect, useMemo, useRef } from 'react'; -import { models, type Request } from '~/insomnia-data'; import type { RequestRow } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.runner'; import { useRunnerContext } from '~/ui/context/app/runner-context'; import { invariant } from '~/utils/invariant'; diff --git a/packages/insomnia/src/ui/hooks/use-toggle-environment-type.tsx b/packages/insomnia/src/ui/hooks/use-toggle-environment-type.tsx index 490cae70fe..bd07efc15a 100644 --- a/packages/insomnia/src/ui/hooks/use-toggle-environment-type.tsx +++ b/packages/insomnia/src/ui/hooks/use-toggle-environment-type.tsx @@ -1,6 +1,6 @@ +import { type Environment, type EnvironmentKvPairData, EnvironmentType } from 'insomnia-data'; import { useCallback } from 'react'; -import { type Environment, type EnvironmentKvPairData, EnvironmentType } from '~/insomnia-data'; import { showModal } from '~/ui/components/modals'; import { AlertModal } from '~/ui/components/modals/alert-modal'; import { AskModal } from '~/ui/components/modals/ask-modal'; diff --git a/packages/insomnia/src/ui/organization-utils.ts b/packages/insomnia/src/ui/organization-utils.ts index a637c937be..14cc5f1915 100644 --- a/packages/insomnia/src/ui/organization-utils.ts +++ b/packages/insomnia/src/ui/organization-utils.ts @@ -8,9 +8,9 @@ import { type Organization, type StorageRules, } from 'insomnia-api'; +import { database,models, type Project,services, type Workspace } from 'insomnia-data'; import { projectLock } from '~/common/project'; -import { database,models, type Project,services, type Workspace } from '~/insomnia-data'; import { initializeLocalBackendProjectAndMarkForSync, pushSnapshotOnInitialize, diff --git a/packages/insomnia/src/ui/renderer-listeners.ts b/packages/insomnia/src/ui/renderer-listeners.ts index 791d631bb3..362de6a105 100644 --- a/packages/insomnia/src/ui/renderer-listeners.ts +++ b/packages/insomnia/src/ui/renderer-listeners.ts @@ -1,4 +1,5 @@ -import { services } from '~/insomnia-data'; +import { services } from 'insomnia-data'; + import { type RAToastContent, showToast } from '~/ui/components/toast-notification'; import * as plugins from '../plugins'; diff --git a/packages/insomnia/src/ui/sync-utils.ts b/packages/insomnia/src/ui/sync-utils.ts index a052cd33da..53c9b56409 100644 --- a/packages/insomnia/src/ui/sync-utils.ts +++ b/packages/insomnia/src/ui/sync-utils.ts @@ -1,4 +1,3 @@ -import { database } from '~/common/database'; import { type ApiSpec, type Environment, @@ -15,7 +14,9 @@ import { type UnitTestSuite, type WebSocketRequest, type Workspace, -} from '~/insomnia-data'; +} from 'insomnia-data'; + +import { database } from '~/common/database'; import type { BackendProject, Compare, StatusCandidate } from '~/sync/types'; import { invariant } from '~/utils/invariant'; diff --git a/packages/insomnia/src/ui/utils.ts b/packages/insomnia/src/ui/utils.ts index 0dd2148282..a22103334c 100644 --- a/packages/insomnia/src/ui/utils.ts +++ b/packages/insomnia/src/ui/utils.ts @@ -1,7 +1,6 @@ +import { isMac } from 'insomnia-data/common'; import type { PressEvent } from 'react-aria'; -import { isMac } from '~/insomnia-data/common'; - export const isPrimaryClickModifier = (e: React.MouseEvent | MouseEvent | PressEvent) => { return isMac ? e.metaKey : e.ctrlKey; }; diff --git a/packages/insomnia/src/ui/vault-key.client.ts b/packages/insomnia/src/ui/vault-key.client.ts index 5f0ab4c6a7..e32f93d21f 100644 --- a/packages/insomnia/src/ui/vault-key.client.ts +++ b/packages/insomnia/src/ui/vault-key.client.ts @@ -1,7 +1,6 @@ import * as srp from '@getinsomnia/srp-js'; import { createVault, resetVault, verifyVaultA, verifyVaultM1 } from 'insomnia-api'; - -import { services, type UserSession } from '~/insomnia-data'; +import { services, type UserSession } from 'insomnia-data'; import { base64encode, saveVaultKeyIfNecessary } from '../utils/vault'; diff --git a/packages/insomnia/src/utils/environment-utils.test.ts b/packages/insomnia/src/utils/environment-utils.test.ts index 539dd6b5cb..d1861b5e6a 100644 --- a/packages/insomnia/src/utils/environment-utils.test.ts +++ b/packages/insomnia/src/utils/environment-utils.test.ts @@ -1,7 +1,6 @@ +import { models } from 'insomnia-data'; import { describe, expect, it } from 'vitest'; -import { models } from '~/insomnia-data'; - import { NUNJUCKS_TEMPLATE_GLOBAL_PROPERTY_NAME } from '../templating'; import { checkNestedKeys, diff --git a/packages/insomnia/src/utils/environment-utils.ts b/packages/insomnia/src/utils/environment-utils.ts index 3281edccaa..32446e9a3f 100644 --- a/packages/insomnia/src/utils/environment-utils.ts +++ b/packages/insomnia/src/utils/environment-utils.ts @@ -1,7 +1,6 @@ +import { type Environment, type EnvironmentKvPairData, models } from 'insomnia-data'; import orderedJSON from 'json-order'; -import { type Environment, type EnvironmentKvPairData, models } from '~/insomnia-data'; - import { JSON_ORDER_SEPARATOR } from '../common/constants'; import { generateId } from '../common/misc'; import { NUNJUCKS_TEMPLATE_GLOBAL_PROPERTY_NAME } from '../templating'; diff --git a/packages/insomnia/src/utils/invariant.ts b/packages/insomnia/src/utils/invariant.ts index ef18adb097..4f3681f7d9 100644 --- a/packages/insomnia/src/utils/invariant.ts +++ b/packages/insomnia/src/utils/invariant.ts @@ -1 +1 @@ -export { invariant } from '~/insomnia-data/common'; +export { invariant } from 'insomnia-data/common'; diff --git a/packages/insomnia/src/utils/router.ts b/packages/insomnia/src/utils/router.ts index 5f609a963c..1e9e45318f 100644 --- a/packages/insomnia/src/utils/router.ts +++ b/packages/insomnia/src/utils/router.ts @@ -1,9 +1,8 @@ import type { Organization } from 'insomnia-api'; +import { models, type Project, services } from 'insomnia-data'; import { useCallback } from 'react'; import { href, matchPath, type PathMatch, useFetcher } from 'react-router'; -import { models, type Project, services } from '~/insomnia-data'; - import { database } from '../common/database'; export const enum AsyncTask { SyncOrganization, diff --git a/packages/insomnia/src/utils/try-interpolate.ts b/packages/insomnia/src/utils/try-interpolate.ts index f5c66799d3..efc6768e43 100644 --- a/packages/insomnia/src/utils/try-interpolate.ts +++ b/packages/insomnia/src/utils/try-interpolate.ts @@ -1,5 +1,5 @@ -import type { McpRequest } from '~/insomnia-data'; -import { type GrpcRequest, type Request, type SocketIORequest, type WebSocketRequest } from '~/insomnia-data'; +import type { McpRequest } from 'insomnia-data'; +import { type GrpcRequest, type Request, type SocketIORequest, type WebSocketRequest } from 'insomnia-data'; import { getRenderContext, render } from '../common/render'; import { RenderError } from '../templating/render-error'; diff --git a/packages/insomnia/src/utils/url/querystring.test.ts b/packages/insomnia/src/utils/url/querystring.test.ts index f14c5c8803..ceb897570d 100644 --- a/packages/insomnia/src/utils/url/querystring.test.ts +++ b/packages/insomnia/src/utils/url/querystring.test.ts @@ -1,7 +1,6 @@ +import { deconstructQueryStringToParams } from 'insomnia-data/common'; import { describe, expect, it } from 'vitest'; -import { deconstructQueryStringToParams } from '~/insomnia-data/common'; - import { buildQueryParameter, buildQueryStringFromParams, diff --git a/packages/insomnia/src/utils/url/querystring.ts b/packages/insomnia/src/utils/url/querystring.ts index 6b3cac6ec1..2abe6a001d 100644 --- a/packages/insomnia/src/utils/url/querystring.ts +++ b/packages/insomnia/src/utils/url/querystring.ts @@ -1,6 +1,6 @@ import { format as urlFormat, parse as urlParse } from 'node:url'; -import { deconstructQueryStringToParams, type StrictNullSearchParamsValueType } from '~/insomnia-data/common'; +import { deconstructQueryStringToParams, type StrictNullSearchParamsValueType } from 'insomnia-data/common'; import { setDefaultProtocol } from './protocol'; diff --git a/packages/insomnia/src/utils/vault.ts b/packages/insomnia/src/utils/vault.ts index 1093b7b95e..0cf3ea7d63 100644 --- a/packages/insomnia/src/utils/vault.ts +++ b/packages/insomnia/src/utils/vault.ts @@ -1,6 +1,6 @@ -import { services } from '~/insomnia-data'; +import { type AESMessage, services } from 'insomnia-data'; -import { type AESMessage, decryptAES, encryptAES } from '../account/crypt'; +import { decryptAES, encryptAES } from '../account/crypt'; import { getInsomniaVaultKey, PLAYWRIGHT } from '../common/constants'; export const base64encode = (input: string | JsonWebKey) => { diff --git a/packages/insomnia/types/codemirror.d.ts b/packages/insomnia/types/codemirror.d.ts index 72c518a7c3..a9fede43f8 100644 --- a/packages/insomnia/types/codemirror.d.ts +++ b/packages/insomnia/types/codemirror.d.ts @@ -4,7 +4,7 @@ import { GraphQLInfoOptions } from 'codemirror-graphql/info'; import { ModifiedGraphQLJumpOptions } from 'codemirror-graphql/jump'; import { GraphQLSchema } from 'graphql'; -import type { Settings } from '~/insomnia-data'; +import type { Settings } from 'insomnia-data'; import { HandleRender } from '../src/common/render'; import { NunjucksParsedTag } from '../src/templating/utils'; diff --git a/packages/insomnia/types/global.d.ts b/packages/insomnia/types/global.d.ts index 0f819a0877..5c23a22db0 100644 --- a/packages/insomnia/types/global.d.ts +++ b/packages/insomnia/types/global.d.ts @@ -3,7 +3,7 @@ import type { HiddenBrowserWindowToMainBridgeAPI } from '../src/hidden-window-pr import type { RendererToMainBridgeAPI } from '../src/main/ipc/main'; import type { DatabaseBridgeAPI } from '../src/main/ipc/database'; import type { DiffMatchPatch, DiffOp } from 'diff-match-patch-ts'; -import type { Services } from '~/insomnia-data'; +import type { Services } from 'insomnia-data'; declare global { interface Window { diff --git a/packages/insomnia/vite.config.ts b/packages/insomnia/vite.config.ts index 8f6a2f1627..44c8d002f4 100644 --- a/packages/insomnia/vite.config.ts +++ b/packages/insomnia/vite.config.ts @@ -3,7 +3,7 @@ import path from 'node:path'; import { reactRouter } from '@react-router/dev/vite'; import tailwindcss from '@tailwindcss/vite'; -import { defineConfig } from 'vite'; +import { defineConfig, type Plugin } from 'vite'; import pkg from './package.json'; import { electronNodeRequire } from './vite-plugin-electron-node-require'; @@ -73,23 +73,127 @@ export default defineConfig(({ mode }) => { let totalWarnings = 0; function DetectNodeBuiltinImports() { const builtins = new Set(builtinModules); + const importersByModule = new Map>(); + const scriptExtensions = new Set(['.js', '.jsx', '.ts', '.tsx', '.mjs', '.cjs', '.mts', '.cts']); - return { - name: 'detect-node-builtin-imports', + const normalizeId = (id: string) => id.replace(/^\/@@fs\//, '/').replace(/\?.*$/, ''); + const shouldTrack = (id: string) => + !id.includes('node_modules') && !id.startsWith('\0') && !id.startsWith('virtual:'); + const isScriptModule = (id: string) => scriptExtensions.has(path.extname(id)); + const isBuiltinImport = (source: string) => + builtins.has(source) || + builtins.has(source.replace(/^node:/, '')) || + builtins.has(source.replace('virtual:external:node:', '')); + const displayPath = (id: string) => { + const normalizedId = normalizeId(id); + return path.isAbsolute(normalizedId) ? path.relative(process.cwd(), normalizedId) : normalizedId; + }; + const recordImporter = (moduleId: string, importerId: string) => { + const trackedImporters = importersByModule.get(moduleId) ?? new Set(); + trackedImporters.add(importerId); + importersByModule.set(moduleId, trackedImporters); + }; + const buildImportChain = (moduleId: string) => { + const chain = [moduleId]; + const seen = new Set(chain); + let current = moduleId; - resolveId(source: string, importer: string | undefined) { - // Ignore node_modules and virtual imports - if (!importer) return null; - if (importer.includes('node_modules')) return null; + while (true) { + const importers = importersByModule.get(current); + const nextImporter = importers ? [...importers].find(importer => !seen.has(importer)) : undefined; - // If the import target is a Node builtin module - if (builtins.has(source) || builtins.has(source.replace('virtual:external:node:', ''))) { - const file = path.relative(process.cwd(), importer); - totalWarnings += 1; - console.warn(`⚠️ ${totalWarnings} File "${file}" imports Node builtin module "${source}"`); + if (!nextImporter) { + break; } - return null; // Let Vite handle the actual resolution + chain.unshift(nextImporter); + seen.add(nextImporter); + current = nextImporter; + } + + return chain.map(displayPath).join(' -> '); + }; + + const plugin: Plugin = { + name: 'detect-node-builtin-imports', + + async transform(code: string, id: string) { + const normalizedId = normalizeId(id); + + if (!shouldTrack(normalizedId) || !isScriptModule(normalizedId)) { + return null; + } + + let parsed: { body?: unknown[] }; + + try { + parsed = this.parse(code) as unknown as { body?: unknown[] }; + } catch { + return null; + } + + const importSources = new Set(); + const visitNode = (node: unknown): void => { + if (!node || typeof node !== 'object') { + return; + } + + const candidate = node as { + type?: string; + source?: { value?: unknown }; + body?: unknown[]; + }; + + if ( + (candidate.type === 'ImportDeclaration' || + candidate.type === 'ExportAllDeclaration' || + candidate.type === 'ExportNamedDeclaration') && + typeof candidate.source?.value === 'string' + ) { + importSources.add(candidate.source.value); + } + + if (candidate.type === 'ImportExpression' && typeof candidate.source?.value === 'string') { + importSources.add(candidate.source.value); + } + + for (const value of Object.values(candidate)) { + if (Array.isArray(value)) { + for (const child of value) { + visitNode(child); + } + } else { + visitNode(value); + } + } + }; + + for (const node of parsed.body ?? []) { + visitNode(node); + } + + for (const source of importSources) { + if (isBuiltinImport(source)) { + const file = displayPath(normalizedId); + const importChain = buildImportChain(normalizedId); + totalWarnings += 1; + console.warn( + `⚠️ ${totalWarnings} File "${file}" imports Node builtin module "${source}" via "${importChain}"`, + ); + continue; + } + + const resolution = await this.resolve(source, id, { skipSelf: true }); + const resolvedId = resolution?.id ? normalizeId(resolution.id) : null; + + if (resolvedId && shouldTrack(resolvedId)) { + recordImporter(resolvedId, normalizedId); + } + } + + return null; }, }; + + return plugin; }