feat: migrate models to insomnia-data - p7 (#9743)

* add initial migration
* remove use unused functions

Author: cwangsmv

packages/insomnia-inso/src/cli.ts

@@ -21,9 +21,9 @@ import orderedJSON from 'json-order';
 import { parseArgsStringToArgv } from 'string-argv';
 import { v4 as uuidv4 } from 'uuid';
 
+import type { Workspace } from '~/insomnia-data';
 import { initServices } from '~/insomnia-data';
 import { servicesNodeImpl } from '~/insomnia-data/node';
-import type { Workspace } from '~/models/workspace';
 
 import type { RequestTestResult } from '../../insomnia-scripting-environment/src/objects';
 import packageJson from '../package.json';

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

@@ -4,9 +4,9 @@ import nodePath from 'node:path';
 import type { Consola } from 'consola';
 import { pick } from 'es-toolkit';
 
+import type { Workspace } from '~/insomnia-data';
 import type { Environment, UserUploadEnvironment } from '~/models/environment';
 import type { Request, RequestAuthentication, RequestHeader } from '~/models/request';
-import type { Workspace } from '~/models/workspace';
 import { typedKeys } from '~/utils';
 
 import type { RequestTestResult } from '../../../../insomnia-scripting-environment/src/objects';

packages/insomnia/src/account/session.ts

@@ -1,13 +1,12 @@
 import { logout as logoutAPI, whoami } from 'insomnia-api';
 
-import type { GitRepository } from '~/insomnia-data';
+import type { GitRepository, WorkspaceMeta } from '~/insomnia-data';
 import { services } from '~/insomnia-data';
 
 import { AI_PLUGIN_NAME, LLM_BACKENDS } from '../common/constants';
 import { database } from '../common/database';
 import { project, workspaceMeta } from '../models';
 import { EMPTY_GIT_PROJECT_ID, type Project } from '../models/project';
-import type { WorkspaceMeta } from '../models/workspace-meta';
 import * as crypt from './crypt';
 
 export interface SessionData {
@@ -227,7 +226,7 @@ async function _removeGitRepository(repo: GitRepository) {
 
   const workspaceMetas = await database.find<WorkspaceMeta>(workspaceMeta.type, { gitRepositoryId: repo._id });
   for (const wsMeta of workspaceMetas) {
-    await workspaceMeta.update(wsMeta, { gitRepositoryId: null });
+    await services.workspaceMeta.update(wsMeta, { gitRepositoryId: null });
   }
   await services.gitRepository.remove(repo);
 }

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

@@ -21,7 +21,7 @@ describe('export', () => {
 
   describe('exportHar()', () => {
     it('exports single requests', async () => {
-      const wrk = await models.workspace.create({
+      const wrk = await services.workspace.create({
         _id: 'wrk_1',
         name: 'Workspace',
       });
@@ -145,7 +145,7 @@ describe('export', () => {
     });
 
     it('exports multiple requests', async () => {
-      const workspace = await models.workspace.create({
+      const workspace = await services.workspace.create({
         _id: 'wrk_1',
         name: 'Workspace',
       });
@@ -394,7 +394,7 @@ describe('export', () => {
 
   describe('exportHarWithRequest()', () => {
     it('renders does it correctly', async () => {
-      const workspace = await models.workspace.create();
+      const workspace = await services.workspace.create();
       const cookies: Cookie[] = [
         {
           id: '',
@@ -487,7 +487,7 @@ describe('export', () => {
     });
 
     it('export multipart request with file', async () => {
-      const workspace = await models.workspace.create();
+      const workspace = await services.workspace.create();
       const request: Request = {
         ...models.request.init(),
         _id: 'req_123',

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

@@ -4,7 +4,9 @@ import path from 'node:path';
 import { describe, expect, it } from 'vitest';
 import { parse } from 'yaml';
 
-import { environment, project, request, requestGroup, workspace } from '../../models';
+import { services } from '~/insomnia-data';
+
+import { environment, project, request, requestGroup } from '../../models';
 import { EnvironmentKvPairDataType } from '../../models/environment';
 import * as importUtil from '../import';
 import { INSOMNIA_SCHEMA_VERSION } from '../insomnia-schema-migrations/schema-version';
@@ -159,8 +161,8 @@ describe('importRaw()', () => {
       projectId: projectToImportTo._id,
     });
 
-    const workspacesCount = await workspace.count();
-    const projectWorkspaces = await workspace.findByParentId(projectToImportTo._id);
+    const workspacesCount = await services.workspace.count();
+    const projectWorkspaces = await services.workspace.findByParentId(projectToImportTo._id);
     const curlRequests = await request.findByParentId(projectWorkspaces[0]._id);
 
     expect(workspacesCount).toBe(1);
@@ -176,7 +178,7 @@ describe('importRaw()', () => {
     const fixturePath = path.join(__dirname, '..', '__fixtures__', 'curl', 'complex-input.sh');
     const content = fs.readFileSync(fixturePath, 'utf8').toString();
 
-    const existingWorkspace = await workspace.create();
+    const existingWorkspace = await services.workspace.create();
 
     const scanResult = await importUtil.scanResources([
       {
@@ -217,7 +219,7 @@ describe('importRaw()', () => {
       projectId: projectToImportTo._id,
     });
 
-    const projectWorkspaces = await workspace.findByParentId(projectToImportTo._id);
+    const projectWorkspaces = await services.workspace.findByParentId(projectToImportTo._id);
 
     const requestGroups = await requestGroup.findByParentId(projectWorkspaces[0]._id);
     const requests = await request.findByParentId(requestGroups[0]._id);
@@ -231,7 +233,7 @@ describe('importRaw()', () => {
     const fixturePath = path.join(__dirname, '..', '__fixtures__', 'postman', 'aws-signature-auth-v2_0-input.json');
     const content = fs.readFileSync(fixturePath, 'utf8').toString();
 
-    const existingWorkspace = await workspace.create();
+    const existingWorkspace = await services.workspace.create();
 
     const scanResult = await importUtil.scanResources([
       {
@@ -295,7 +297,7 @@ describe('importRaw()', () => {
       projectId: projectToImportTo._id,
     });
 
-    const projectWorkspaces = await workspace.findByParentId(projectId);
+    const projectWorkspaces = await services.workspace.findByParentId(projectId);
     const importedWorkspaceId = projectWorkspaces[0]._id;
     const requestBaseEnvironment = await environment.getByParentId(importedWorkspaceId);
 
@@ -317,7 +319,7 @@ describe('importRaw()', () => {
     );
     const content = fs.readFileSync(fixturePath, 'utf8').toString();
 
-    const existingWorkspace = await workspace.create();
+    const existingWorkspace = await services.workspace.create();
     const workspaceId = existingWorkspace._id;
     const baseEnvironment = await environment.getOrCreateForParentId(workspaceId);
     await environment.update(baseEnvironment, {
@@ -358,7 +360,7 @@ describe('importRaw()', () => {
     );
     const content = fs.readFileSync(fixturePath, 'utf8').toString();
 
-    const existingWorkspace = await workspace.create();
+    const existingWorkspace = await services.workspace.create();
     const workspaceId = existingWorkspace._id;
     const baseEnvironmentPair = [
       {
@@ -421,7 +423,7 @@ describe('importRaw()', () => {
     );
     const content = fs.readFileSync(fixturePath, 'utf8').toString();
 
-    const existingWorkspace = await workspace.create();
+    const existingWorkspace = await services.workspace.create();
     const workspaceId = existingWorkspace._id;
     const baseEnvironmentPair = [
       {

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

@@ -34,7 +34,7 @@ describe('Insomnia v5 Import/Export - Comprehensive Tests', () => {
       name: 'Test Project',
     });
 
-    await models.workspace.create({
+    await services.workspace.create({
       _id: 'wrk_test',
       name: 'Test Workspace',
       parentId: 'proj_test',
@@ -159,7 +159,7 @@ collection: []
 
   describe('getInsomniaV5DataExport', () => {
     it('exports workspace with requests correctly', async () => {
-      const workspace = await models.workspace.create({
+      const workspace = await services.workspace.create({
         _id: 'wrk_export_test',
         name: 'Export Test Workspace',
         parentId: 'proj_test',
@@ -205,7 +205,7 @@ collection: []
     });
 
     it('handles empty workspace gracefully', async () => {
-      const workspace = await models.workspace.create({
+      const workspace = await services.workspace.create({
         _id: 'wrk_empty_test',
         name: 'Empty Workspace',
         parentId: 'proj_test',
@@ -231,7 +231,7 @@ collection: []
     });
 
     it('filters requests when requestIds are provided', async () => {
-      const workspace = await models.workspace.create({
+      const workspace = await services.workspace.create({
         _id: 'wrk_filter_test',
         name: 'Filter Workspace',
         parentId: 'proj_test',
@@ -273,7 +273,7 @@ collection: []
     });
 
     it('handles design workspace correctly', async () => {
-      const workspace = await models.workspace.create({
+      const workspace = await services.workspace.create({
         _id: 'wrk_design_test',
         name: 'Design Workspace',
         parentId: 'proj_test',
@@ -304,14 +304,14 @@ collection: []
     });
 
     it('handles mock server scope', async () => {
-      const workspace = await models.workspace.create({
+      const workspace = await services.workspace.create({
         _id: 'wrk_mock',
         name: 'Mock Workspace',
         parentId: 'proj_test',
         scope: 'mock-server',
       });
 
-      await models.mockServer.create({
+      await services.mockServer.create({
         _id: 'mock_1',
         name: 'Test Server',
         parentId: workspace._id,
@@ -329,7 +329,7 @@ collection: []
     });
 
     it('handles mcp client scope', async () => {
-      const workspace = await models.workspace.create({
+      const workspace = await services.workspace.create({
         _id: 'wrk_mcp',
         name: 'MCP Workspace',
         parentId: 'proj_test',

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

@@ -1,12 +1,12 @@
 import { createBuilder } from '@develohpanda/fluent-builder';
 import { beforeEach, describe, expect, it } from 'vitest';
 
+import type { Workspace } from '~/insomnia-data';
 import { services } from '~/insomnia-data';
 
 import * as models from '../../models';
 import { environmentModelSchema, requestGroupModelSchema } from '../../models/__schemas__/model-schemas';
 import type { Environment } from '../../models/environment';
-import type { Workspace } from '../../models/workspace';
 import * as renderUtils from '../render';
 
 const envBuilder = createBuilder(environmentModelSchema);
@@ -625,15 +625,15 @@ describe('render tests', () => {
 
   describe('getRenderedGrpcRequestMessage()', () => {
     it('renders only the body for a grpc request ', async () => {
-      const w1 = await models.workspace.create();
+      const w1 = await services.workspace.create();
       const env = await models.environment.create({
         parentId: w1._id,
         data: {
           foo: 'bar',
           host: 'testb.in:9000',
         },
       });
-      const grpcRequest = await models.grpcRequest.create({
+      const grpcRequest = await services.grpcRequest.create({
         parentId: w1._id,
         name: 'hi {{ foo }}',
         url: '{{ host }}',
@@ -656,7 +656,7 @@ describe('render tests', () => {
     let env: Environment;
 
     beforeEach(async () => {
-      w1 = await models.workspace.create();
+      w1 = await services.workspace.create();
       env = await models.environment.create({
         parentId: w1._id,
         data: {
@@ -667,7 +667,7 @@ describe('render tests', () => {
     });
 
     it('renders all grpc request properties', async () => {
-      const grpcRequest = await models.grpcRequest.create({
+      const grpcRequest = await services.grpcRequest.create({
         parentId: w1._id,
         name: 'hi {{ foo }}',
         url: '{{ host }}',
@@ -690,7 +690,7 @@ describe('render tests', () => {
     });
 
     it('renders but ignores the body for a grpc request ', async () => {
-      const grpcRequest = await models.grpcRequest.create({
+      const grpcRequest = await services.grpcRequest.create({
         parentId: w1._id,
         name: 'hi {{ foo }}',
         url: '{{ host }}',
@@ -717,7 +717,7 @@ describe('render tests', () => {
     });
 
     it('should still render with bad description', async () => {
-      const grpcRequest = await models.grpcRequest.create({
+      const grpcRequest = await services.grpcRequest.create({
         parentId: w1._id,
         name: 'hi {{ foo }}',
         url: '{{ host }}',

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

@@ -1,20 +1,19 @@
 import { describe, expect, it } from 'vitest';
 
 import * as models from '../../models';
-import { WorkspaceScopeKeys } from '../../models/workspace';
 import { getWorkspaceLabel } from '../get-workspace-label';
 import { strings } from '../strings';
 
 describe('getWorkspaceLabel', () => {
   it('should return document label', () => {
     const w = models.workspace.init();
-    w.scope = WorkspaceScopeKeys.design;
+    w.scope = models.workspace.WorkspaceScopeKeys.design;
     expect(getWorkspaceLabel(w)).toBe(strings.document);
   });
 
   it('should return collection label', () => {
     const w = models.workspace.init();
-    w.scope = WorkspaceScopeKeys.collection;
+    w.scope = models.workspace.WorkspaceScopeKeys.collection;
     expect(getWorkspaceLabel(w)).toBe(strings.collection);
   });
 });

packages/insomnia/src/common/constants.ts

@@ -1,6 +1,7 @@
+import type { MockServer } from '~/insomnia-data';
+
 import appConfig from '../../config/config.json';
 import { version } from '../../package.json';
-import type { MockServer } from '../models/mock-server';
 import { isLinux, isMac, isWindows, platform } from './platform';
 
 // Vite is filtering out process.env variables that are not prefixed with VITE_.

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

@@ -1,6 +1,8 @@
 import type { IconProp } from '@fortawesome/fontawesome-svg-core';
 
-import { isDesign, isEnvironment, isMcp, isMockServer, type Workspace, type WorkspaceScope } from '../models/workspace';
+import type { Workspace, WorkspaceScope } from '~/insomnia-data';
+import { models } from '~/insomnia-data';
+
 import { strings } from './strings';
 
 export type ProjectScopeKeys = WorkspaceScope | 'unsynced';
@@ -45,19 +47,19 @@ export const scopeToTextColorMap: Record<ProjectScopeKeys, string> = {
 };
 
 export const getWorkspaceLabel = (workspace: Workspace) => {
-  if (isDesign(workspace)) {
+  if (models.workspace.isDesign(workspace)) {
     return strings.document;
   }
 
-  if (isMockServer(workspace)) {
+  if (models.workspace.isMockServer(workspace)) {
     return strings.mock;
   }
 
-  if (isEnvironment(workspace)) {
+  if (models.workspace.isEnvironment(workspace)) {
     return strings.environment;
   }
 
-  if (isMcp(workspace)) {
+  if (models.workspace.isMcp(workspace)) {
     return strings.mcp;
   }