pr suggestions

Author: paula-stacho

package-lock.json

@@ -24,7 +24,7 @@ class DataModelStorageElectron implements DataModelStorage {
   async loadAll(): Promise<MongoDBDataModelDescription[]> {
     try {
       const res = await this.userData.readAll();
-      return res.data as MongoDBDataModelDescription[];
+      return res.data;
     } catch (err) {
       return [];
     }

packages/compass-data-modeling/src/services/data-model-storage-electron.tsx

@@ -21,7 +21,10 @@ export const StaticModelSchema = z.object({
   collections: z.array(
     z.object({
       ns: z.string(),
-      jsonSchema: z.unknown(), // skipped for simplicity
+      jsonSchema: z.custom<MongoDBJSONSchema>((value) => {
+        const isObject = typeof value === 'object' && value !== null;
+        return isObject && 'bsonType' in value;
+      }),
       indexes: z.array(z.record(z.unknown())),
       shardKey: z.record(z.unknown()).optional(),
       displayPosition: z.tuple([z.number(), z.number()]),
@@ -30,49 +33,31 @@ export const StaticModelSchema = z.object({
   relationships: z.array(RelationshipSchema),
 });
 
-export type StaticModel = Omit<
-  z.output<typeof StaticModelSchema>,
-  'collections'
-> & {
-  collections: Array<
-    Omit<
-      z.output<typeof StaticModelSchema>['collections'][number],
-      'jsonSchema'
-    > & {
-      jsonSchema: MongoDBJSONSchema;
-    }
-  >;
-};
+export type StaticModel = z.output<typeof StaticModelSchema>;
+
+const EditSchemaBase = z.object({
+  id: z.string().uuid(),
+  timestamp: z.string().datetime(),
+});
 
-export const EditSchema = z.discriminatedUnion('type', [
+const EditSchemaVariants = z.discriminatedUnion('type', [
   z.object({
     type: z.literal('SetModel'),
-    id: z.string(),
-    timestamp: z.string(),
     model: StaticModelSchema,
   }),
   z.object({
     type: z.literal('AddRelationship'),
-    id: z.string(),
-    timestamp: z.string(),
     relationship: RelationshipSchema,
   }),
   z.object({
     type: z.literal('RemoveRelationship'),
-    id: z.string(),
-    timestamp: z.string(),
-    relationshipId: z.string(),
+    relationshipId: z.string().uuid(),
   }),
 ]);
 
-type BaseEdit = z.output<typeof EditSchema>;
-type SetModelEdit = Omit<Extract<BaseEdit, { type: 'SetModel' }>, 'model'> & {
-  model: StaticModel;
-};
+export const EditSchema = z.intersection(EditSchemaBase, EditSchemaVariants);
 
-export type Edit =
-  | SetModelEdit
-  | Extract<BaseEdit, { type: 'AddRelationship' | 'RemoveRelationship' }>;
+export type Edit = z.output<typeof EditSchema>;
 
 export const validateEdit = (
   edit: unknown
@@ -106,12 +91,9 @@ export const MongoDBDataModelDescriptionSchema = z.object({
   edits: z.array(EditSchema).default([]),
 });
 
-export type MongoDBDataModelDescription = Omit<
-  z.output<typeof MongoDBDataModelDescriptionSchema>,
-  'edits'
-> & {
-  edits: Array<Edit>;
-};
+export type MongoDBDataModelDescription = z.output<
+  typeof MongoDBDataModelDescriptionSchema
+>;
 
 export interface DataModelStorage {
   save(description: MongoDBDataModelDescription): Promise<boolean>;

packages/compass-data-modeling/src/services/data-model-storage.ts

@@ -59,8 +59,7 @@
     "js-yaml": "^4.1.0",
     "lodash": "^4.17.21",
     "react": "^17.0.2",
-    "yargs-parser": "^21.1.1",
-    "zod": "^3.24.4"
+    "yargs-parser": "^21.1.1"
   },
   "devDependencies": {
     "@mongodb-js/eslint-config-compass": "^1.3.8",

packages/compass-preferences-model/package.json

@@ -7,7 +7,7 @@ import yargsParser from 'yargs-parser';
 import { kebabCase } from 'lodash';
 import type { AllPreferences } from './preferences-schema';
 import { allPreferencesProps } from './preferences-schema';
-import type { z } from 'zod';
+import type { z } from '@mongodb-js/compass-user-data';
 
 import { createLogger } from '@mongodb-js/compass-logging';
 const { log, mongoLogId } = createLogger('COMPASS-PREFERENCES');

packages/compass-preferences-model/src/global-config.ts

@@ -1,5 +1,4 @@
-import type { z } from 'zod';
-import { UserData } from '@mongodb-js/compass-user-data';
+import { type z, UserData } from '@mongodb-js/compass-user-data';
 import {
   getDefaultsForStoredPreferences,
   getPreferencesValidator,

packages/compass-preferences-model/src/preferences-persistent-storage.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { z } from 'zod';
+import { z } from '@mongodb-js/compass-user-data';
 import {
   type FeatureFlagDefinition,
   type FeatureFlags,

packages/compass-preferences-model/src/preferences-schema.tsx

@@ -1,4 +1,4 @@
-import { z } from 'zod';
+import { z } from '@mongodb-js/compass-user-data';
 import { type Logger } from '@mongodb-js/compass-logging';
 
 import type { ParsedGlobalPreferencesResult } from './global-config';

packages/compass-preferences-model/src/preferences.ts

@@ -1,4 +1,4 @@
-import { z } from 'zod';
+import { z } from '@mongodb-js/compass-user-data';
 import { expect } from 'chai';
 import os from 'os';
 import path from 'path';

packages/compass-preferences-model/src/user-storage.spec.ts

@@ -1,4 +1,4 @@
-import { z } from 'zod';
+import { z } from '@mongodb-js/compass-user-data';
 import { UUID } from 'bson';
 import { UserData } from '@mongodb-js/compass-user-data';