instant-cli 0.22.95 → 0.22.96-experimental.add-posthog-frontend.20386914944.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "instant-cli",
   "type": "module",
-  "version": "0.22.95",
+  "version": "0.22.96-experimental.add-posthog-frontend.20386914944.1",
   "description": "Instant's CLI",
   "homepage": "https://github.com/instantdb/instant/tree/main/client/packages/cli",
   "repository": {
@@ -21,8 +21,6 @@
     "instant-cli": "bin/index.js"
   },
   "dependencies": {
-    "acorn": "^8.15.0",
-    "acorn-typescript": "^1.4.13",
     "ansi-escapes": "4.3.2",
     "boxen": "^8.0.1",
     "chalk": "^5.3.0",
@@ -41,9 +39,9 @@
     "strip-ansi": "^7.1.2",
     "terminal-link": "^3.0.0",
     "unconfig": "^0.5.5",
-    "@instantdb/platform": "0.22.95",
-    "@instantdb/version": "0.22.95",
-    "@instantdb/core": "0.22.95"
+    "@instantdb/core": "0.22.96-experimental.add-posthog-frontend.20386914944.1",
+    "@instantdb/version": "0.22.96-experimental.add-posthog-frontend.20386914944.1",
+    "@instantdb/platform": "0.22.96-experimental.add-posthog-frontend.20386914944.1"
   },
   "devDependencies": {
     "@babel/core": "^7.17.9",

package/src/index.js

@@ -50,7 +50,6 @@ import {
   getSchemaPathToWrite,
   getPermsPathToWrite,
 } from './util/findConfigCandidates.js';
-import { mergeSchema } from './util/mergeSchema.js';
 
 const execAsync = promisify(exec);
 
@@ -479,10 +478,6 @@ program
     '-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`",
-  )
   .description('Pull schema and perm files from production.')
   .addHelpText(
     'after',
@@ -660,7 +655,7 @@ async function handlePull(bag, opts) {
     );
     return;
   }
-  await pull(bag, appId, { ...pkgAndAuthInfo, ...opts });
+  await pull(bag, appId, pkgAndAuthInfo);
 }
 
 async function push(bag, appId, opts) {
@@ -769,6 +764,7 @@ async function login(options) {
     debugName: 'Login register',
     errorMessage: 'Failed to register login.',
     noAuth: true,
+    command: 'login',
   });
 
   if (!registerRes.ok) {
@@ -934,6 +930,7 @@ async function promptCreateApp(opts) {
     method: 'GET',
     path: '/dash',
     errorMessage: 'Failed to fetch apps.',
+    command: 'init',
   });
   if (!res.ok) {
     return { ok: false };
@@ -966,6 +963,7 @@ async function promptCreateApp(opts) {
     debugName: 'App create',
     errorMessage: 'Failed to create app.',
     body: app,
+    command: 'init',
   });
 
   if (!appRes.ok) return { ok: false };
@@ -984,6 +982,7 @@ async function promptImportAppOrCreateApp() {
     method: 'GET',
     path: '/dash',
     errorMessage: 'Failed to fetch apps.',
+    command: 'init',
   });
   if (!res.ok) {
     return { ok: false };
@@ -1003,6 +1002,7 @@ async function promptImportAppOrCreateApp() {
             method: 'GET',
             path: `/dash/orgs/${orgId}`,
             errorMessage: 'Failed to fetch apps.',
+            command: 'init',
           });
           if (!orgsRes.ok) {
             throw new Error('Failed to fetch org apps');
@@ -1032,6 +1032,7 @@ async function createApp(title, orgId) {
     debugName: 'App create',
     errorMessage: 'Failed to create app.',
     body: app,
+    command: 'init',
   });
   if (!appRes.ok) throw new Error('Failed to create app');
   return { appId: id, adminToken: token };
@@ -1188,16 +1189,14 @@ async function getOrPromptPackageAndAuthInfoWithErrorLogging(opts) {
   return { pkgDir, projectType, instantModuleName, authToken };
 }
 
