instant-cli 0.22.96-experimental.drewh-ts-target.20761590091.1 → 0.22.96-experimental.surgical.20765334274.1

package/dist/index.js

@@ -1,7 +1,15 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 // @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';
@@ -29,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);
@@ -56,27 +64,30 @@ const potentialAdminTokenEnvs = {
     default: 'INSTANT_APP_ADMIN_TOKEN',
     short: 'INSTANT_ADMIN_TOKEN',
 };
-async function detectEnvType({ pkgDir }) {
-    const packageJSON = await getPackageJson(pkgDir);
-    if (!packageJSON) {
+function detectEnvType(_a) {
+    return __awaiter(this, arguments, void 0, function* ({ pkgDir }) {
+        var _b, _c, _d, _e, _f;
+        const packageJSON = yield getPackageJson(pkgDir);
+        if (!packageJSON) {
+            return 'catchall';
+        }
+        if ((_b = packageJSON.dependencies) === null || _b === void 0 ? void 0 : _b.next) {
+            return 'next';
+        }
+        if ((_c = packageJSON.devDependencies) === null || _c === void 0 ? void 0 : _c.svelte) {
+            return 'svelte';
+        }
+        if ((_d = packageJSON.devDependencies) === null || _d === void 0 ? void 0 : _d.vite) {
+            return 'vite';
+        }
+        if ((_e = packageJSON.dependencies) === null || _e === void 0 ? void 0 : _e.expo) {
+            return 'expo';
+        }
+        if ((_f = packageJSON.dependencies) === null || _f === void 0 ? void 0 : _f.nuxt) {
+            return 'nuxt';
+        }
         return 'catchall';
-    }
-    if (packageJSON.dependencies?.next) {
-        return 'next';
-    }
-    if (packageJSON.devDependencies?.svelte) {
-        return 'svelte';
-    }
-    if (packageJSON.devDependencies?.vite) {
-        return 'vite';
-    }
-    if (packageJSON.dependencies?.expo) {
-        return 'expo';
-    }
-    if (packageJSON.dependencies?.nuxt) {
-        return 'nuxt';
-    }
-    return 'catchall';
+    });
 }
 const instantDashOrigin = dev
     ? 'http://localhost:3000'
@@ -102,13 +113,15 @@ function convertPushPullToCurrentFormat(arg, opts) {
         return { ok: false };
     return { ok: true, bag, opts };
 }
-async function packageDirectoryWithErrorLogging() {
-    const projectInfo = await findProjectDir();
-    if (!projectInfo) {
-        error("Couldn't find your root directory. Is there a package.json or deno.json file?");
-        return;
-    }
-    return projectInfo;
+function packageDirectoryWithErrorLogging() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const projectInfo = yield findProjectDir();
+        if (!projectInfo) {
+            error("Couldn't find your root directory. Is there a package.json or deno.json file?");
+            return;
+        }
+        return projectInfo;
+    });
 }
 // cli
 // Header -- this shows up in every command
@@ -244,16 +257,16 @@ program
     .description('Log into your account')
     .option('-p --print', 'Prints the auth token into the console.')
     .option('--headless', 'Print the login URL instead of trying to open the browser')
-    .action(async (opts) => {
+    .action((opts) => __awaiter(void 0, void 0, void 0, function* () {
     console.log("Let's log you in!");
-    await login(opts);
-});
+    yield login(opts);
+}));
 program
     .command('logout')
     .description('Log out of your Instant account')
-    .action(async () => {
-    await logout();
-});
+    .action(() => __awaiter(void 0, void 0, void 0, function* () {
+    yield logout();
+}));
 program
     .command('init')
     .description('Set up a new project.')
@@ -276,10 +289,10 @@ program
     .argument('[app-id]')
     .description('Push schema to production.')
     .option('--skip-check-types', "Don't check types on the server when pushing schema")
-    .action(async (appIdOrName, opts) => {
+    .action((appIdOrName, opts) => __awaiter(void 0, void 0, void 0, function* () {
     warnDeprecation('push-schema', 'push schema');
-    await handlePush('schema', { app: appIdOrName, ...opts });
-});
+    yield handlePush('schema', Object.assign({ app: appIdOrName }, opts));
+}));
 // Note: Nov 20, 2024
 // We can eventually delete this,
 // once we know most people use the new pull and push commands
@@ -287,10 +300,10 @@ program
     .command('push-perms', { hidden: true })
     .argument('[app-id]')
     .description('Push perms to production.')
-    .action(async (appIdOrName) => {
+    .action((appIdOrName) => __awaiter(void 0, void 0, void 0, function* () {
     warnDeprecation('push-perms', 'push perms');
-    await handlePush('perms', { app: appIdOrName });
-});
+    yield handlePush('perms', { app: appIdOrName });
+}));
 program
     .command('push')
     .argument('[schema|perms|all]', 'Which configuration to push. Defaults to `all`')
@@ -304,12 +317,14 @@ Environment Variables:
   INSTANT_SCHEMA_FILE_PATH    Override schema file location (default: instant.schema.ts)
   INSTANT_PERMS_FILE_PATH     Override perms file location (default: instant.perms.ts)
 `)
-    .action(async function (arg, inputOpts) {
-    const ret = convertPushPullToCurrentFormat(arg, inputOpts);
-    if (!ret.ok)
-        return process.exit(1);
-    const { bag, opts } = ret;
-    await handlePush(bag, opts);
+    .action(function (arg, inputOpts) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const ret = convertPushPullToCurrentFormat(arg, inputOpts);
+        if (!ret.ok)
+            return process.exit(1);
+        const { bag, opts } = ret;
+        yield handlePush(bag, opts);
+    });
 });
 // Note: Nov 20, 2024
 // We can eventually delete this,
@@ -318,10 +333,10 @@ program
     .command('pull-schema', { hidden: true })
     .argument('[app-id]')
     .description('Generate instant.schema.ts from production')
-    .action(async (appIdOrName) => {
+    .action((appIdOrName) => __awaiter(void 0, void 0, void 0, function* () {
     warnDeprecation('pull-schema', 'pull schema');
-    await handlePull('schema', { app: appIdOrName });
-});
+    yield handlePull('schema', { app: appIdOrName });
+}));
 // Note: Nov 20, 2024
 // We can eventually delete this,
 // once we know most people use the new pull and push commands
@@ -329,175 +344,189 @@ program
     .command('pull-perms', { hidden: true })
     .argument('[app-id]')
     .description('Generate instant.perms.ts from production.')
-    .action(async (appIdOrName) => {
+    .action((appIdOrName) => __awaiter(void 0, void 0, void 0, function* () {
     warnDeprecation('pull-perms', 'pull perms');
-    await handlePull('perms', { app: appIdOrName });
-});
+    yield handlePull('perms', { app: appIdOrName });
+}));
 program
     .command('pull')
     .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:
   INSTANT_SCHEMA_FILE_PATH    Override schema file location (default: instant.schema.ts)
   INSTANT_PERMS_FILE_PATH     Override perms file location (default: instant.perms.ts)
 `)
-    .action(async function (arg, inputOpts) {
-    const ret = convertPushPullToCurrentFormat(arg, inputOpts);
-    if (!ret.ok)
-        return process.exit(1);
-    const { bag, opts } = ret;
-    await handlePull(bag, opts);
+    .action(function (arg, inputOpts) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const ret = convertPushPullToCurrentFormat(arg, inputOpts);
+        if (!ret.ok)
+            return process.exit(1);
+        const { bag, opts } = ret;
+        yield handlePull(bag, opts);
+    });
 });
 program
     .command('claim')
     .description('Transfer a tempoary app into your Instant account')
