instant-cli 0.22.95-experimental.drewh-fix-expand-wrap.20385945911.1 → 0.22.95-experimental.surgical.20386112228.1

package/.turbo/turbo-build.log

@@ -1,4 +1,4 @@
 
-> instant-cli@0.22.95-experimental.drewh-fix-expand-wrap.20385945911.1 build /home/runner/work/instant/instant/client/packages/cli
+> instant-cli@0.22.95-experimental.surgical.20386112228.1 build /home/runner/work/instant/instant/client/packages/cli
 > rm -rf dist; tsc -p tsconfig.json
 

package/__tests__/updateSchemaFile.test.ts

@@ -0,0 +1,135 @@
+import { test, expect } from 'vitest';
+import { i, schemaTypescriptFileToInstantSchema } from '@instantdb/platform';
+import { updateSchemaFile } from '../src/util/updateSchemaFile';
+
+test('preserves type annotations while adding entities', async () => {
+  const oldFile = `
+import { i } from '@instantdb/core';
+import { Label } from './types';
+
+const _schema = i.schema({
+  entities: {
+    todos: i.entity({
+      title: i.string(),
+      status: i.string<'todo' | 'done'>(),
+      labels: i.json<Label[]>(),
+    }),
+  },
+  links: {},
+  rooms: {},
+});
+
+export default _schema;
+`;
+
+  const serverSchema = i.schema({
+    entities: {
+      todos: i.entity({
+        title: i.string(),
+        status: i.string(),
+        labels: i.json(),
+      }),
+      projects: i.entity({
+        name: i.string(),
+      }),
+    },
+    links: {},
+  });
+
+  const localSchema = schemaTypescriptFileToInstantSchema(oldFile);
+  const result = await updateSchemaFile(oldFile, localSchema, serverSchema);
+
+  expect(result).toContain("status: i.string<'todo' | 'done'>()");
+  expect(result).toContain('labels: i.json<Label[]>()');
+  expect(result).toContain("import { Label } from './types';");
+  expect(result).toContain('projects: i.entity({');
+});
+
+test('removes deleted entities and attributes', async () => {
+  const oldFile = `
+import { i } from '@instantdb/core';
+
+const _schema = i.schema({
+  entities: {
+    todos: i.entity({
+      title: i.string(),
+      priority: i.number(),
+    }),
+    oldEntity: i.entity({
+      data: i.json(),
+    }),
+  },
+  links: {},
+  rooms: {},
+});
+
+export default _schema;
+`;
+
+  const serverSchema = i.schema({
+    entities: {
+      todos: i.entity({
+        title: i.string(),
+      }),
+    },
+    links: {},
+  });
+
+  const localSchema = schemaTypescriptFileToInstantSchema(oldFile);
+  const result = await updateSchemaFile(oldFile, localSchema, serverSchema);
+
+  expect(result).not.toContain('oldEntity');
+  expect(result).not.toContain('priority: i.number()');
+  expect(result).toContain('title: i.string()');
+});
+
+test('updates constraints and adds links', async () => {
+  const oldFile = `
+import { i } from '@instantdb/core';
+
+const _schema = i.schema({
+  entities: {
+    todos: i.entity({
+      title: i.string(),
+      status: i.string<'todo' | 'done'>(),
+    }),
+    users: i.entity({
+      email: i.string(),
+    }),
+  },
+  links: {},
+  rooms: {},
+});
+
+export default _schema;
+`;
+
+  const serverSchema = i.schema({
+    entities: {
+      todos: i.entity({
+        title: i.string().unique().indexed().optional(),
+        status: i.string(),
+      }),
+      users: i.entity({
+        email: i.string().unique(),
+      }),
+    },
+    links: {
+      todoOwner: {
+        forward: { on: 'todos', has: 'one', label: 'owner' },
+        reverse: { on: 'users', has: 'many', label: 'todos' },
+      },
+    },
+  });
+
+  const localSchema = schemaTypescriptFileToInstantSchema(oldFile);
+  const result = await updateSchemaFile(oldFile, localSchema, serverSchema);
+
+  expect(result).toContain('title: i.string().unique().indexed().optional()');
+  expect(result).toContain("status: i.string<'todo' | 'done'>()");
+  expect(result).toContain('todoOwner: {');
+  expect(result).toContain("on: 'todos'");
+  expect(result).toContain("label: 'owner'");
+  expect(result).toContain("on: 'users'");
+  expect(result).toContain("label: 'todos'");
+});

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.js"],"names":[],"mappings":"AAo8DA,8EAQC;AA+ED;;;;;EAKE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.js"],"names":[],"mappings":"AA68DA,8EAQC;AA+ED;;;;;EAKE"}

