refactor: add aliases for insomnia-data

eslint.config.mjs

@@ -21,12 +21,17 @@ const generalRestrictedImportPatterns = [
   // Block relative paths to insomnia-data
   {
     group: ['./**/insomnia-data', './**/insomnia-data/**', '../**/insomnia-data', '../**/insomnia-data/**'],
-    message: "Please use '~/insomnia-data' instead of relative paths",
+    message: "Please use 'insomnia-data' instead of relative paths",
   },
-  // Only allow ~/insomnia-data and ~/insomnia-data/node
+  // Only allow insomnia-data and insomnia-data/node
   {
-    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",
+  },
+  // Only allow insomnia-data, not allow ~/insomnia-data anymore
+  {
+    regex: '^~/insomnia-data(/.*)?$',
+    message: "Please use 'insomnia-data' instead of '~/insomnia-data'",
   },
 ];
 const rendererNodeMigrationOffenders = [

packages/insomnia-inso/src/analytics.ts

@@ -2,10 +2,9 @@ import os from 'node:os';
 
 import { getSegmentWriteKey } from 'insomnia/src/common/constants';
 import { InsoEvent, InsomniaAnalytics } from 'insomnia-analytics';
+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';

packages/insomnia-inso/src/cli.ts

@@ -12,22 +12,21 @@ import { isDevelopment, JSON_ORDER_PREFIX, JSON_ORDER_SEPARATOR } from 'insomnia
 import { insomniaFetch } from 'insomnia/src/common/insomnia-fetch';
 import { getSendRequestCallbackMemDb } from 'insomnia/src/common/send-request';
 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 {
   Environment,
   Request,
   RequestGroup,
   RequestTestResult,
   UserUploadEnvironment,
   Workspace,
-} from '~/insomnia-data';
-import { initServices, models } from '~/insomnia-data';
-import { deserializeNDJSON } from '~/insomnia-data/common';
-import { servicesNodeImpl } from '~/insomnia-data/node';
+} from 'insomnia-data';
+import { initServices, models } 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';

packages/insomnia-inso/src/commands/run-collection/result-report.ts

@@ -3,7 +3,6 @@ import nodePath from 'node:path';
 
 import type { ConsolaInstance } from 'consola';
 import { pick } from 'es-toolkit';
-
 import type {
   Environment,
   Request,
@@ -12,8 +11,8 @@ import type {
   RequestTestResult,
   UserUploadEnvironment,
   Workspace,
-} from '~/insomnia-data';
-import { typedKeys } from '~/insomnia-data/common';
+} from 'insomnia-data';
+import { typedKeys } from 'insomnia-data/common';
 
 interface RunReportExecution {
   request: Request;

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,

packages/insomnia-inso/src/reporter/index.test.ts

@@ -1,7 +1,6 @@
+import type { RequestTestResult } from 'insomnia-data';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
-import type { RequestTestResult } from '~/insomnia-data';
-
 import { logTestResult, logTestResultSummary, reporterTypes } from './index';
 
 describe('Reporter', () => {

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];
 

packages/insomnia-inso/tsconfig.json

@@ -10,7 +10,9 @@
     "isolatedModules": true,
     "noEmit": true,
     "paths": {
-      "~/*": ["../insomnia/src/*"]
+      "~/*": ["../insomnia/src/*"],
+      "insomnia-data": ["../insomnia/src/insomnia-data"],
+      "insomnia-data/*": ["../insomnia/src/insomnia-data/*"]
     },
     /* Transpiling Options */
     "module": "ESNext",

packages/insomnia-scripting-environment/src/objects/auth.ts

@@ -1,6 +1,5 @@
 import type { OAuth1SignatureMethod } from 'insomnia/src/common/constants';
-
-import type { OAuth2ResponseType, RequestAuthentication } from '~/insomnia-data';
+import type { OAuth2ResponseType, RequestAuthentication } from 'insomnia-data';
 
 import { Property } from './properties';
 import { Variable, VariableList } from './variables';

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';
 

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';

packages/insomnia-scripting-environment/src/objects/interfaces.ts

@@ -1,6 +1,5 @@
 import type { sendCurlAndWriteTimelineError, sendCurlAndWriteTimelineResponse } from 'insomnia/src/network/network';
-
-import type { ClientCertificate, CookieJar, Request, RequestTestResult, Settings } from '~/insomnia-data';
+import type { ClientCertificate, CookieJar, Request, RequestTestResult, Settings } from 'insomnia-data';
 
 import type { ExecutionOption } from './execution';
 import type { RequestInfoOption } from './request-info';

packages/insomnia-scripting-environment/src/objects/request.ts

@@ -5,8 +5,8 @@ import type {
   RequestBodyParameter,
   RequestPathParameter,
   Settings,
-} from '~/insomnia-data';
-import { models } from '~/insomnia-data';
+} from 'insomnia-data';
+import { models } from 'insomnia-data';
 
 import { type AuthOptions, type AuthOptionTypes, fromPreRequestAuth, RequestAuth } from './auth';
 import type { CertificateOptions } from './certificates';

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';

packages/insomnia-scripting-environment/src/objects/send-request.ts

@@ -1,10 +1,9 @@
 import type { CurlRequestOutput } from 'insomnia/src/main/network/libcurl-promise';
+import type { Settings } from 'insomnia-data';
+import { services } from 'insomnia-data';
 import { Cookie } from 'tough-cookie';
 import { v4 as uuidv4 } from 'uuid';
 
-import type { Settings } from '~/insomnia-data';
-import { services } from '~/insomnia-data';
-
 import { RequestAuth } from './auth';
 import { fromPreRequestAuth } from './auth';
 import type { CookieOptions } from './cookies';

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<void>, log: (testResult: RequestTestResult) => void) {

packages/insomnia-scripting-environment/tsconfig.json

@@ -11,7 +11,9 @@
     "isolatedModules": true,
     "noEmit": true,
     "paths": {
-      "~/*": ["../insomnia/src/*"]
+      "~/*": ["../insomnia/src/*"],
+      "insomnia-data": ["../insomnia/src/insomnia-data"],
+      "insomnia-data/*": ["../insomnia/src/insomnia-data/*"]
     },
     /* Strictness */
     "strict": true,

packages/insomnia-scripting-environment/vitest.config.ts

@@ -5,6 +5,7 @@ export default defineConfig({
     hideSkippedTests: true,
     alias: {
       '~/': new URL('../insomnia/src/', import.meta.url).pathname,
+      'insomnia-data': new URL('../insomnia/src/insomnia-data', import.meta.url).pathname,
     },
   },
 });

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';