-    .action(async function () {
-    const token = await readConfigAuthToken(false);
-    if (!token) {
-        console.error(`Please log in first with ${chalk.bgGray.white('instant-cli login')} to claim an app`);
-        process.exit(1);
-    }
-    const envResult = detectAppIdAndAdminTokenFromEnvWithErrorLogging();
-    if (!envResult.ok)
-        return process.exit(1);
-    if (!envResult.appId) {
-        error('No app ID found in environment variables.');
-        return process.exit(1);
-    }
-    if (!envResult.adminToken) {
-        error('No admin token found in environment variables.');
-        return process.exit(1);
-    }
-    const appId = envResult.appId.value;
-    const adminToken = envResult.adminToken.value;
-    console.log(`Found ${chalk.green(envResult.appId.envName)}: ${appId}`);
-    await claimEphemeralApp(appId, adminToken);
-});
-program.parse(process.argv);
-async function handleInit(opts) {
-    const pkgAndAuthInfo = await getOrPromptPackageAndAuthInfoWithErrorLogging(opts);
-    if (!pkgAndAuthInfo)
-        return process.exit(1);
-    const { ok, appId } = await getOrCreateAppAndWriteToEnv(pkgAndAuthInfo, opts);
-    if (!ok) {
-        return process.exit(1);
-    }
-    // Create schema file if it doesn't exist
-    // or ask to push if local schema exists
-    const localSchemaExists = await readLocalSchemaFile();
-    if (!localSchemaExists) {
-        await pull('schema', appId, pkgAndAuthInfo);
-    }
-    else {
-        const doSchemaPush = await promptOk({
-            promptText: 'Found local schema. Push it to the new app?',
-            inline: true,
-        }, program.opts());
-        if (doSchemaPush) {
-            await push('schema', appId, opts);
+    .action(function () {
+    return __awaiter(this, void 0, void 0, function* () {
+        const token = yield readConfigAuthToken(false);
+        if (!token) {
+            console.error(`Please log in first with ${chalk.bgGray.white('instant-cli login')} to claim an app`);
+            process.exit(1);
         }
-    }
-    // Create perms file if it doesn't exist
-    // or ask to push if local perms exists
-    const localPermsExists = await readLocalPermsFile();
-    if (!localPermsExists) {
-        await pull('perms', appId, pkgAndAuthInfo);
-    }
-    else {
-        const doPermsPush = await promptOk({
-            promptText: 'Found local perms. Push it to the new app?',
-            inline: true,
-        }, program.opts());
-        if (doPermsPush) {
-            await push('perms', appId, opts);
+        const envResult = detectAppIdAndAdminTokenFromEnvWithErrorLogging();
+        if (!envResult.ok)
+            return process.exit(1);
+        if (!envResult.appId) {
+            error('No app ID found in environment variables.');
+            return process.exit(1);
         }
-    }
-}
-async function handleInitWithoutFiles(opts) {
-    try {
-        const authToken = await readConfigAuthToken(false);
-        if (!authToken) {
-            throw new Error(`Please log in first with 'instant-cli login' before running this command.`);
+        if (!envResult.adminToken) {
+            error('No admin token found in environment variables.');
+            return process.exit(1);
         }
-        if (!opts?.title) {
-            throw new Error('Title is required for creating a new app without local files.');
+        const appId = envResult.appId.value;
+        const adminToken = envResult.adminToken.value;
+        console.log(`Found ${chalk.green(envResult.appId.envName)}: ${appId}`);
+        yield claimEphemeralApp(appId, adminToken);
+    });
+});
+program.parse(process.argv);
+function handleInit(opts) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const pkgAndAuthInfo = yield getOrPromptPackageAndAuthInfoWithErrorLogging(opts);
+        if (!pkgAndAuthInfo)
+            return process.exit(1);
+        const { ok, appId } = yield getOrCreateAppAndWriteToEnv(pkgAndAuthInfo, opts);
+        if (!ok) {
+            return process.exit(1);
         }
-        if (opts.title.startsWith('-')) {
-            throw new Error(`Invalid title: "${opts.title}". Title cannot be a flag.`);
+        // Create schema file if it doesn't exist
+        // or ask to push if local schema exists
+        const localSchemaExists = yield readLocalSchemaFile();
+        if (!localSchemaExists) {
+            yield pull('schema', appId, pkgAndAuthInfo);
         }
-        if (opts?.temp && opts?.orgId) {
-            throw new Error('Cannot use --temp and --org-id flags together.');
+        else {
+            const doSchemaPush = yield promptOk({
+                promptText: 'Found local schema. Push it to the new app?',
+                inline: true,
+            }, program.opts());
+            if (doSchemaPush) {
+                yield push('schema', appId, opts);
+            }
         }
-        let result;
-        if (opts?.temp) {
-            result = await createEphemeralApp(opts.title);
+        // Create perms file if it doesn't exist
+        // or ask to push if local perms exists
+        const localPermsExists = yield readLocalPermsFile();
+        if (!localPermsExists) {
+            yield pull('perms', appId, pkgAndAuthInfo);
         }
         else {
-            result = await createApp(opts.title, opts.orgId);
+            const doPermsPush = yield promptOk({
+                promptText: 'Found local perms. Push it to the new app?',
+                inline: true,
+            }, program.opts());
+            if (doPermsPush) {
+                yield push('perms', appId, opts);
+            }
         }
-        console.error(`${chalk.green('Successfully created new app!')}\n`);
-        console.log(toJson({
-            app: result,
-            error: null,
-        }));
-    }
-    catch (error) {
-        console.error(`${chalk.red('Failed to create app.')}\n`);
-        console.log(toJson({
-            app: null,
-            error: { message: error.message },
-        }));
-        process.exit(1);
-    }
+    });
 }
-async function handlePush(bag, opts) {
-    const pkgAndAuthInfo = await enforcePackageAndAuthInfoWithErrorLogging(opts);
-    if (!pkgAndAuthInfo)
-        return process.exit(1);
-    const { ok, appId } = await detectAppWithErrorLogging(opts);
-    if (!ok)
-        return process.exit(1);
-    if (!appId) {
-        error('No app ID detected. Please specify one with --app or set up with `instant-cli init`');
-        return;
-    }
-    await push(bag, appId, opts);
-}
-async function handlePull(bag, opts) {
-    const pkgAndAuthInfo = await enforcePackageAndAuthInfoWithErrorLogging(opts);
-    if (!pkgAndAuthInfo)
-        return process.exit(1);
-    const { ok, appId } = await detectAppWithErrorLogging(opts);
-    if (!ok) {
-        return process.exit(1);
-    }
-    if (!appId) {
-        error('No app ID detected. Please specify one with --app or set up with `instant-cli init`');
-        return;
-    }
-    await pull(bag, appId, { ...pkgAndAuthInfo, ...opts });
+function handleInitWithoutFiles(opts) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const authToken = yield readConfigAuthToken(false);
+            if (!authToken) {
+                throw new Error(`Please log in first with 'instant-cli login' before running this command.`);
+            }
+            if (!(opts === null || opts === void 0 ? void 0 : opts.title)) {
+                throw new Error('Title is required for creating a new app without local files.');
+            }
+            if (opts.title.startsWith('-')) {
+                throw new Error(`Invalid title: "${opts.title}". Title cannot be a flag.`);
+            }
+            if ((opts === null || opts === void 0 ? void 0 : opts.temp) && (opts === null || opts === void 0 ? void 0 : opts.orgId)) {
+                throw new Error('Cannot use --temp and --org-id flags together.');
+            }
+            let result;
+            if (opts === null || opts === void 0 ? void 0 : opts.temp) {
+                result = yield createEphemeralApp(opts.title);
+            }
+            else {
+                result = yield createApp(opts.title, opts.orgId);
+            }
+            console.error(`${chalk.green('Successfully created new app!')}\n`);
+            console.log(toJson({
+                app: result,
+                error: null,
+            }));
+        }
+        catch (error) {
+            console.error(`${chalk.red('Failed to create app.')}\n`);
+            console.log(toJson({
+                app: null,
+                error: { message: error.message },
+            }));
+            process.exit(1);
+        }
+    });
 }
-async function push(bag, appId, opts) {
-    if (bag === 'schema' || bag === 'all') {
-        const { ok } = await pushSchema(appId, opts);
-        if (!ok)
+function handlePush(bag, opts) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const pkgAndAuthInfo = yield enforcePackageAndAuthInfoWithErrorLogging(opts);
+        if (!pkgAndAuthInfo)
             return process.exit(1);
-    }
-    if (bag === 'perms' || bag === 'all') {
-        const { ok } = await pushPerms(appId);
+        const { ok, appId } = yield detectAppWithErrorLogging(opts);
         if (!ok)
             return process.exit(1);
-    }
+        if (!appId) {
+            error('No app ID detected. Please specify one with --app or set up with `instant-cli init`');
+            return;
+        }
+        yield push(bag, appId, opts);
+    });
+}
+function handlePull(bag, opts) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const pkgAndAuthInfo = yield enforcePackageAndAuthInfoWithErrorLogging(opts);
+        if (!pkgAndAuthInfo)
+            return process.exit(1);
+        const { ok, appId } = yield detectAppWithErrorLogging(opts);
+        if (!ok) {
+            return process.exit(1);
+        }
+        if (!appId) {
+            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));
+    });
+}
+function push(bag, appId, opts) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (bag === 'schema' || bag === 'all') {
+            const { ok } = yield pushSchema(appId, opts);
+            if (!ok)
+                return process.exit(1);
+        }
+        if (bag === 'perms' || bag === 'all') {
+            const { ok } = yield pushPerms(appId);
+            if (!ok)
+                return process.exit(1);
+        }
+    });
 }
 function printDotEnvInfo(envType, appId) {
     console.log(`\nPicked app ${chalk.green(appId)}!\n`);
     console.log(`To use this app automatically from now on, update your ${chalk.green('`.env`')} file:`);
     const picked = potentialEnvs[envType];
-    const rest = { ...potentialEnvs };
+    const rest = Object.assign({}, potentialEnvs);
     delete rest[envType];
     console.log(`  ${chalk.green(picked)}=${appId}`);
     const otherEnvs = Object.values(rest);
@@ -506,121 +535,132 @@ function printDotEnvInfo(envType, appId) {
     console.log(`Alternative names: \n${otherEnvStr} \n`);
     console.log(terminalLink('Dashboard:', appDashUrl(appId)) + '\n');
 }
-async function handleEnvFile(pkgAndAuthInfo, { appId, appToken }) {
-    const { pkgDir } = pkgAndAuthInfo;
-    const envType = await detectEnvType(pkgAndAuthInfo);
-    const envName = potentialEnvs[envType];
-    const envFile = program.optsWithGlobals().env ?? '.env';
-    const hasEnvFile = await pathExists(join(pkgDir, envFile));
-    if (hasEnvFile) {
-        printDotEnvInfo(envType, appId);
-        return;
-    }
-    console.log(`\nLooks like you don't have a ${chalk.green(`\`${envFile}\``)} file yet.`);
-    console.log(`If we set ${chalk.green(envName)} & ${chalk.green('INSTANT_APP_ADMIN_TOKEN')}, we can remember the app that you chose for all future commands.`);
-    const saveExtraInfo = envFile !== '.env' ? chalk.green('  (will create `' + envFile + '`)') : '';
-    const ok = await promptOk({
-        inline: true,
-        promptText: 'Want us to create this env file for you?' + saveExtraInfo,
-        modifyOutput: (a) => a,
-    }, program.opts(), true);
-    if (!ok) {
-        console.log(`No .env file created. You can always set ${chalk.green('`' + envName + '`')} later. \n`);
-        return;
-    }
-    const content = [
-        [envName, appId],
-        ['INSTANT_APP_ADMIN_TOKEN', appToken],
-    ]
-        .map(([k, v]) => `${k}=${v}`)
-        .join('\n') + '\n';
-    await writeFile(join(pkgDir, envFile), content, 'utf-8');
-    if (envFile !== '.env') {
-        console.log(`Created ${chalk.green(envFile)}!`);
-    }
-    else {
-        console.log(`Created ${chalk.green('.env')} file!`);
-    }
+function handleEnvFile(pkgAndAuthInfo_1, _a) {
+    return __awaiter(this, arguments, void 0, function* (pkgAndAuthInfo, { appId, appToken }) {
+        var _b;
+        const { pkgDir } = pkgAndAuthInfo;
+        const envType = yield detectEnvType(pkgAndAuthInfo);
+        const envName = potentialEnvs[envType];
+        const envFile = (_b = program.optsWithGlobals().env) !== null && _b !== void 0 ? _b : '.env';
+        const hasEnvFile = yield pathExists(join(pkgDir, envFile));
+        if (hasEnvFile) {
+            printDotEnvInfo(envType, appId);
+            return;
+        }
+        console.log(`\nLooks like you don't have a ${chalk.green(`\`${envFile}\``)} file yet.`);
+        console.log(`If we set ${chalk.green(envName)} & ${chalk.green('INSTANT_APP_ADMIN_TOKEN')}, we can remember the app that you chose for all future commands.`);
+        const saveExtraInfo = envFile !== '.env' ? chalk.green('  (will create `' + envFile + '`)') : '';
+        const ok = yield promptOk({
+            inline: true,
+            promptText: 'Want us to create this env file for you?' + saveExtraInfo,
+            modifyOutput: (a) => a,
+        }, program.opts(), true);
+        if (!ok) {
+            console.log(`No .env file created. You can always set ${chalk.green('`' + envName + '`')} later. \n`);
+            return;
+        }
+        const content = [
+            [envName, appId],
+            ['INSTANT_APP_ADMIN_TOKEN', appToken],
+        ]
+            .map(([k, v]) => `${k}=${v}`)
+            .join('\n') + '\n';
+        yield writeFile(join(pkgDir, envFile), content, 'utf-8');
+        if (envFile !== '.env') {
+            console.log(`Created ${chalk.green(envFile)}!`);
+        }
+        else {
+            console.log(`Created ${chalk.green('.env')} file!`);
+        }
+    });
 }