-async function pullSchema(
-  appId,
-  { pkgDir, instantModuleName, experimentalTypePreservation },
-) {
+async function pullSchema(appId, { pkgDir, instantModuleName }) {
   console.log('Pulling schema...');
 
   const pullRes = await fetchJson({
     path: `/dash/apps/${appId}/schema/pull`,
     debugName: 'Schema pull',
     errorMessage: 'Failed to pull schema.',
+    command: 'pull',
   });
 
   if (!pullRes.ok) return pullRes;
@@ -1229,26 +1228,16 @@ async function pullSchema(
   const shortSchemaPath = getSchemaPathToWrite(prev?.path);
   const schemaPath = join(pkgDir, shortSchemaPath);
 
-  let newSchemaContent = generateSchemaTypescriptFile(
-    prev?.schema,
-    apiSchemaToInstantSchemaDef(pullRes.data.schema),
-    instantModuleName,
+  await writeTypescript(
+    schemaPath,
+    generateSchemaTypescriptFile(
+      prev?.schema,
+      apiSchemaToInstantSchemaDef(pullRes.data.schema),
+      instantModuleName,
+    ),
+    'utf-8',
   );
 
-  if (prev && experimentalTypePreservation) {
-    try {
-      const oldSchemaContent = await readFile(prev.path, 'utf-8');
-      newSchemaContent = mergeSchema(oldSchemaContent, newSchemaContent);
-    } catch (e) {
-      warn(
-        'Failed to merge schema with existing file. Overwriting instead.',
-        e,
-      );
-    }
-  }
-
-  await writeTypescript(schemaPath, newSchemaContent, 'utf-8');
-
   console.log('✅ Wrote schema to ' + shortSchemaPath);
 
   return { ok: true };
@@ -1261,6 +1250,7 @@ async function pullPerms(appId, { pkgDir, instantModuleName }) {
     path: `/dash/apps/${appId}/perms/pull`,
     debugName: 'Perms pull',
     errorMessage: 'Failed to pull perms.',
+    command: 'pull',
   });
 
   if (!pullRes.ok) return pullRes;
@@ -1507,6 +1497,7 @@ async function waitForIndexingJobsToFinish(appId, data) {
       method: 'GET',
       path: `/dash/apps/${appId}/indexing-jobs/group/${groupId}`,
       errorMessage: 'Failed to check indexing status.',
+      command: 'push',
     });
     if (!res.ok) {
       break;
@@ -1576,6 +1567,7 @@ async function pushSchema(appId, opts) {
     path: `/dash/apps/${appId}/schema/pull`,
     debugName: 'Schema plan',
     errorMessage: 'Failed to get old schema.',
+    command: 'push',
   });
 
   if (!pulledSchemaResponse.ok) return pulledSchemaResponse;
@@ -1666,6 +1658,7 @@ async function pushSchema(appId, opts) {
       body: {
         steps: txSteps,
       },
+      command: 'push',
     });
     console.log(chalk.green('Schema updated!'));
     if (!applyRes.ok) return applyRes;
@@ -1690,6 +1683,7 @@ async function claimEphemeralApp(appId, adminToken) {
     path: `/dash/apps/ephemeral/${appId}/claim`,
     debugName: 'Claim ephemeral app',
     errorMessage: 'Failed to claim ephemeral app.',
+    command: 'claim',
   });
 
   if (!res.ok) return res;
@@ -1710,6 +1704,7 @@ async function pushPerms(appId) {
     path: `/dash/apps/${appId}/perms/pull`,
     debugName: 'Perms pull',
     errorMessage: 'Failed to pull perms.',
+    command: 'push',
   });
 
   if (!prodPerms.ok) return prodPerms;
@@ -1749,6 +1744,7 @@ async function pushPerms(appId) {
     body: {
       code: res.perms,
     },
+    command: 'push',
   });
 
   if (!permsRes.ok) return permsRes;
