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

package/.turbo/turbo-build.log

@@ -1,4 +1,4 @@
 
-> instant-cli@0.22.95 build /home/runner/work/instant/instant/client/packages/cli
+> instant-cli@0.22.96-experimental.add-posthog-frontend.20386914944.1 build /home/runner/work/instant/instant/client/packages/cli
 > rm -rf dist; tsc -p tsconfig.json
 

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":"AAq8DA,8EAQC;AA+ED;;;;;EAKE"}

package/dist/index.js

@@ -38,7 +38,6 @@ 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';
 const execAsync = promisify(exec);
 loadEnv();
 const dev = Boolean(process.env.INSTANT_CLI_DEV);
@@ -354,7 +353,6 @@ 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`")
     .description('Pull schema and perm files from production.')
     .addHelpText('after', `
 Environment Variables:
@@ -506,7 +504,7 @@ function handlePull(bag, opts) {
             error('No app ID detected. Please specify one with --app or set up with `instant-cli init`');
             return;
         }
-        yield pull(bag, appId, Object.assign(Object.assign({}, pkgAndAuthInfo), opts));
+        yield pull(bag, appId, pkgAndAuthInfo);
     });
 }
 function push(bag, appId, opts) {
@@ -609,6 +607,7 @@ function login(options) {
             debugName: 'Login register',
             errorMessage: 'Failed to register login.',
             noAuth: true,
+            command: 'login',
         });
         if (!registerRes.ok) {
             return process.exit(1);
@@ -742,6 +741,7 @@ function promptCreateApp(opts) {
             method: 'GET',
             path: '/dash',
             errorMessage: 'Failed to fetch apps.',
+            command: 'init',
         });
         if (!res.ok) {
             return { ok: false };
@@ -768,6 +768,7 @@ function promptCreateApp(opts) {
             debugName: 'App create',
             errorMessage: 'Failed to create app.',
             body: app,
+            command: 'init',
         });
         if (!appRes.ok)
             return { ok: false };
@@ -787,6 +788,7 @@ function promptImportAppOrCreateApp() {
             method: 'GET',
             path: '/dash',
             errorMessage: 'Failed to fetch apps.',
+            command: 'init',
         });
         if (!res.ok) {
             return { ok: false };
@@ -804,6 +806,7 @@ 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');
@@ -832,6 +835,7 @@ 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');
@@ -990,12 +994,13 @@ function getOrPromptPackageAndAuthInfoWithErrorLogging(opts) {
     });
 }
 function pullSchema(appId_1, _a) {
-    return __awaiter(this, arguments, void 0, function* (appId, { pkgDir, instantModuleName, experimentalTypePreservation }) {
+    return __awaiter(this, arguments, void 0, function* (appId, { pkgDir, instantModuleName }) {
         console.log('Pulling schema...');
         const pullRes = yield fetchJson({
             path: `/dash/apps/${appId}/schema/pull`,
             debugName: 'Schema pull',
             errorMessage: 'Failed to pull schema.',
+            command: 'pull',
         });
         if (!pullRes.ok)
             return pullRes;
@@ -1017,17 +1022,7 @@ 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);
-        if (prev && experimentalTypePreservation) {
-            try {
-                const oldSchemaContent = yield readFile(prev.path, 'utf-8');
-                newSchemaContent = mergeSchema(oldSchemaContent, newSchemaContent);
-            }
-            catch (e) {
-                warn('Failed to merge schema with existing file. Overwriting instead.', e);
-            }
-        }
-        yield writeTypescript(schemaPath, newSchemaContent, 'utf-8');
+        yield writeTypescript(schemaPath, generateSchemaTypescriptFile(prev === null || prev === void 0 ? void 0 : prev.schema, apiSchemaToInstantSchemaDef(pullRes.data.schema), instantModuleName), 'utf-8');
         console.log('✅ Wrote schema to ' + shortSchemaPath);
         return { ok: true };
     });
@@ -1039,6 +1034,7 @@ function pullPerms(appId_1, _a) {
             path: `/dash/apps/${appId}/perms/pull`,
             debugName: 'Perms pull',
             errorMessage: 'Failed to pull perms.',
+            command: 'pull',
         });
         if (!pullRes.ok)
             return pullRes;
@@ -1254,6 +1250,7 @@ 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;
@@ -1308,6 +1305,7 @@ 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;
@@ -1383,6 +1381,7 @@ function pushSchema(appId, opts) {
                 body: {
                     steps: txSteps,
                 },
+                command: 'push',
             });
             console.log(chalk.green('Schema updated!'));
             if (!applyRes.ok)
@@ -1408,6 +1407,7 @@ 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;
@@ -1426,6 +1426,7 @@ function pushPerms(appId) {
             path: `/dash/apps/${appId}/perms/pull`,
             debugName: 'Perms pull',
             errorMessage: 'Failed to pull perms.',
+            command: 'push',
         });
         if (!prodPerms.ok)
             return prodPerms;
@@ -1457,6 +1458,7 @@ function pushPerms(appId) {
             body: {
                 code: res.perms,
             },
+            command: 'push',
         });
         if (!permsRes.ok)
             return permsRes;
@@ -1477,6 +1479,7 @@ function waitForAuthToken(_a) {
                 body: { secret },
                 noAuth: true,
                 noLogError: true,
+                command: 'login',
             });
             if (authCheckRes.ok) {
                 return authCheckRes.data;
@@ -1504,10 +1507,11 @@ function waitForAuthToken(_a) {
  * @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 }>}
  */
 function fetchJson(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ debugName, errorMessage, path, body, method, noAuth, noLogError, }) {
+    return __awaiter(this, arguments, void 0, function* ({ debugName, errorMessage, path, body, method, noAuth, noLogError, command, }) {
         const withAuth = !noAuth;
         const withErrorLogging = !noLogError;
         let authToken = null;
@@ -1521,7 +1525,7 @@ function fetchJson(_a) {
         try {
             const res = yield fetch(`${instantBackendOrigin}${path}`, {
                 method: method !== null && method !== void 0 ? method : 'GET',
-                headers: Object.assign(Object.assign({}, (withAuth ? { Authorization: `Bearer ${authToken}` } : {})), { 'Content-Type': 'application/json', 'Instant-CLI-Version': version }),
+                headers: Object.assign(Object.assign(Object.assign({}, (withAuth ? { Authorization: `Bearer ${authToken}` } : {})), { 'Content-Type': 'application/json', 'X-Instant-Source': 'instant-cli', 'X-Instant-Version': version }), (command ? { 'X-Instant-Command': command } : {})),
                 body: body ? JSON.stringify(body) : undefined,
                 signal: AbortSignal.timeout(timeoutMs),
             });