-async function getOrCreateAppAndWriteToEnv(pkgAndAuthInfo, opts) {
-    const ret = await detectOrCreateAppWithErrorLogging(opts);
-    if (!ret.ok)
+function getOrCreateAppAndWriteToEnv(pkgAndAuthInfo, opts) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const ret = yield detectOrCreateAppWithErrorLogging(opts);
+        if (!ret.ok)
+            return ret;
+        const { appId, appToken, source } = ret;
+        if (source === 'created' || source === 'imported') {
+            yield handleEnvFile(pkgAndAuthInfo, { appId, appToken });
+        }
         return ret;
-    const { appId, appToken, source } = ret;
-    if (source === 'created' || source === 'imported') {
-        await handleEnvFile(pkgAndAuthInfo, { appId, appToken });
-    }
-    return ret;
+    });
 }
-async function pull(bag, appId, pkgAndAuthInfo) {
-    if (bag === 'schema' || bag === 'all') {
-        const { ok } = await pullSchema(appId, pkgAndAuthInfo);
-        if (!ok)
+function pull(bag, appId, pkgAndAuthInfo) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (bag === 'schema' || bag === 'all') {
+            const { ok } = yield pullSchema(appId, pkgAndAuthInfo);
+            if (!ok)
+                return process.exit(1);
+        }
+        if (bag === 'perms' || bag === 'all') {
+            const { ok } = yield pullPerms(appId, pkgAndAuthInfo);
+            if (!ok)
+                return process.exit(1);
+        }
+    });
+}
+function login(options) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const registerRes = yield fetchJson({
+            method: 'POST',
+            path: '/dash/cli/auth/register',
+            debugName: 'Login register',
+            errorMessage: 'Failed to register login.',
+            noAuth: true,
+            command: 'login',
+        });
+        if (!registerRes.ok) {
             return process.exit(1);
-    }
-    if (bag === 'perms' || bag === 'all') {
-        const { ok } = await pullPerms(appId, pkgAndAuthInfo);
-        if (!ok)
+        }
+        const { secret, ticket } = registerRes.data;
+        console.log();
+        if (isHeadlessEnvironment(options)) {
+            console.log(`Open this URL in a browser to log in:\n ${instantDashOrigin}/dash?ticket=${ticket}\n`);
+        }
+        else {
+            const ok = yield promptOk({
+                promptText: `This will open instantdb.com in your browser, OK to proceed?`,
+            }, program.opts(), 
+            /*defaultAnswer=*/ true);
+            if (!ok)
+                return;
+            openInBrowser(`${instantDashOrigin}/dash?ticket=${ticket}`);
+        }
+        console.log('Waiting for authentication...');
+        const authTokenRes = yield waitForAuthToken({ secret });
+        if (!authTokenRes) {
             return process.exit(1);
-    }
-}
-async function login(options) {
-    const registerRes = await fetchJson({
-        method: 'POST',
-        path: '/dash/cli/auth/register',
-        debugName: 'Login register',
-        errorMessage: 'Failed to register login.',
-        noAuth: true,
-        command: 'login',
-    });
-    if (!registerRes.ok) {
-        return process.exit(1);
-    }
-    const { secret, ticket } = registerRes.data;
-    console.log();
-    if (isHeadlessEnvironment(options)) {
-        console.log(`Open this URL in a browser to log in:\n ${instantDashOrigin}/dash?ticket=${ticket}\n`);
-    }
-    else {
-        const ok = await promptOk({
-            promptText: `This will open instantdb.com in your browser, OK to proceed?`,
-        }, program.opts(), 
-        /*defaultAnswer=*/ true);
-        if (!ok)
-            return;
-        openInBrowser(`${instantDashOrigin}/dash?ticket=${ticket}`);
-    }
-    console.log('Waiting for authentication...');
-    const authTokenRes = await waitForAuthToken({ secret });
-    if (!authTokenRes) {
-        return process.exit(1);
-    }
-    const { token, email } = authTokenRes;
-    if (options.print) {
-        console.log(chalk.red('[Do not share] Your Instant auth token:', token));
-    }
-    else {
-        await saveConfigAuthToken(token);
-        console.log(chalk.green(`Successfully logged in as ${email}!`));
-    }
-    return token;
-}
-async function logout() {
-    const { authConfigFilePath } = getAuthPaths();
-    try {
-        await unlink(authConfigFilePath);
-        console.log(chalk.green('Successfully logged out from Instant!'));
-        return true;
-    }
-    catch (error) {
-        if (error.code === 'ENOENT') {
-            console.log(chalk.green('You were already logged out!'));
+        }
+        const { token, email } = authTokenRes;
+        if (options.print) {
+            console.log(chalk.red('[Do not share] Your Instant auth token:', token));
         }
         else {
-            error('Failed to logout: ' + error.message);
+            yield saveConfigAuthToken(token);
+            console.log(chalk.green(`Successfully logged in as ${email}!`));
         }
-        return false;
-    }
+        return token;
+    });
+}
+function logout() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { authConfigFilePath } = getAuthPaths();
+        try {
+            yield unlink(authConfigFilePath);
+            console.log(chalk.green('Successfully logged out from Instant!'));
+            return true;
+        }
+        catch (error) {
+            if (error.code === 'ENOENT') {
+                console.log(chalk.green('You were already logged out!'));
+            }
+            else {
+                error('Failed to logout: ' + error.message);
+            }
+            return false;
+        }
+    });
 }
 const packageAliasAndFullNames = {
     react: '@instantdb/react',
@@ -628,376 +668,408 @@ const packageAliasAndFullNames = {
     core: '@instantdb/core',
     admin: '@instantdb/admin',
 };
-async function getOrInstallInstantModuleWithErrorLogging(pkgDir, opts) {
-    const pkgJson = await getPackageJSONWithErrorLogging(pkgDir);
-    if (!pkgJson) {
-        return;
-    }
-    console.log('Checking for an Instant SDK...');
-    const instantModuleName = await getInstantModuleName(pkgJson);
-    if (instantModuleName) {
-        console.log(`Found ${chalk.green(instantModuleName)} in your package.json.`);
-        return instantModuleName;
-    }
-    console.log("Couldn't find an Instant SDK in your package.json, let's install one!");
-    let moduleName;
-    if (opts.package) {
-        moduleName = packageAliasAndFullNames[opts.package];
-    }
-    else {
-        if (program.optsWithGlobals()?.yes) {
-            console.error('--yes was provided without a package specificaion and no Instant SDK was found');
-            process.exit(1);
+function getOrInstallInstantModuleWithErrorLogging(pkgDir, opts) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const pkgJson = yield getPackageJSONWithErrorLogging(pkgDir);
+        if (!pkgJson) {
+            return;
         }
-        moduleName = await renderUnwrap(new UI.Select({
-            promptText: 'Which package would you like to use?',
-            options: [
-                { label: '@instantdb/react', value: '@instantdb/react' },
-                {
-                    label: '@instantdb/react-native',
-                    value: '@instantdb/react-native',
-                },
-                { label: '@instantdb/core', value: '@instantdb/core' },
-                { label: '@instantdb/admin', value: '@instantdb/admin' },
-            ],
+        console.log('Checking for an Instant SDK...');
+        const instantModuleName = yield getInstantModuleName(pkgJson);
+        if (instantModuleName) {
+            console.log(`Found ${chalk.green(instantModuleName)} in your package.json.`);
+            return instantModuleName;
+        }
+        console.log("Couldn't find an Instant SDK in your package.json, let's install one!");
+        let moduleName;
+        if (opts.package) {
+            moduleName = packageAliasAndFullNames[opts.package];
+        }
+        else {
+            if ((_a = program.optsWithGlobals()) === null || _a === void 0 ? void 0 : _a.yes) {
+                console.error('--yes was provided without a package specificaion and no Instant SDK was found');
+                process.exit(1);
+            }
+            moduleName = yield renderUnwrap(new UI.Select({
+                promptText: 'Which package would you like to use?',
+                options: [
+                    { label: '@instantdb/react', value: '@instantdb/react' },
+                    {
+                        label: '@instantdb/react-native',
+                        value: '@instantdb/react-native',
+                    },
+                    { label: '@instantdb/core', value: '@instantdb/core' },
+                    { label: '@instantdb/admin', value: '@instantdb/admin' },
+                ],
+            }));
+        }
+        const packageManager = yield detectPackageManager(pkgDir);
+        const packagesToInstall = [moduleName];
+        if (moduleName === '@instantdb/react-native') {
+            packagesToInstall.push('react-native-get-random-values', '@react-native-async-storage/async-storage');
+        }
+        const installCommand = getInstallCommand(packageManager, packagesToInstall.join(' '));
+        yield renderUnwrap(new UI.Spinner({
+            promise: execAsync(installCommand, pkgDir),
+            workingText: `Installing ${packagesToInstall.join(', ')} using ${packageManager}...`,
+            doneText: `Installed ${packagesToInstall.join(', ')} using ${packageManager}.`,
         }));
-    }
-    const packageManager = await detectPackageManager(pkgDir);
-    const packagesToInstall = [moduleName];
-    if (moduleName === '@instantdb/react-native') {
-        packagesToInstall.push('react-native-get-random-values', '@react-native-async-storage/async-storage');
-    }
-    const installCommand = getInstallCommand(packageManager, packagesToInstall.join(' '));
-    await renderUnwrap(new UI.Spinner({
-        promise: execAsync(installCommand, pkgDir),
-        workingText: `Installing ${packagesToInstall.join(', ')} using ${packageManager}...`,
-        doneText: `Installed ${packagesToInstall.join(', ')} using ${packageManager}.`,
-    }));
-    return moduleName;
-}
-async function promptCreateApp(opts) {
-    const id = randomUUID();
-    const token = randomUUID();
-    let _title;
-    if (opts?.title) {
-        _title = opts.title;
-    }
-    else {
-        _title = await renderUnwrap(new UI.TextInput({
-            prompt: 'What would you like to call it?',
-            placeholder: 'My cool app',
-        })).catch(() => null);
-    }
-    const title = _title?.trim();
-    if (!title) {
-        error('No name provided.');
-        return { ok: false };
-    }
-    const res = await fetchJson({
-        debugName: 'Fetching orgs',
-        method: 'GET',
-        path: '/dash',
-        errorMessage: 'Failed to fetch apps.',
-        command: 'init',
+        return moduleName;
     });
-    if (!res.ok) {
-        return { ok: false };
-    }
-    const allowedOrgs = res.data.orgs.filter((org) => org.role !== 'app-member');
-    let org_id = opts.org;
-    if (!org_id && allowedOrgs.length) {
-        const choices = [{ label: '(No organization)', value: null }];
-        for (const org of allowedOrgs) {
-            choices.push({ label: org.title, value: org.id });
-        }
-        const choice = await renderUnwrap(new UI.Select({
-            promptText: 'Would you like to create the app in an organization?',
-            options: choices,
-        }));
-        if (choice) {
-            org_id = choice;
+}
+function promptCreateApp(opts) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const id = randomUUID();
+        const token = randomUUID();
+        let _title;
+        if (opts === null || opts === void 0 ? void 0 : opts.title) {
+            _title = opts.title;
         }
-    }
-    const app = { id, title, admin_token: token, org_id };
-    const appRes = await fetchJson({
-        method: 'POST',
-        path: '/dash/apps',
-        debugName: 'App create',
-        errorMessage: 'Failed to create app.',
-        body: app,
-        command: 'init',
+        else {
+            _title = yield renderUnwrap(new UI.TextInput({
+                prompt: 'What would you like to call it?',
+                placeholder: 'My cool app',
+            })).catch(() => null);
+        }
+        const title = _title === null || _title === void 0 ? void 0 : _title.trim();
+        if (!title) {
+            error('No name provided.');
+            return { ok: false };
+        }
+        const res = yield fetchJson({
+            debugName: 'Fetching orgs',
+            method: 'GET',
+            path: '/dash',
+            errorMessage: 'Failed to fetch apps.',
+            command: 'init',
+        });
+        if (!res.ok) {
+            return { ok: false };
+        }
+        const allowedOrgs = res.data.orgs.filter((org) => org.role !== 'app-member');
+        let org_id = opts.org;
+        if (!org_id && allowedOrgs.length) {
+            const choices = [{ label: '(No organization)', value: null }];
+            for (const org of allowedOrgs) {
+                choices.push({ label: org.title, value: org.id });
+            }
+            const choice = yield renderUnwrap(new UI.Select({
+                promptText: 'Would you like to create the app in an organization?',
+                options: choices,
+            }));
+            if (choice) {
+                org_id = choice;
+            }
+        }
+        const app = { id, title, admin_token: token, org_id };
+        const appRes = yield fetchJson({
+            method: 'POST',
+            path: '/dash/apps',
+            debugName: 'App create',
+            errorMessage: 'Failed to create app.',
+            body: app,
+            command: 'init',
+        });
+        if (!appRes.ok)
+            return { ok: false };
+        return {
+            ok: true,
+            appId: id,
+            appTitle: title,
+            appToken: token,
+            source: 'created',
+        };
     });
-    if (!appRes.ok)
-        return { ok: false };
-    return {
-        ok: true,
-        appId: id,
-        appTitle: title,
-        appToken: token,
-        source: 'created',
-    };
 }
-async function promptImportAppOrCreateApp() {
-    const res = await fetchJson({
-        debugName: 'Fetching apps',
-        method: 'GET',
-        path: '/dash',
-        errorMessage: 'Failed to fetch apps.',
-        command: 'init',
-    });
-    if (!res.ok) {
-        return { ok: false };
-    }
-    const result = await renderUnwrap(new UI.AppSelector({
-        allowEphemeral: true,
-        allowCreate: true,
-        startingMenuIndex: 2,
-        api: {
-            getDash: () => res.data,
-            createEphemeralApp,
-            getAppsForOrg: async (orgId) => {
-                const orgsRes = await fetchJson({
-                    debugName: 'Fetching org apps',
-                    method: 'GET',
-                    path: `/dash/orgs/${orgId}`,
-                    errorMessage: 'Failed to fetch apps.',
-                    command: 'init',
-                });
-                if (!orgsRes.ok) {
-                    throw new Error('Failed to fetch org apps');
-                }
-                return { apps: orgsRes.data.apps };
+function promptImportAppOrCreateApp() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const res = yield fetchJson({
+            debugName: 'Fetching apps',
+            method: 'GET',
+            path: '/dash',
+            errorMessage: 'Failed to fetch apps.',
+            command: 'init',
+        });
+        if (!res.ok) {
+            return { ok: false };
+        }
+        const result = yield renderUnwrap(new UI.AppSelector({
+            allowEphemeral: true,
+            allowCreate: true,
+            startingMenuIndex: 2,
+            api: {
+                getDash: () => res.data,
+                createEphemeralApp,
+                getAppsForOrg: (orgId) => __awaiter(this, void 0, void 0, function* () {
+                    const orgsRes = yield fetchJson({
+                        debugName: 'Fetching org apps',
+                        method: 'GET',
+                        path: `/dash/orgs/${orgId}`,
+                        errorMessage: 'Failed to fetch apps.',
+                        command: 'init',
+                    });
+                    if (!orgsRes.ok) {
+                        throw new Error('Failed to fetch org apps');
+                    }
+                    return { apps: orgsRes.data.apps };
+                }),
+                createApp,
             },
-            createApp,
-        },
-    }));
-    return {
-        ok: true,
-        appId: result.appId,
-        appToken: result.adminToken,
-        source: result.approach === 'import' ? 'imported' : 'created',
-    };
+        }));
+        return {
+            ok: true,
+            appId: result.appId,
+            appToken: result.adminToken,
+            source: result.approach === 'import' ? 'imported' : 'created',
+        };
+    });
 }
-async function createApp(title, orgId) {
-    const id = randomUUID();
-    const token = randomUUID();
-    const app = { id, title, admin_token: token, org_id: orgId };
-    const appRes = await fetchJson({
-        method: 'POST',
-        path: '/dash/apps',
-        debugName: 'App create',
-        errorMessage: 'Failed to create app.',
-        body: app,
-        command: 'init',
+function createApp(title, orgId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const id = randomUUID();
+        const token = randomUUID();
+        const app = { id, title, admin_token: token, org_id: orgId };
+        const appRes = yield fetchJson({
+            method: 'POST',
+            path: '/dash/apps',
+            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 };
     });
-    if (!appRes.ok)
-        throw new Error('Failed to create app');
-    return { appId: id, adminToken: token };
-}
-async function createEphemeralApp(title) {
-    const api = new PlatformApi({ apiURI: instantBackendOrigin });
-    const { app } = await api.createTemporaryApp({ title });
-    return { appId: app.id, adminToken: app.adminToken };
-}
-async function detectAppWithErrorLogging(opts) {
-    const fromOpts = await detectAppIdFromOptsWithErrorLogging(opts);
-    if (!fromOpts.ok)
-        return fromOpts;
-    if (fromOpts.appId) {
-        return { ok: true, appId: fromOpts.appId, source: 'opts' };
-    }
-    const fromEnv = detectAppIdFromEnvWithErrorLogging();
-    if (!fromEnv.ok)
-        return fromEnv;
-    if (fromEnv.found) {
-        const { envName, value } = fromEnv.found;
-        console.log(`Found ${chalk.green(envName)}: ${value}`);
-        return { ok: true, appId: value, source: 'env' };
-    }
-    return { ok: true };
-}
-async function detectOrCreateAppWithErrorLogging(opts) {
-    const detected = await detectAppWithErrorLogging(opts);
-    if (!detected.ok)
-        return detected;
-    if (detected.appId) {
-        return detected;
-    }
-    let action;
-    if (program.optsWithGlobals().yes) {
-        action = 'create';
-        if (!opts?.title) {
-            console.error(chalk.red(`Title is required when using --yes and no app is linked`));
-            process.exit(1);
+}
+function createEphemeralApp(title) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const api = new PlatformApi({ apiURI: instantBackendOrigin });
+        const { app } = yield api.createTemporaryApp({ title });
+        return { appId: app.id, adminToken: app.adminToken };
+    });
+}
+function detectAppWithErrorLogging(opts) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const fromOpts = yield detectAppIdFromOptsWithErrorLogging(opts);
+        if (!fromOpts.ok)
+            return fromOpts;
+        if (fromOpts.appId) {
+            return { ok: true, appId: fromOpts.appId, source: 'opts' };
         }
-        const app = await createApp(opts.title);
-        return { ok: true, appId: app.appId, source: 'created' };
-    }
-    else {
-        console.log();
-        return await promptImportAppOrCreateApp();
-    }
+        const fromEnv = detectAppIdFromEnvWithErrorLogging();
+        if (!fromEnv.ok)
+            return fromEnv;
+        if (fromEnv.found) {
+            const { envName, value } = fromEnv.found;
+            console.log(`Found ${chalk.green(envName)}: ${value}`);
+            return { ok: true, appId: value, source: 'env' };
+        }
+        return { ok: true };
+    });
 }
-async function writeTypescript(path, content, encoding) {
-    const prettierConfig = await prettier.resolveConfig(path);
-    const formattedCode = await prettier.format(content, {
-        ...prettierConfig,
-        parser: 'typescript',
+function detectOrCreateAppWithErrorLogging(opts) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const detected = yield detectAppWithErrorLogging(opts);
+        if (!detected.ok)
+            return detected;
+        if (detected.appId) {
+            return detected;
+        }
+        let action;
+        if (program.optsWithGlobals().yes) {
+            action = 'create';
+            if (!(opts === null || opts === void 0 ? void 0 : opts.title)) {
+                console.error(chalk.red(`Title is required when using --yes and no app is linked`));
+                process.exit(1);
+            }
+            const app = yield createApp(opts.title);
+            return { ok: true, appId: app.appId, source: 'created' };
+        }
+        else {
+            console.log();
+            return yield promptImportAppOrCreateApp();
+        }
     });
-    return await writeFile(path, formattedCode, encoding);
-}
-async function getInstantModuleName(pkgJson) {
-    const deps = pkgJson.dependencies || {};
-    const devDeps = pkgJson.devDependencies || {};
-    const instantModuleName = [
-        '@instantdb/react',
-        '@instantdb/react-native',
-        '@instantdb/core',
-        '@instantdb/admin',
-    ].find((name) => deps[name] || devDeps[name]);
-    return instantModuleName;
-}
-async function getPackageJson(pkgDir) {
-    return await readJsonFile(join(pkgDir, 'package.json'));
-}
-async function getPackageJSONWithErrorLogging(pkgDir) {
-    const pkgJson = await getPackageJson(pkgDir);
-    if (!pkgJson) {
-        error(`Couldn't find a packge.json file in: ${pkgDir}. Please add one.`);
-        return;
-    }
-    return pkgJson;
 }
-async function enforcePackageAndAuthInfoWithErrorLogging(_opts) {
-    const projectInfo = await packageDirectoryWithErrorLogging();
-    if (!projectInfo) {
-        return;
-    }
-    const { dir: pkgDir, type: projectType } = projectInfo;
-    // Deno projects don't have package.json or node_modules
-    if (projectType === 'deno') {
-        const authToken = await readConfigAuthTokenWithErrorLogging();
+function writeTypescript(path, content, encoding) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const prettierConfig = yield prettier.resolveConfig(path);
+        const formattedCode = yield prettier.format(content, Object.assign(Object.assign({}, prettierConfig), { parser: 'typescript' }));
+        return yield writeFile(path, formattedCode, encoding);
+    });
+}
+function getInstantModuleName(pkgJson) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const deps = pkgJson.dependencies || {};
+        const devDeps = pkgJson.devDependencies || {};
+        const instantModuleName = [
+            '@instantdb/react',
+            '@instantdb/react-native',
+            '@instantdb/core',
+            '@instantdb/admin',
+        ].find((name) => deps[name] || devDeps[name]);
+        return instantModuleName;
+    });
+}
+function getPackageJson(pkgDir) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return yield readJsonFile(join(pkgDir, 'package.json'));
+    });
+}
+function getPackageJSONWithErrorLogging(pkgDir) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const pkgJson = yield getPackageJson(pkgDir);
+        if (!pkgJson) {
+            error(`Couldn't find a packge.json file in: ${pkgDir}. Please add one.`);
+            return;
+        }
+        return pkgJson;
+    });
+}
+function enforcePackageAndAuthInfoWithErrorLogging(_opts) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const projectInfo = yield packageDirectoryWithErrorLogging();
+        if (!projectInfo) {
+            return;
+        }
+        const { dir: pkgDir, type: projectType } = projectInfo;
+        // Deno projects don't have package.json or node_modules
+        if (projectType === 'deno') {
+            const authToken = yield readConfigAuthTokenWithErrorLogging();
+            if (!authToken) {
+                return;
+            }
+            return {
+                pkgDir,
+                projectType,
+                instantModuleName: '@instantdb/core',
+                authToken,
+            };
+        }
+        const pkgJson = yield getPackageJSONWithErrorLogging(pkgDir);
+        if (!pkgJson) {
+            return;
+        }
+        const instantModuleName = yield getInstantModuleName(pkgJson);
+        if (!instantModuleName) {
+            error("We couldn't find an Instant SDK. Install one, or run `init`");
+        }
+        const authToken = yield readConfigAuthTokenWithErrorLogging();
         if (!authToken) {
             return;
         }