packages/insomnia/src/account/crypt.ts

@@ -1,7 +1,6 @@
+import type { AESMessage } from 'insomnia-data';
 import forge from 'node-forge';
 
-import type { AESMessage } from '~/insomnia-data';
-
 export type { AESMessage };
 
 /**

packages/insomnia/src/account/session.ts

@@ -1,7 +1,6 @@
 import { getEncryptionKeys, getUserProfile, logout as logoutAPI } from 'insomnia-api';
-
-import type { GitRepository, Project, WorkspaceMeta } from '~/insomnia-data';
-import { models, services } from '~/insomnia-data';
+import type { GitRepository, Project, WorkspaceMeta } from 'insomnia-data';
+import { models, services } from 'insomnia-data';
 
 import { AI_PLUGIN_NAME, LLM_BACKENDS } from '../common/constants';
 import { database } from '../common/database';

packages/insomnia/src/common/__fixtures__/nestedfolders.ts

@@ -1,5 +1,5 @@
-import type { BaseModel } from '~/insomnia-data';
-import { models } from '~/insomnia-data';
+import type { BaseModel } from 'insomnia-data';
+import { models } from 'insomnia-data';
 
 const { workspace, requestGroup, request } = models;
 

packages/insomnia/src/common/__tests__/constants.test.ts

@@ -1,7 +1,6 @@
+import type { MockServer } from 'insomnia-data';
 import { describe, expect, it } from 'vitest';
 
-import type { MockServer } from '~/insomnia-data';
-
 import {
   FLEXIBLE_URL_REGEX,
   getContentTypeName,

packages/insomnia/src/common/__tests__/get-workspace-label.test.ts

@@ -1,9 +1,8 @@
+import type { Workspace } from 'insomnia-data';
+import { models } from 'insomnia-data';
+import { strings } from 'insomnia-data/common';
 import { describe, expect, it } from 'vitest';
 
-import type { Workspace } from '~/insomnia-data';
-import { models } from '~/insomnia-data';
-import { strings } from '~/insomnia-data/common';
-
 import { getWorkspaceLabel } from '../get-workspace-label';
 
 describe('getWorkspaceLabel', () => {

packages/insomnia/src/common/__tests__/har.test.ts

@@ -12,9 +12,8 @@ vi.mock('~/network/network-adapter', () => ({
   applyRequestHooks: (request: any) => Promise.resolve(request),
   applyResponseHooks: (response: any) => Promise.resolve(response),
 }));
-
-import type { Cookie, Request, Response } from '~/insomnia-data';
-import { models, services } from '~/insomnia-data';
+import type { Cookie, Request, Response } from 'insomnia-data';
+import { models, services } from 'insomnia-data';
 
 import { database as db } from '../../common/database';
 import { exportHar, exportHarResponse, exportHarWithRequest } from '../har';

packages/insomnia/src/common/__tests__/import-v5-parser.test.ts

@@ -31,7 +31,7 @@ import {
 beforeAll(() => {
   // Make tests deterministic when schema uses crypto.randomUUID()
   if (!globalThis.crypto || typeof globalThis.crypto.randomUUID !== 'function') {
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+     
     // @ts-ignore
     globalThis.crypto = {
       randomUUID: () => '00000000-0000-4000-8000-000000000000',

packages/insomnia/src/common/__tests__/import.test.ts

@@ -1,11 +1,10 @@
 import fs from 'node:fs';
 import path from 'node:path';
 
+import { EnvironmentKvPairDataType, EnvironmentType, services } from 'insomnia-data';
 import { describe, expect, it, vi } from 'vitest';
 import { parse } from 'yaml';
 
-import { EnvironmentKvPairDataType, EnvironmentType, services } from '~/insomnia-data';
-
 import * as importUtil from '../import';
 import { INSOMNIA_SCHEMA_VERSION } from '../insomnia-schema-migrations/schema-version';
 import { tryImportV5Data } from '../insomnia-v5';

packages/insomnia/src/common/__tests__/insomnia-v5.test.ts

@@ -5,12 +5,11 @@
  * ensuring they work correctly and handle edge cases properly.
  */
 