@@ -1769,6 +1765,7 @@ async function waitForAuthToken({ secret }) {
       body: { secret },
       noAuth: true,
       noLogError: true,
+      command: 'login',
     });
     if (authCheckRes.ok) {
       return authCheckRes.data;
@@ -1797,6 +1794,7 @@ async function waitForAuthToken({ secret }) {
  * @param {Object} [options.body=undefined]
  * @param {boolean} [options.noAuth]
  * @param {boolean} [options.noLogError]
+ * @param {string} [options.command] - The CLI command being executed (e.g., 'push', 'pull', 'login')
  * @returns {Promise<{ ok: boolean; data: any }>}
  */
 async function fetchJson({
@@ -1807,6 +1805,7 @@ async function fetchJson({
   method,
   noAuth,
   noLogError,
+  command,
 }) {
   const withAuth = !noAuth;
   const withErrorLogging = !noLogError;
@@ -1825,7 +1824,9 @@ async function fetchJson({
       headers: {
         ...(withAuth ? { Authorization: `Bearer ${authToken}` } : {}),
         'Content-Type': 'application/json',
-        'Instant-CLI-Version': version,
+        'X-Instant-Source': 'instant-cli',
+        'X-Instant-Version': version,
+        ...(command ? { 'X-Instant-Command': command } : {}),
       },
       body: body ? JSON.stringify(body) : undefined,
       signal: AbortSignal.timeout(timeoutMs),

package/__tests__/mergeSchema.test.ts

@@ -1,197 +0,0 @@
-import { describe, test, expect } from 'vitest';
-import { mergeSchema } from '../src/util/mergeSchema';
-
-test('preserves type annotations', () => {
-  const oldFile = `
-import { i } from '@instantdb/core';
-import { Label } from './types';
-
-const _schema = i.schema({
-  entities: {
-    $users: i.entity({
-      email: i.string().unique().indexed(),
-    }),
-    todos: i.entity({
-      title: i.string(),
-      status: i.string<'todo' | 'in_progress' | 'done'>(),
-      priority: i.number<1 | 2 | 3>(),
-      labels: i.json<Label[]>().optional(),
-    }),
-    projects: i.entity({
-      name: i.string(),
-    }),
-  },
-  links: {
-    todoProject: {
-      forward: { on: 'todos', has: 'one', label: 'project' },
-      reverse: { on: 'projects', has: 'many', label: 'todos' },
-    },
-    projectOwner: {
-      forward: { on: 'projects', has: 'one', label: 'owner' },
-      reverse: { on: '$users', has: 'many', label: 'projects' },
-    },
-  },
-  rooms: {
-    projectRoom: {
-      presence: i.entity({
-        cursor: i.json<{ x: number; y: number }>(),
-      }),
-    },
-  },
-});
-
-export default _schema;
-`;
-
-  const newFile = `
-import { i } from '@instantdb/core';
-
-const _schema = i.schema({
-  entities: {
-    $users: i.entity({
-      email: i.string().unique().indexed(),
-    }),
-    todos: i.entity({
-      title: i.string(),
-      status: i.string(),
-      priority: i.number(),
-      labels: i.json().optional(),
-    }),
-    projects: i.entity({
-      name: i.string(),
-    }),
-  },
-  links: {
-    todoProject: {
-      forward: { on: 'todos', has: 'one', label: 'project' },
-      reverse: { on: 'projects', has: 'many', label: 'todos' },
-    },
-    projectOwner: {
-      forward: { on: 'projects', has: 'one', label: 'owner' },
-      reverse: { on: '$users', has: 'many', label: 'projects' },
-    },
-  },
-  rooms: {
-    projectRoom: {
-      presence: i.entity({
-        cursor: i.json(),
-      }),
-    },
-  },
-});
-
-export default _schema;
-`;
-
-  const result = mergeSchema(oldFile, newFile);
-
-  // Type annotations preserved
-  expect(result).toContain("i.string<'todo' | 'in_progress' | 'done'>()");
-  expect(result).toContain('i.number<1 | 2 | 3>()');
-  expect(result).toContain('i.json<Label[]>()');
-  expect(result).toContain('i.json<{ x: number; y: number }>()');
-
-  // Import preserved
-  expect(result).toContain("import { Label } from './types';");
-});
-
-test('preserves different import styles', () => {
-  const oldFile = `
-import { i } from '@instantdb/core';
-import { Label } from './types';
-import { Tag as MyTag } from './types';
-import Priority from './Priority';
-import * as Models from './models';
-import type { Meta } from './meta';
-
-const _schema = i.schema({
-  entities: {
-    a: i.entity({ f: i.json<Label>() }),
-    b: i.entity({ f: i.json<MyTag>() }),
-    c: i.entity({ f: i.json<Priority>() }),
-    d: i.entity({ f: i.json<Models.Status>() }),
-    e: i.entity({ f: i.json<Meta>() }),
-  },
-});
-`;
-
-  const newFile = `
-import { i } from '@instantdb/core';
-
-const _schema = i.schema({
-  entities: {
-    a: i.entity({ f: i.json() }),
-    b: i.entity({ f: i.json() }),
-    c: i.entity({ f: i.json() }),
-    d: i.entity({ f: i.json() }),
-    e: i.entity({ f: i.json() }),
-  },
-});
-`;
-
-  const result = mergeSchema(oldFile, newFile);
-
-  // All import styles preserved (named imports from same module are combined)
-  expect(result).toContain('Label');
-  expect(result).toContain('Tag as MyTag');
-  expect(result).toContain("import Priority from './Priority';");
-  expect(result).toContain("import * as Models from './models';");
-  expect(result).toContain("import type { Meta } from './meta';");
-
-  // Type annotations preserved
-  expect(result).toContain('i.json<Label>()');
-  expect(result).toContain('i.json<MyTag>()');
-  expect(result).toContain('i.json<Priority>()');
-  expect(result).toContain('i.json<Models.Status>()');
-  expect(result).toContain('i.json<Meta>()');
-});
-
-test('handles entity additions and removals', () => {
-  const oldFile = `
-import { i } from '@instantdb/core';
-import { Label } from './types';
-
-const _schema = i.schema({
-  entities: {
-    todos: i.entity({
-      labels: i.json<Label[]>(),
-    }),
-    oldEntity: i.entity({
-      data: i.json<{ removed: true }>(),
-    }),
-  },
-});
-`;
-
-  const newFile = `
-import { i } from '@instantdb/core';
-import { Label } from './types';
-
-const _schema = i.schema({
-  entities: {
-    todos: i.entity({
-      labels: i.json(),
-    }),
-    newEntity: i.entity({
-      data: i.json(),
-    }),
-  },
-});
-`;
-
-  const result = mergeSchema(oldFile, newFile);
-
-  // Existing entity type preserved
-  expect(result).toContain('i.json<Label[]>()');
-
-  // Removed entity is gone
-  expect(result).not.toContain('oldEntity');
-
-  // New entity has no type annotation
-  expect(result).toContain('newEntity: i.entity({');
-  expect(result).not.toContain('i.json<{ removed: true }>()');
-
-  // Import not duplicated (was already in newFile)
-  const importMatches = result.match(/import { Label } from '\.\/types';/g);
-  expect(importMatches?.length).toBe(1);
-});

package/dist/util/mergeSchema.d.ts

@@ -1,2 +0,0 @@
-export function mergeSchema(oldFile: any, newFile: any): any;
-//# sourceMappingURL=mergeSchema.d.ts.map

package/dist/util/mergeSchema.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"mergeSchema.d.ts","sourceRoot":"","sources":["../../src/util/mergeSchema.js"],"names":[],"mappings":"AAkMA,6DAyKC"}