-        return {
-            pkgDir,
-            projectType,
-            instantModuleName: '@instantdb/core',
-            authToken,
-        };
-    }
-    const pkgJson = await getPackageJSONWithErrorLogging(pkgDir);
-    if (!pkgJson) {
-        return;
-    }
-    const instantModuleName = await getInstantModuleName(pkgJson);
-    if (!instantModuleName) {
-        error("We couldn't find an Instant SDK. Install one, or run `init`");
-    }
-    const authToken = await readConfigAuthTokenWithErrorLogging();
-    if (!authToken) {
-        return;
-    }
-    return { pkgDir, projectType, instantModuleName, authToken };
+        return { pkgDir, projectType, instantModuleName, authToken };
+    });
 }
-async function getOrPromptPackageAndAuthInfoWithErrorLogging(opts) {
-    const projectInfo = await packageDirectoryWithErrorLogging();
-    if (!projectInfo) {
-        return;
-    }
-    const { dir: pkgDir, type: projectType } = projectInfo;
-    // Deno projects don't have package.json or node_modules
-    if (projectType === 'deno') {
-        const authToken = await readAuthTokenOrLoginWithErrorLogging();
+function getOrPromptPackageAndAuthInfoWithErrorLogging(opts) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const projectInfo = yield packageDirectoryWithErrorLogging();
+        if (!projectInfo) {
+            return;
+        }
+        const { dir: pkgDir, type: projectType } = projectInfo;
+        // Deno projects don't have package.json or node_modules
+        if (projectType === 'deno') {
+            const authToken = yield readAuthTokenOrLoginWithErrorLogging();
+            if (!authToken) {
+                return;
+            }
+            return {
+                pkgDir,
+                projectType,
+                instantModuleName: '@instantdb/core',
+                authToken,
+            };
+        }
+        const instantModuleName = yield getOrInstallInstantModuleWithErrorLogging(pkgDir, opts);
+        if (!instantModuleName) {
+            return;
+        }
+        const authToken = yield readAuthTokenOrLoginWithErrorLogging();
         if (!authToken) {
             return;
         }
-        return {
-            pkgDir,
-            projectType,
-            instantModuleName: '@instantdb/core',
-            authToken,
-        };
-    }
-    const instantModuleName = await getOrInstallInstantModuleWithErrorLogging(pkgDir, opts);
-    if (!instantModuleName) {
-        return;
-    }
-    const authToken = await readAuthTokenOrLoginWithErrorLogging();
-    if (!authToken) {
-        return;
-    }
-    return { pkgDir, projectType, instantModuleName, authToken };
-}
-async function pullSchema(appId, { pkgDir, instantModuleName, experimentalTypePreservation }) {
-    console.log('Pulling schema...');
-    const pullRes = await fetchJson({
-        path: `/dash/apps/${appId}/schema/pull`,
-        debugName: 'Schema pull',
-        errorMessage: 'Failed to pull schema.',
-        command: 'pull',
+        return { pkgDir, projectType, instantModuleName, authToken };
     });
-    if (!pullRes.ok)
-        return pullRes;
-    if (!countEntities(pullRes.data.schema.refs) &&
-        !countEntities(pullRes.data.schema.blobs)) {
-        console.log('Schema is empty. Skipping.');
-        return { ok: true };
-    }
-    const prev = await readLocalSchemaFile();
-    if (prev) {
-        const shouldContinue = await promptOk({
-            promptText: 'This will overwrite your local instant.schema.ts file, OK to proceed?',
-            modifyOutput: UI.modifiers.yPadding,
-            inline: true,
-        }, program.opts());
-        console.log();
-        if (!shouldContinue)
+}
+function pullSchema(appId_1, _a) {
+    return __awaiter(this, arguments, void 0, function* (appId, { pkgDir, instantModuleName, experimentalTypePreservation }) {
+        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;
+        if (!countEntities(pullRes.data.schema.refs) &&
+            !countEntities(pullRes.data.schema.blobs)) {
+            console.log('Schema is empty. Skipping.');
             return { ok: true };
-    }
-    const shortSchemaPath = getSchemaPathToWrite(prev?.path);
-    const schemaPath = join(pkgDir, shortSchemaPath);
-    let newSchemaContent = generateSchemaTypescriptFile(prev?.schema, apiSchemaToInstantSchemaDef(pullRes.data.schema), instantModuleName);
-    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);
+        const prev = yield readLocalSchemaFile();
+        if (prev) {
+            const shouldContinue = yield promptOk({
+                promptText: 'This will overwrite your local instant.schema.ts file, OK to proceed?',
+                modifyOutput: UI.modifiers.yPadding,
+                inline: true,
+            }, program.opts());
+            console.log();
+            if (!shouldContinue)
+                return { ok: true };
         }
-    }
-    await writeTypescript(schemaPath, newSchemaContent, 'utf-8');
-    console.log('✅ Wrote schema to ' + shortSchemaPath);
-    return { ok: true };
-}
-async function pullPerms(appId, { pkgDir, instantModuleName }) {
-    console.log('Pulling perms...');
-    const pullRes = await fetchJson({
-        path: `/dash/apps/${appId}/perms/pull`,
-        debugName: 'Perms pull',
-        errorMessage: 'Failed to pull perms.',
-        command: 'pull',
+        const shortSchemaPath = getSchemaPathToWrite(prev === null || prev === void 0 ? void 0 : prev.path);
+        const schemaPath = join(pkgDir, shortSchemaPath);
+        const serverSchema = apiSchemaToInstantSchemaDef(pullRes.data.schema);
+        let newSchemaContent;
+        if (prev && experimentalTypePreservation) {
+            try {
+                const oldSchemaContent = yield readFile(prev.path, 'utf-8');
+                newSchemaContent = yield updateSchemaFile(oldSchemaContent, prev.schema, serverSchema);
+            }
+            catch (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 };
+    });
+}
+function pullPerms(appId_1, _a) {
+    return __awaiter(this, arguments, void 0, function* (appId, { pkgDir, instantModuleName }) {
+        console.log('Pulling perms...');
+        const pullRes = yield fetchJson({
+            path: `/dash/apps/${appId}/perms/pull`,
+            debugName: 'Perms pull',
+            errorMessage: 'Failed to pull perms.',
+            command: 'pull',
+        });
+        if (!pullRes.ok)
+            return pullRes;
+        const prev = yield readLocalPermsFile();
+        if (prev) {
+            const shouldContinue = yield promptOk({
+                promptText: 'This will overwrite your local instant.perms.ts file, OK to proceed?',
+                modifyOutput: UI.modifiers.yPadding,
+                inline: true,
+            }, program.opts());
+            console.log();
+            if (!shouldContinue)
+                return { ok: true };
+        }
+        const shortPermsPath = getPermsPathToWrite(prev === null || prev === void 0 ? void 0 : prev.path);
+        const permsPath = join(pkgDir, shortPermsPath);
+        yield writeTypescript(permsPath, generatePermsTypescriptFile(pullRes.data.perms || {}, instantModuleName), 'utf-8');
+        console.log('✅ Wrote permissions to ' + shortPermsPath);
+        return { ok: true };
     });
-    if (!pullRes.ok)
-        return pullRes;
-    const prev = await readLocalPermsFile();
-    if (prev) {
-        const shouldContinue = await promptOk({
-            promptText: 'This will overwrite your local instant.perms.ts file, OK to proceed?',
-            modifyOutput: UI.modifiers.yPadding,
-            inline: true,
-        }, program.opts());
-        console.log();
-        if (!shouldContinue)
-            return { ok: true };
-    }
-    const shortPermsPath = getPermsPathToWrite(prev?.path);
-    const permsPath = join(pkgDir, shortPermsPath);
-    await writeTypescript(permsPath, generatePermsTypescriptFile(pullRes.data.perms || {}, instantModuleName), 'utf-8');
-    console.log('✅ Wrote permissions to ' + shortPermsPath);
-    return { ok: true };
 }
 function indexingJobCompletedActionMessage(job) {
     if (job.job_type === 'check-data-type') {
@@ -1034,7 +1106,7 @@ function truncate(s, maxLen) {
 }
 function formatSamples(triples_samples) {
     return triples_samples.slice(0, 3).map((t) => {
-        return { ...t, value: truncate(JSON.stringify(t.value), 32) };
+        return Object.assign(Object.assign({}, t), { value: truncate(JSON.stringify(t.value), 32) });
     });
 }
 function createUrl(triple, job) {
@@ -1055,6 +1127,7 @@ function padCell(value, width) {
     return trimmed + ' '.repeat(width - trimmed.length);
 }
 function indexingJobCompletedMessage(job) {
+    var _a;
     const actionMessage = indexingJobCompletedActionMessage(job);
     if (job.job_status === 'canceled') {
         return `Canceled ${actionMessage} before it could finish.`;
@@ -1063,7 +1136,7 @@ function indexingJobCompletedMessage(job) {
         return `Finished ${actionMessage}.`;
     }
     if (job.job_status === 'errored') {
-        if (job.invalid_triples_sample?.length) {
+        if ((_a = job.invalid_triples_sample) === null || _a === void 0 ? void 0 : _a.length) {
             const [etype, label] = job.attr_name.split('.');
             const samples = formatSamples(job.invalid_triples_sample);
             const longestValue = samples.reduce((acc, { value }) => Math.max(acc, value.length), label.length);
@@ -1131,85 +1204,88 @@ function jobGroupDescription(jobs) {
     }
     return joinInSentence([...actions].sort()) || 'updating schema';
 }
-async function waitForIndexingJobsToFinish(appId, data) {
-    const spinnerDefferedPromise = deferred();
-    const spinner = new UI.Spinner({
-        promise: spinnerDefferedPromise.promise,
-    });
-    const spinnerRenderPromise = renderUnwrap(spinner);
-    const groupId = data['group-id'];
-    let jobs = data.jobs;
-    let waitMs = 20;
-    let lastUpdatedAt = new Date(0);
-    const completedIds = new Set();
-    const errorMessages = [];
-    while (true) {
-        let stillRunning = false;
-        let updated = false;
-        let workEstimateTotal = 0;
-        let workCompletedTotal = 0;
-        for (const job of jobs) {
-            const updatedAt = new Date(job.updated_at);
-            if (updatedAt > lastUpdatedAt) {
-                updated = true;
-                lastUpdatedAt = updatedAt;
-            }
-            if (job.job_status === 'waiting' || job.job_status === 'processing') {
-                stillRunning = true;
-                // Default estimate to high value to prevent % from jumping around
-                workEstimateTotal += job.work_estimate ?? 50000;
-                workCompletedTotal += job.work_completed ?? 0;
-            }
-            else {
-                if (!completedIds.has(job.id)) {
-                    completedIds.add(job.id);
-                    const msg = indexingJobCompletedMessage(job);
-                    if (msg) {
-                        if (job.job_status === 'errored') {
-                            spinner.addMessage(msg);
-                            errorMessages.push(msg);
-                        }
-                        else {
-                            spinner.addMessage(msg);
+function waitForIndexingJobsToFinish(appId, data) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
+        const spinnerDefferedPromise = deferred();
+        const spinner = new UI.Spinner({
+            promise: spinnerDefferedPromise.promise,
+        });
+        const spinnerRenderPromise = renderUnwrap(spinner);
+        const groupId = data['group-id'];
+        let jobs = data.jobs;
+        let waitMs = 20;
+        let lastUpdatedAt = new Date(0);
+        const completedIds = new Set();
+        const errorMessages = [];
+        while (true) {
+            let stillRunning = false;
+            let updated = false;
+            let workEstimateTotal = 0;
+            let workCompletedTotal = 0;
+            for (const job of jobs) {
+                const updatedAt = new Date(job.updated_at);
+                if (updatedAt > lastUpdatedAt) {
+                    updated = true;
+                    lastUpdatedAt = updatedAt;
+                }
+                if (job.job_status === 'waiting' || job.job_status === 'processing') {
+                    stillRunning = true;
+                    // Default estimate to high value to prevent % from jumping around
+                    workEstimateTotal += (_a = job.work_estimate) !== null && _a !== void 0 ? _a : 50000;
+                    workCompletedTotal += (_b = job.work_completed) !== null && _b !== void 0 ? _b : 0;
+                }
+                else {
+                    if (!completedIds.has(job.id)) {
+                        completedIds.add(job.id);
+                        const msg = indexingJobCompletedMessage(job);
+                        if (msg) {
+                            if (job.job_status === 'errored') {
+                                spinner.addMessage(msg);
+                                errorMessages.push(msg);
+                            }
+                            else {
+                                spinner.addMessage(msg);
+                            }
                         }
                     }
                 }
             }
+            if (!stillRunning) {
+                break;
+            }
+            if (workEstimateTotal) {
+                const percent = Math.floor((workCompletedTotal / workEstimateTotal) * 100);
+                spinner.updateText(`${jobGroupDescription(jobs)} ${percent}%`);
+            }
+            waitMs = updated ? 1 : Math.min(10000, waitMs * 2);
+            yield sleep(waitMs);
+            const res = yield fetchJson({
+                debugName: 'Check indexing status',
+                method: 'GET',
+                path: `/dash/apps/${appId}/indexing-jobs/group/${groupId}`,
+                errorMessage: 'Failed to check indexing status.',
+                command: 'push',
+            });
+            if (!res.ok) {
+                break;
+            }
+            jobs = res.data.jobs;
         }
-        if (!stillRunning) {
-            break;
-        }
-        if (workEstimateTotal) {
-            const percent = Math.floor((workCompletedTotal / workEstimateTotal) * 100);
-            spinner.updateText(`${jobGroupDescription(jobs)} ${percent}%`);
-        }
-        waitMs = updated ? 1 : Math.min(10000, waitMs * 2);
-        await sleep(waitMs);
-        const res = await fetchJson({
-            debugName: 'Check indexing status',
-            method: 'GET',
-            path: `/dash/apps/${appId}/indexing-jobs/group/${groupId}`,
-            errorMessage: 'Failed to check indexing status.',
-            command: 'push',
-        });
-        if (!res.ok) {
-            break;
+        spinnerDefferedPromise.resolve(null);
+        yield spinnerRenderPromise;
+        // Log errors at the end so that they're easier to see.
+        if (errorMessages.length) {
+            for (const msg of errorMessages) {
+                console.log(msg);
+            }
+            console.log(chalk.red('Some steps failed while updating schema.'));
+            process.exit(1);
         }
-        jobs = res.data.jobs;
-    }
-    spinnerDefferedPromise.resolve(null);
-    await spinnerRenderPromise;
-    // Log errors at the end so that they're easier to see.
-    if (errorMessages.length) {
-        for (const msg of errorMessages) {
-            console.log(msg);
-        }
-        console.log(chalk.red('Some steps failed while updating schema.'));
-        process.exit(1);
-    }
+    });
 }
-const resolveRenames = async (created, promptData, extraInfo) => {
-    const answer = await renderUnwrap(new ResolveRenamePrompt(created, promptData, extraInfo, UI.modifiers.piped([
+const resolveRenames = (created, promptData, extraInfo) => __awaiter(void 0, void 0, void 0, function* () {
+    const answer = yield renderUnwrap(new ResolveRenamePrompt(created, promptData, extraInfo, UI.modifiers.piped([
         (out) => boxen(out, {
             dimBorder: true,
             padding: {
@@ -1220,7 +1296,7 @@ const resolveRenames = async (created, promptData, extraInfo) => {
         UI.modifiers.vanishOnComplete,
     ])));
     return answer;
-};
+});
 function collectSystemCatalogIdentNames(currentAttrs) {
     const allSystemIdents = currentAttrs
         .filter((attr) => attr.catalog === 'system')
@@ -1233,64 +1309,151 @@ function collectSystemCatalogIdentNames(currentAttrs) {
     }
     return res;
 }
-async function pushSchema(appId, opts) {
-    const res = await readLocalSchemaFileWithErrorLogging();
-    if (!res)
-        return { ok: false };
-    const { schema } = res;
-    const pulledSchemaResponse = await fetchJson({
-        method: 'GET',
-        path: `/dash/apps/${appId}/schema/pull`,
-        debugName: 'Schema plan',
-        errorMessage: 'Failed to get old schema.',
-        command: 'push',
-    });
-    if (!pulledSchemaResponse.ok)
-        return pulledSchemaResponse;
-    const currentAttrs = pulledSchemaResponse.data['attrs'];
-    const currentApiSchema = pulledSchemaResponse.data['schema'];
-    const oldSchema = apiSchemaToInstantSchemaDef(currentApiSchema, {
-        disableTypeInference: true,
-    });
-    const systemCatalogIdentNames = collectSystemCatalogIdentNames(currentAttrs);
-    try {
-        validateSchema(schema, systemCatalogIdentNames);
-    }
-    catch (error) {
-        if (error instanceof SchemaValidationError) {
-            console.error(chalk.red('Invalid schema:', error.message));
+function pushSchema(appId, opts) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const res = yield readLocalSchemaFileWithErrorLogging();
+        if (!res)
+            return { ok: false };
+        const { schema } = res;
+        const pulledSchemaResponse = yield fetchJson({
+            method: 'GET',
+            path: `/dash/apps/${appId}/schema/pull`,
+            debugName: 'Schema plan',
+            errorMessage: 'Failed to get old schema.',
+            command: 'push',
+        });
+        if (!pulledSchemaResponse.ok)
+            return pulledSchemaResponse;
+        const currentAttrs = pulledSchemaResponse.data['attrs'];
+        const currentApiSchema = pulledSchemaResponse.data['schema'];
+        const oldSchema = apiSchemaToInstantSchemaDef(currentApiSchema, {
+            disableTypeInference: true,
+        });
+        const systemCatalogIdentNames = collectSystemCatalogIdentNames(currentAttrs);
+        try {
+            validateSchema(schema, systemCatalogIdentNames);
+        }
+        catch (error) {
+            if (error instanceof SchemaValidationError) {
+                console.error(chalk.red('Invalid schema:', error.message));
+            }
+            else {
+                console.error('Unexpected error:', error);
+            }
+            return { ok: false };
+        }
+        const renameSelector = program.optsWithGlobals().yes
+            ? buildAutoRenameSelector(opts)
+            : resolveRenames;
+        const diffResult = yield diffSchemas(oldSchema, schema, renameSelector, systemCatalogIdentNames);
+        if (currentAttrs === undefined) {
+            throw new Error("Couldn't get current schema from server");
+        }
+        const txSteps = convertTxSteps(diffResult, currentAttrs);
+        if (txSteps.length === 0) {
+            console.log(chalk.bgGray('No schema changes to apply!'));
+            return { ok: true };
+        }
+        let wantsToPush = false;
+        try {
+            const groupedSteps = groupSteps(diffResult);
+            const lines = renderSchemaPlan(groupedSteps, currentAttrs);
+            if (program.optsWithGlobals().yes) {
+                console.log('Applying schema changes...');
+                console.log(lines.join('\n'));
+            }
+            wantsToPush = yield promptOk({
+                promptText: 'Push these changes?',
+                yesText: 'Push',
+                noText: 'Cancel',
+                modifyOutput: (output) => {
+                    let both = lines.join('\n') + '\n\n' + output;
+                    return boxen(both, {
+                        dimBorder: true,
+                        padding: {
+                            left: 1,
+                            right: 1,
+                        },
+                    });
+                },
+            }, program.opts());
+        }
+        catch (error) {
+            if (error instanceof CancelSchemaError) {
+                console.info('Schema migration cancelled!');
+            }
+            return { ok: false };
+        }
+        if (verbose) {
+            console.log(txSteps);
+        }
+        if (wantsToPush) {
+            const applyRes = yield fetchJson({
+                method: 'POST',
+                path: `/dash/apps/${appId}/schema/steps/apply`,
+                debugName: 'Schema apply',
+                errorMessage: 'Failed to update schema.',
+                body: {
+                    steps: txSteps,
+                },
+                command: 'push',
+            });
+            console.log(chalk.green('Schema updated!'));
+            if (!applyRes.ok)
+                return applyRes;
+            if (applyRes.data['indexing-jobs']) {
+                yield waitForIndexingJobsToFinish(appId, applyRes.data['indexing-jobs']);
+            }
         }
         else {
-            console.error('Unexpected error:', error);
+            console.info('Schema migration cancelled!');
         }
-        return { ok: false };
-    }
-    const renameSelector = program.optsWithGlobals().yes
-        ? buildAutoRenameSelector(opts)
-        : resolveRenames;
-    const diffResult = await diffSchemas(oldSchema, schema, renameSelector, systemCatalogIdentNames);
-    if (currentAttrs === undefined) {
-        throw new Error("Couldn't get current schema from server");
-    }
-    const txSteps = convertTxSteps(diffResult, currentAttrs);
-    if (txSteps.length === 0) {
-        console.log(chalk.bgGray('No schema changes to apply!'));
         return { ok: true };
-    }
-    let wantsToPush = false;
-    try {
-        const groupedSteps = groupSteps(diffResult);
-        const lines = renderSchemaPlan(groupedSteps, currentAttrs);
-        if (program.optsWithGlobals().yes) {
-            console.log('Applying schema changes...');
-            console.log(lines.join('\n'));
+    });
+}
+function claimEphemeralApp(appId, adminToken) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const res = yield fetchJson({
+            method: 'POST',
+            body: {
+                app_id: appId,
+                token: adminToken,
+            },
+            path: `/dash/apps/ephemeral/${appId}/claim`,
+            debugName: 'Claim ephemeral app',
+            errorMessage: 'Failed to claim ephemeral app.',
+            command: 'claim',
+        });
+        if (!res.ok)
+            return res;
+        console.log(chalk.green('App claimed!'));
+        return { ok: true };
+    });
+}
+function pushPerms(appId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const res = yield readLocalPermsFileWithErrorLogging();
+        if (!res) {
+            return { ok: true };
         }
-        wantsToPush = await promptOk({
-            promptText: 'Push these changes?',
-            yesText: 'Push',
-            noText: 'Cancel',
+        console.log('Planning perms...');
+        const prodPerms = yield fetchJson({
+            path: `/dash/apps/${appId}/perms/pull`,
+            debugName: 'Perms pull',
+            errorMessage: 'Failed to pull perms.',
+            command: 'push',
+        });
+        if (!prodPerms.ok)
+            return prodPerms;
+        const diffedStr = jsonDiff.diffString(prodPerms.data.perms || {}, res.perms || {});
+        if (!diffedStr.length) {
+            console.log('No perms changes detected. Skipping.');
+            return { ok: true };
+        }
+        const okPush = yield promptOk({
+            promptText: 'Push these changes to your perms?',
             modifyOutput: (output) => {
-                let both = lines.join('\n') + '\n\n' + output;
+                let both = diffedStr + '\n' + output;
                 return boxen(both, {
                     dimBorder: true,
                     padding: {
@@ -1300,130 +1463,52 @@ async function pushSchema(appId, opts) {
                 });
             },
         }, program.opts());
-    }
-    catch (error) {
-        if (error instanceof CancelSchemaError) {
-            console.info('Schema migration cancelled!');
-        }
-        return { ok: false };
-    }
-    if (verbose) {
-        console.log(txSteps);
-    }
-    if (wantsToPush) {
-        const applyRes = await fetchJson({
+        if (!okPush)
+            return { ok: true };
+        const permsRes = yield fetchJson({
             method: 'POST',
-            path: `/dash/apps/${appId}/schema/steps/apply`,
+            path: `/dash/apps/${appId}/rules`,
             debugName: 'Schema apply',
             errorMessage: 'Failed to update schema.',
             body: {
-                steps: txSteps,
+                code: res.perms,
             },
             command: 'push',
         });
-        console.log(chalk.green('Schema updated!'));
-        if (!applyRes.ok)
-            return applyRes;
-        if (applyRes.data['indexing-jobs']) {
-            await waitForIndexingJobsToFinish(appId, applyRes.data['indexing-jobs']);
-        }
-    }
-    else {
-        console.info('Schema migration cancelled!');
-    }
-    return { ok: true };
-}
-async function claimEphemeralApp(appId, adminToken) {
-    const res = await fetchJson({
-        method: 'POST',
-        body: {
-            app_id: appId,
-            token: adminToken,
-        },
-        path: `/dash/apps/ephemeral/${appId}/claim`,
-        debugName: 'Claim ephemeral app',
-        errorMessage: 'Failed to claim ephemeral app.',
-        command: 'claim',
-    });
-    if (!res.ok)
-        return res;
-    console.log(chalk.green('App claimed!'));
-    return { ok: true };
-}
-async function pushPerms(appId) {
-    const res = await readLocalPermsFileWithErrorLogging();
-    if (!res) {
+        if (!permsRes.ok)
+            return permsRes;
+        console.log(chalk.green('Permissions updated!'));
         return { ok: true };
-    }
-    console.log('Planning perms...');
-    const prodPerms = await fetchJson({
-        path: `/dash/apps/${appId}/perms/pull`,
-        debugName: 'Perms pull',
-        errorMessage: 'Failed to pull perms.',
-        command: 'push',
     });
-    if (!prodPerms.ok)
-        return prodPerms;
-    const diffedStr = jsonDiff.diffString(prodPerms.data.perms || {}, res.perms || {});
-    if (!diffedStr.length) {
-        console.log('No perms changes detected. Skipping.');
-        return { ok: true };
-    }
-    const okPush = await promptOk({
-        promptText: 'Push these changes to your perms?',
-        modifyOutput: (output) => {
-            let both = diffedStr + '\n' + output;
-            return boxen(both, {
-                dimBorder: true,
-                padding: {
-                    left: 1,
-                    right: 1,
-                },
+}
+function waitForAuthToken(_a) {
+    return __awaiter(this, arguments, void 0, function* ({ secret }) {
+        var _b, _c, _d;
+        for (let i = 1; i <= 120; i++) {
+            yield sleep(1000);
+            const authCheckRes = yield fetchJson({
+                method: 'POST',
+                debugName: 'Auth check',
+                errorMessage: 'Failed to check auth status.',
+                path: '/dash/cli/auth/check',
+                body: { secret },
+                noAuth: true,
+                noLogError: true,
+                command: 'login',
             });
-        },
-    }, program.opts());
-    if (!okPush)
-        return { ok: true };
-    const permsRes = await fetchJson({
-        method: 'POST',
-        path: `/dash/apps/${appId}/rules`,
-        debugName: 'Schema apply',
-        errorMessage: 'Failed to update schema.',
-        body: {
-            code: res.perms,
-        },
-        command: 'push',
-    });
-    if (!permsRes.ok)
-        return permsRes;
-    console.log(chalk.green('Permissions updated!'));
-    return { ok: true };
-}
-async function waitForAuthToken({ secret }) {
-    for (let i = 1; i <= 120; i++) {
-        await sleep(1000);
-        const authCheckRes = await fetchJson({
-            method: 'POST',
-            debugName: 'Auth check',
-            errorMessage: 'Failed to check auth status.',
-            path: '/dash/cli/auth/check',
-            body: { secret },
-            noAuth: true,
-            noLogError: true,
-            command: 'login',
-        });
-        if (authCheckRes.ok) {
-            return authCheckRes.data;
-        }
-        if (authCheckRes.data?.hint.errors?.[0]?.issue === 'waiting-for-user') {
-            continue;
+            if (authCheckRes.ok) {
+                return authCheckRes.data;
+            }
+            if (((_d = (_c = (_b = authCheckRes.data) === null || _b === void 0 ? void 0 : _b.hint.errors) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.issue) === 'waiting-for-user') {
+                continue;
+            }
+            error('Failed to authenticate ');
+            prettyPrintJSONErr(authCheckRes.data);
+            return;
         }
-        error('Failed to authenticate ');
-        prettyPrintJSONErr(authCheckRes.data);
-        return;
-    }
-    error('Timed out waiting for authentication');
-    return null;
+        error('Timed out waiting for authentication');
+        return null;
+    });
 }
 // resources
 /**
@@ -1440,69 +1525,66 @@ async function waitForAuthToken({ secret }) {
  * @param {string} [options.command] - The CLI command being executed (e.g., 'push', 'pull', 'login')
  * @returns {Promise<{ ok: boolean; data: any }>}
  */
-async function fetchJson({ debugName, errorMessage, path, body, method, noAuth, noLogError, command, }) {
-    const withAuth = !noAuth;
-    const withErrorLogging = !noLogError;
-    let authToken = null;
-    if (withAuth) {
-        authToken = await readConfigAuthTokenWithErrorLogging();
-        if (!authToken) {
-            return { ok: false, data: undefined };
-        }
-    }
-    const timeoutMs = 1000 * 60 * 5; // 5 minutes
-    try {
-        const res = await fetch(`${instantBackendOrigin}${path}`, {
-            method: method ?? 'GET',
-            headers: {
-                ...(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),
-        });
-        if (verbose) {
-            console.log(debugName, 'response:', res.status, res.statusText);
+function fetchJson(_a) {
+    return __awaiter(this, arguments, void 0, function* ({ debugName, errorMessage, path, body, method, noAuth, noLogError, command, }) {
+        const withAuth = !noAuth;
+        const withErrorLogging = !noLogError;
+        let authToken = null;
+        if (withAuth) {
+            authToken = yield readConfigAuthTokenWithErrorLogging();
+            if (!authToken) {
+                return { ok: false, data: undefined };
+            }
         }
-        let data;
+        const timeoutMs = 1000 * 60 * 5; // 5 minutes
         try {
-            data = await res.json();
-        }
-        catch {
-            data = null;
-        }
-        if (verbose && data) {
-            console.log(debugName, 'json:', JSON.stringify(data, null, 2));
-        }
-        if (!res.ok) {
-            if (withErrorLogging) {
-                error(errorMessage);
-                prettyPrintJSONErr(data);
+            const res = yield fetch(`${instantBackendOrigin}${path}`, {
+                method: method !== null && method !== void 0 ? method : 'GET',
+                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),
+            });
+            if (verbose) {
+                console.log(debugName, 'response:', res.status, res.statusText);
             }
-            return { ok: false, data };
-        }
-        return { ok: true, data };
-    }
-    catch (err) {
-        if (withErrorLogging) {
-            if (err.name === 'AbortError') {
-                error(`Timeout: It took more than ${timeoutMs / 60000} minutes to get the result.`);
+            let data;
+            try {
+                data = yield res.json();
             }
-            else {
-                error(`Error: type: ${err.name}, message: ${err.message}`);
+            catch (_b) {
+                data = null;
+            }
+            if (verbose && data) {
+                console.log(debugName, 'json:', JSON.stringify(data, null, 2));
             }
+            if (!res.ok) {
+                if (withErrorLogging) {
+                    error(errorMessage);
+                    prettyPrintJSONErr(data);
+                }
+                return { ok: false, data };
+            }
+            return { ok: true, data };
         }
-        return { ok: false, data: null };
-    }
+        catch (err) {
+            if (withErrorLogging) {
+                if (err.name === 'AbortError') {
+                    error(`Timeout: It took more than ${timeoutMs / 60000} minutes to get the result.`);
+                }
+                else {
+                    error(`Error: type: ${err.name}, message: ${err.message}`);
+                }
+            }
+            return { ok: false, data: null };
+        }
+    });
 }
 function prettyPrintJSONErr(data) {
-    if (data?.message) {
+    var _a;
+    if (data === null || data === void 0 ? void 0 : data.message) {
         error(data.message);
     }
-    if (Array.isArray(data?.hint?.errors)) {
+    if (Array.isArray((_a = data === null || data === void 0 ? void 0 : data.hint) === null || _a === void 0 ? void 0 : _a.errors)) {
         for (const err of data.hint.errors) {
             error(`${err.in ? err.in.join('->') + ': ' : ''}${err.message}`);
         }
@@ -1511,109 +1593,128 @@ function prettyPrintJSONErr(data) {
         error('Failed to parse error response');
     }
 }
-async function readLocalPermsFile() {
-    const readCandidates = getPermsReadCandidates();
-    const res = await loadConfig({
-        sources: readCandidates,
-        merge: false,
+function readLocalPermsFile() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const readCandidates = getPermsReadCandidates();
+        const res = yield loadConfig({
+            sources: readCandidates,
+            merge: false,
+        });
+        if (!res.config)
+            return;
+        const relativePath = path.relative(process.cwd(), res.sources[0]);
+        return { path: relativePath, perms: res.config };
     });
-    if (!res.config)
-        return;
-    const relativePath = path.relative(process.cwd(), res.sources[0]);
-    return { path: relativePath, perms: res.config };
-}
-async function readLocalPermsFileWithErrorLogging() {
-    const res = await readLocalPermsFile();
-    if (!res) {
-        error(`We couldn't find your ${chalk.yellow('`instant.perms.ts`')} file. Make sure it's in the root directory. (Hint: You can use an INSTANT_PERMS_FILE_PATH environment variable to specify it.)`);
-    }
-    return res;
 }
-async function readLocalSchemaFile() {
-    const readCandidates = getSchemaReadCandidates();
-    const res = await loadConfig({
-        sources: readCandidates,
-        merge: false,
+function readLocalPermsFileWithErrorLogging() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const res = yield readLocalPermsFile();
+        if (!res) {
+            error(`We couldn't find your ${chalk.yellow('`instant.perms.ts`')} file. Make sure it's in the root directory. (Hint: You can use an INSTANT_PERMS_FILE_PATH environment variable to specify it.)`);
+        }
+        return res;
     });
-    if (!res.config)
-        return;
-    const relativePath = path.relative(process.cwd(), res.sources[0]);
-    return { path: relativePath, schema: res.config };
-}
-async function readInstantConfigFile() {
-    return (await loadConfig({
-        sources: [
-            // load from `instant.config.xx`
-            {
-                files: 'instant.config',
-                extensions: ['ts', 'mts', 'cts', 'js', 'mjs', 'cjs', 'json'],
-            },
-        ],
-        // if false, the only the first matched will be loaded
-        // if true, all matched will be loaded and deep merged
-        merge: false,
-    })).config;
-}
-async function readLocalSchemaFileWithErrorLogging() {
-    const res = await readLocalSchemaFile();
-    if (!res) {
-        error(`We couldn't find your ${chalk.yellow('`instant.schema.ts`')} file. Make sure it's in the root directory. (Hint: You can use an INSTANT_SCHEMA_FILE_PATH environment variable to specify it.)`);
-        return;
-    }
-    if (res.schema?.constructor?.name !== 'InstantSchemaDef') {
-        error("We couldn't find your schema export.");
-        error('In your ' +
-            chalk.green('`instant.schema.ts`') +
-            ' file, make sure you ' +
-            chalk.green('`export default schema`'));
-        return;
-    }
-    return res;
 }
-async function readConfigAuthToken(allowAdminToken = true) {
-    const options = program.opts();
-    if (typeof options.token === 'string') {
-        return options.token;
-    }
-    if (process.env.INSTANT_CLI_AUTH_TOKEN) {
-        return process.env.INSTANT_CLI_AUTH_TOKEN;
-    }
-    if (allowAdminToken) {
-        const adminTokenNames = Object.values(potentialAdminTokenEnvs);
-        for (const envName of adminTokenNames) {
-            const token = process.env[envName];
-            if (token) {
-                return token;
-            }
+function readLocalSchemaFile() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const readCandidates = getSchemaReadCandidates();
+        const res = yield loadConfig({
+            sources: readCandidates,
+            merge: false,
+        });
+        if (!res.config)
+            return;
+        const relativePath = path.relative(process.cwd(), res.sources[0]);
+        return { path: relativePath, schema: res.config };
+    });
+}
+function readInstantConfigFile() {
+    return __awaiter(this, void 0, void 0, function* () {
+        return (yield loadConfig({
+            sources: [
+                // load from `instant.config.xx`
+                {
+                    files: 'instant.config',
+                    extensions: ['ts', 'mts', 'cts', 'js', 'mjs', 'cjs', 'json'],
+                },
+            ],
+            // if false, the only the first matched will be loaded
+            // if true, all matched will be loaded and deep merged
+            merge: false,
+        })).config;
+    });
+}
+function readLocalSchemaFileWithErrorLogging() {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
+        const res = yield readLocalSchemaFile();
+        if (!res) {
+            error(`We couldn't find your ${chalk.yellow('`instant.schema.ts`')} file. Make sure it's in the root directory. (Hint: You can use an INSTANT_SCHEMA_FILE_PATH environment variable to specify it.)`);
+            return;
         }
-    }
-    const authToken = await readFile(getAuthPaths().authConfigFilePath, 'utf-8').catch(() => null);
-    if (authToken) {
-        return authToken;
-    }
-    return null;
+        if (((_b = (_a = res.schema) === null || _a === void 0 ? void 0 : _a.constructor) === null || _b === void 0 ? void 0 : _b.name) !== 'InstantSchemaDef') {
+            error("We couldn't find your schema export.");
+            error('In your ' +
+                chalk.green('`instant.schema.ts`') +
+                ' file, make sure you ' +
+                chalk.green('`export default schema`'));
+            return;
+        }
+        return res;
+    });
 }
-export async function readConfigAuthTokenWithErrorLogging() {
-    const token = await readConfigAuthToken();
-    if (!token) {
-        error(`Looks like you are not logged in. Please log in with ${chalk.green('`instant-cli login`')}`);
-    }
-    return token;
+function readConfigAuthToken() {
+    return __awaiter(this, arguments, void 0, function* (allowAdminToken = true) {
+        const options = program.opts();
+        if (typeof options.token === 'string') {
+            return options.token;
+        }
+        if (process.env.INSTANT_CLI_AUTH_TOKEN) {
+            return process.env.INSTANT_CLI_AUTH_TOKEN;
+        }
+        if (allowAdminToken) {
+            const adminTokenNames = Object.values(potentialAdminTokenEnvs);
+            for (const envName of adminTokenNames) {
+                const token = process.env[envName];
+                if (token) {
+                    return token;
+                }
+            }
+        }
+        const authToken = yield readFile(getAuthPaths().authConfigFilePath, 'utf-8').catch(() => null);
+        if (authToken) {
+            return authToken;
+        }
+        return null;
+    });
 }
-async function readAuthTokenOrLoginWithErrorLogging() {
-    const token = await readConfigAuthToken();
-    if (token)
+export function readConfigAuthTokenWithErrorLogging() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const token = yield readConfigAuthToken();
+        if (!token) {
+            error(`Looks like you are not logged in. Please log in with ${chalk.green('`instant-cli login`')}`);
+        }
         return token;
-    console.log(`Looks like you are not logged in...`);
-    console.log(`Let's log in!`);
-    return await login({});
-}
-async function saveConfigAuthToken(authToken) {
-    const authPaths = getAuthPaths();
-    await mkdir(authPaths.appConfigDirPath, {
-        recursive: true,
     });
-    return writeFile(authPaths.authConfigFilePath, authToken, 'utf-8');
+}
+function readAuthTokenOrLoginWithErrorLogging() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const token = yield readConfigAuthToken();
+        if (token)
+            return token;
+        console.log(`Looks like you are not logged in...`);
+        console.log(`Let's log in!`);
+        return yield login({});
+    });
+}
+function saveConfigAuthToken(authToken) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const authPaths = getAuthPaths();
+        yield mkdir(authPaths.appConfigDirPath, {
+            recursive: true,
+        });
+        return writeFile(authPaths.authConfigFilePath, authToken, 'utf-8');
+    });
 }
 // utils
 function sleep(ms) {
@@ -1639,16 +1740,20 @@ function identName(ident) {
     return `${identEtype(ident)}.${identLabel(ident)}`;
 }
 function attrFwdLabel(attr) {
-    return attr['forward-identity']?.[2];
+    var _a;
+    return (_a = attr['forward-identity']) === null || _a === void 0 ? void 0 : _a[2];
 }
 function attrFwdEtype(attr) {
-    return attr['forward-identity']?.[1];
+    var _a;
+    return (_a = attr['forward-identity']) === null || _a === void 0 ? void 0 : _a[1];
 }
 function attrRevLabel(attr) {
-    return attr['reverse-identity']?.[2];
+    var _a;
+    return (_a = attr['reverse-identity']) === null || _a === void 0 ? void 0 : _a[2];
 }
 function attrRevEtype(attr) {
-    return attr['reverse-identity']?.[1];
+    var _a;
+    return (_a = attr['reverse-identity']) === null || _a === void 0 ? void 0 : _a[1];
 }
 function attrFwdName(attr) {
     return `${attrFwdEtype(attr)}.${attrFwdLabel(attr)}`;
@@ -1669,23 +1774,26 @@ function isUUID(uuid) {
     const uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
     return uuidRegex.test(uuid);
 }
-async function detectAppIdFromOptsWithErrorLogging(opts) {
-    if (!opts.app)
-        return { ok: true };
-    const appId = opts.app;
-    const config = await readInstantConfigFile();
-    const nameMatch = config?.apps?.[appId];
-    const namedAppId = nameMatch?.id && isUUID(nameMatch.id) ? nameMatch : null;
-    const uuidAppId = appId && isUUID(appId) ? appId : null;
-    if (nameMatch && !namedAppId) {
-        error(`Expected \`${appId}\` to point to a UUID, but got ${nameMatch.id}.`);
-        return { ok: false };
-    }
-    if (!namedAppId && !uuidAppId) {
-        error(`Expected App ID to be a UUID, but got: ${chalk.red(appId)}`);
-        return { ok: false };
-    }
-    return { ok: true, appId: namedAppId || uuidAppId };
+function detectAppIdFromOptsWithErrorLogging(opts) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        if (!opts.app)
+            return { ok: true };
+        const appId = opts.app;
+        const config = yield readInstantConfigFile();
+        const nameMatch = (_a = config === null || config === void 0 ? void 0 : config.apps) === null || _a === void 0 ? void 0 : _a[appId];
+        const namedAppId = (nameMatch === null || nameMatch === void 0 ? void 0 : nameMatch.id) && isUUID(nameMatch.id) ? nameMatch : null;
+        const uuidAppId = appId && isUUID(appId) ? appId : null;
+        if (nameMatch && !namedAppId) {
+            error(`Expected \`${appId}\` to point to a UUID, but got ${nameMatch.id}.`);
+            return { ok: false };
+        }
+        if (!namedAppId && !uuidAppId) {
+            error(`Expected App ID to be a UUID, but got: ${chalk.red(appId)}`);
+            return { ok: false };
+        }
+        return { ok: true, appId: namedAppId || uuidAppId };
+    });
 }
 function detectAppIdFromEnvWithErrorLogging() {
     const found = Object.keys(potentialEnvs)