+import type { Request } from 'insomnia-data';
+import { EnvironmentKvPairDataType, services } from 'insomnia-data';
 import { beforeEach, describe, expect, it } from 'vitest';
 import YAML from 'yaml';
 
-import type { Request } from '~/insomnia-data';
-import { EnvironmentKvPairDataType, services } from '~/insomnia-data';
-
 import { INSOMNIA_SCHEMA_VERSION } from '../../common/insomnia-schema-migrations/schema-version';
 import { database as db } from '../database';
 import {

packages/insomnia/src/common/__tests__/render.test.ts

@@ -1,10 +1,9 @@
 // @ts-nocheck
 import { createBuilder } from '@develohpanda/fluent-builder';
+import type { Environment, Workspace } from 'insomnia-data';
+import { services } from 'insomnia-data';
 import { beforeEach, describe, expect, it } from 'vitest';
 
-import type { Environment, Workspace } from '~/insomnia-data';
-import { services } from '~/insomnia-data';
-
 import { environmentModelSchema, requestGroupModelSchema } from '../../sync/__schemas__/model-schemas';
 import * as renderUtils from '../render';
 

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,

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';

packages/insomnia/src/common/constants.ts

@@ -1,5 +1,5 @@
-import type { MockServer } from '~/insomnia-data';
+import type { MockServer } from 'insomnia-data';
 import {
   CONTENT_TYPE_FORM_URLENCODED,
   CONTENT_TYPE_GRAPHQL,
   CONTENT_TYPE_JSON,
@@ -8,7 +8,7 @@
   isWindows,
   METHOD_GET,
   platform,
-} from '~/insomnia-data/common';
+} from 'insomnia-data/common';
 
 import appConfig from '../../config/config.json';
 import { version } from '../../package.json';
@@ -211,7 +211,7 @@
 export const METHOD_GRPC = 'GRPC';
 
 // Content Types
-export { CONTENT_TYPE_FORM_URLENCODED, CONTENT_TYPE_GRAPHQL, CONTENT_TYPE_JSON } from '~/insomnia-data/common';
+export { CONTENT_TYPE_FORM_URLENCODED, CONTENT_TYPE_GRAPHQL, CONTENT_TYPE_JSON } from 'insomnia-data/common';
 export const CONTENT_TYPE_PLAINTEXT = 'text/plain';
 export const CONTENT_TYPE_XML = 'application/xml';
 export const CONTENT_TYPE_YAML = 'application/yaml';

packages/insomnia/src/common/cookies.ts

@@ -1,7 +1,6 @@
+import type { Cookie } from 'insomnia-data';
 import { Cookie as ToughCookie, CookieJar, type CookieJSON } from 'tough-cookie';
 
-import type { Cookie } from '~/insomnia-data';
-
 /**
  * Get a list of cookie objects from a request.jar()
  */

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';

packages/insomnia/src/common/get-workspace-label.ts

@@ -1,8 +1,7 @@
 import type { IconProp } from '@fortawesome/fontawesome-svg-core';
-
-import type { Workspace, WorkspaceScope } from '~/insomnia-data';
-import { models } from '~/insomnia-data';
-import { strings } from '~/insomnia-data/common';
+import type { Workspace, WorkspaceScope } from 'insomnia-data';
+import { models } from 'insomnia-data';
+import { strings } from 'insomnia-data/common';
 
 export type ProjectScopeKeys = WorkspaceScope | 'unsynced';