package/dist/index.js

@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 // @ts-check
 import { generatePermsTypescriptFile, apiSchemaToInstantSchemaDef, generateSchemaTypescriptFile, diffSchemas, convertTxSteps, validateSchema, SchemaValidationError, PlatformApi, } from '@instantdb/platform';
 import version from './version.js';
-import { existsSync } from 'fs';
 import { mkdir, writeFile, readFile, unlink } from 'fs/promises';
 import path, { join } from 'path';
 import { randomUUID } from 'crypto';
@@ -38,7 +37,7 @@ import { buildAutoRenameSelector } from './rename.js';
 import { loadEnv } from './util/loadEnv.js';
 import { isHeadlessEnvironment } from './util/isHeadlessEnvironment.js';
 import { getSchemaReadCandidates, getPermsReadCandidates, getSchemaPathToWrite, getPermsPathToWrite, } from './util/findConfigCandidates.js';
-import { mergeSchema } from './util/mergeSchema.js';
+import { updateSchemaFile } from './util/updateSchemaFile.js';
 const execAsync = promisify(exec);
 loadEnv();
 const dev = Boolean(process.env.INSTANT_CLI_DEV);
@@ -354,7 +353,7 @@ program
     .argument('[schema|perms|all]', 'Which configuration to push. Defaults to `all`')
     .option('-a --app <app-id>', 'App ID to push to. Defaults to *_INSTANT_APP_ID in .env')
     .option('-p --package <react|react-native|core|admin>', 'Which package to automatically install if there is not one installed already.')
-    .option('--experimental-type-preservation', "[Experimental] Preserve manual type changes like `status: i.json<'online' | 'offline'>()` when doing `instant-cli pull schema`")
+    .option('--experimental-type-preservation', '[Experimental] Preserve manual type changes and schema edits when pulling schema')
     .description('Pull schema and perm files from production.')
     .addHelpText('after', `
 Environment Variables:
@@ -1017,16 +1016,20 @@ function pullSchema(appId_1, _a) {
         }
         const shortSchemaPath = getSchemaPathToWrite(prev === null || prev === void 0 ? void 0 : prev.path);
         const schemaPath = join(pkgDir, shortSchemaPath);
-        let newSchemaContent = generateSchemaTypescriptFile(prev === null || prev === void 0 ? void 0 : prev.schema, apiSchemaToInstantSchemaDef(pullRes.data.schema), instantModuleName);
+        const serverSchema = apiSchemaToInstantSchemaDef(pullRes.data.schema);
+        let newSchemaContent;
         if (prev && experimentalTypePreservation) {
             try {
                 const oldSchemaContent = yield readFile(prev.path, 'utf-8');
-                newSchemaContent = mergeSchema(oldSchemaContent, newSchemaContent);
+                newSchemaContent = yield updateSchemaFile(oldSchemaContent, prev.schema, serverSchema);
             }
             catch (e) {
-                warn('Failed to merge schema with existing file. Overwriting instead.', e);
+                warn('Failed to update schema with existing file. Overwriting instead.', e);
             }
         }
+        if (!newSchemaContent) {
+            newSchemaContent = generateSchemaTypescriptFile(prev === null || prev === void 0 ? void 0 : prev.schema, serverSchema, instantModuleName);
+        }
         yield writeTypescript(schemaPath, newSchemaContent, 'utf-8');
         console.log('✅ Wrote schema to ' + shortSchemaPath);
         return { ok: true };