instant-cli 0.22.95-experimental.surgical.20386947966.1 → 0.22.95

package/dist/util/mergeSchema.js

@@ -0,0 +1,334 @@
+import * as acorn from 'acorn';
+import tsPlugin from 'acorn-typescript';
+const node = acorn.Parser.extend(tsPlugin({ dts: false }));
+// --- Import Handling Helpers ---
+function collectImports(ast) {
+    const imports = new Map(); // localName -> { source, importedName, type, importKind }
+    for (const node of ast.body) {
+        if (node.type === 'ImportDeclaration') {
+            const source = node.source.value;
+            const declImportKind = node.importKind;
+            for (const specifier of node.specifiers) {
+                let kind = 'value';
+                if (declImportKind === 'type' || specifier.importKind === 'type') {
+                    kind = 'type';
+                }
+                if (specifier.type === 'ImportSpecifier') {
+                    imports.set(specifier.local.name, {
+                        source,
+                        importedName: specifier.imported.name,
+                        type: 'named',
+                        importKind: kind,
+                    });
+                }
+                else if (specifier.type === 'ImportDefaultSpecifier') {
+                    imports.set(specifier.local.name, {
+                        source,
+                        type: 'default',
+                        importKind: kind,
+                    });
+                }
+                else if (specifier.type === 'ImportNamespaceSpecifier') {
+                    imports.set(specifier.local.name, {
+                        source,
+                        type: 'namespace',
+                        importKind: kind,
+                    });
+                }
+            }
+        }
+    }
+    return imports;
+}
+function collectExistingImports(ast) {
+    const existing = new Map(); // source -> Set<localName>
+    for (const node of ast.body) {
+        if (node.type === 'ImportDeclaration') {
+            const source = node.source.value;
+            if (!existing.has(source))
+                existing.set(source, new Set());
+            for (const specifier of node.specifiers) {
+                existing.get(source).add(specifier.local.name);
+            }
+        }
+    }
+    return existing;
+}
+function findIdentifiers(node, set = new Set()) {
+    if (!node)
+        return set;
+    // If it's a Type Reference, grab the name
+    if (node.type === 'TSTypeReference') {
+        if (node.typeName.type === 'Identifier') {
+            set.add(node.typeName.name);
+        }
+        else if (node.typeName.type === 'TSQualifiedName') {
+            // For A.B, we need A
+            let left = node.typeName.left;
+            while (left.type === 'TSQualifiedName') {
+                left = left.left;
+            }
+            if (left.type === 'Identifier') {
+                set.add(left.name);
+            }
+        }
+    }
+    // Recursive walk
+    for (const key in node) {
+        if (key === 'loc' || key === 'start' || key === 'end')
+            continue;
+        if (typeof node[key] === 'object' && node[key] !== null) {
+            if (Array.isArray(node[key])) {
+                node[key].forEach((child) => findIdentifiers(child, set));
+            }
+            else {
+                findIdentifiers(node[key], set);
+            }
+        }
+    }
+    return set;
+}
+// --- Schema Traversal Helpers ---
+function getPropName(prop) {
+    if (prop.key.type === 'Identifier')
+        return prop.key.name;
+    if (prop.key.type === 'Literal')
+        return prop.key.value;
+    return null;
+}
+function analyzeChain(node) {
+    let curr = node;
+    let typeParams = null;
+    let baseCall = null;
+    while (curr.type === 'CallExpression') {
+        if (curr.typeParameters) {
+            typeParams = curr.typeParameters;
+        }
+        if (curr.callee.type === 'MemberExpression' &&
+            curr.callee.object.type === 'Identifier' &&
+            curr.callee.object.name === 'i') {
+            baseCall = curr;
+        }
+        if (curr.callee.type === 'MemberExpression') {
+            curr = curr.callee.object;
+        }
+        else {
+            break;
+        }
+    }
+    return { typeParams, baseCall };
+}
+function traverseSchema(node, path, callback) {
+    if (node.type === 'ObjectExpression') {
+        for (const prop of node.properties) {
+            const name = getPropName(prop);
+            if (!name)
+                continue;
+            const newPath = path ? `${path}.${name}` : name;
+            if (prop.value.type === 'ObjectExpression') {
+                traverseSchema(prop.value, newPath, callback);
+            }
+            else if (prop.value.type === 'CallExpression') {
+                let isEntity = false;
+                if (prop.value.callee.type === 'MemberExpression' &&
+                    prop.value.callee.property.name === 'entity' &&
+                    prop.value.callee.object.type === 'Identifier' &&
+                    prop.value.callee.object.name === 'i') {
+                    isEntity = true;
+                }
+                if (isEntity) {
+                    callback(prop.value, newPath);
+                    if (prop.value.arguments.length > 0) {
+                        traverseSchema(prop.value.arguments[0], newPath, callback);
+                    }
+                }
+                else {
+                    callback(prop.value, newPath);
+                }
+            }
+        }
+    }
+}
+function findSchemaObject(ast) {
+    let schemaObj = null;
+    function walk(node) {
+        if (!node)
+            return;
+        if (schemaObj)
+            return;
+        if (node.type === 'CallExpression' &&
+            node.callee.type === 'MemberExpression' &&
+            node.callee.object.name === 'i' &&
+            node.callee.property.name === 'schema' &&
+            node.arguments.length > 0) {
+            schemaObj = node.arguments[0];
+            return;
+        }
+        for (const key in node) {
+            if (key === 'loc' || key === 'start' || key === 'end')
+                continue;
+            if (node[key] && typeof node[key] === 'object') {
+                if (Array.isArray(node[key])) {
+                    node[key].forEach(walk);
+                }
+                else {
+                    walk(node[key]);
+                }
+            }
+        }
+    }
+    walk(ast);
+    return schemaObj;
+}
+export function mergeSchema(oldFile, newFile) {
+    const oldParsed = node.parse(oldFile, {
+        sourceType: 'module',
+        ecmaVersion: 'latest',
+        locations: true,
+    });
+    const newParsed = node.parse(newFile, {
+        sourceType: 'module',
+        ecmaVersion: 'latest',
+        locations: true,
+    });
+    const schemaMap = new Map(); // Path -> { src, ast }
+    // 1. Extract from old file
+    const oldSchemaObj = findSchemaObject(oldParsed);
+    if (oldSchemaObj) {
+        traverseSchema(oldSchemaObj, '', (node, path) => {
+            const { typeParams } = analyzeChain(node);
+            if (typeParams) {
+                const src = oldFile.slice(typeParams.start, typeParams.end);
+                schemaMap.set(path, { src, ast: typeParams });
+            }
+        });
+    }
+    // 2. Collect Imports
+    const oldImports = collectImports(oldParsed);
+    const newExistingImports = collectExistingImports(newParsed);
+    const neededIdentifiers = new Set();
+    // 3. Apply to new file & Collect needed identifiers
+    const edits = [];
+    const newSchemaObj = findSchemaObject(newParsed);
+    if (newSchemaObj) {
+        traverseSchema(newSchemaObj, '', (node, path) => {
+            const { typeParams, baseCall } = analyzeChain(node);
+            const stored = schemaMap.get(path);
+            if (stored) {
+                // Collect identifiers from the type params we are about to inject
+                findIdentifiers(stored.ast, neededIdentifiers);
+                if (typeParams) {
+                    edits.push({
+                        start: typeParams.start,
+                        end: typeParams.end,
+                        text: stored.src,
+                    });
+                }
+                else if (baseCall) {
+                    edits.push({
+                        start: baseCall.callee.end,
+                        end: baseCall.callee.end,
+                        text: stored.src,
+                    });
+                }
+            }
+        });
+    }
+    // 4. Generate Import Statements
+    const importsToAdd = new Map(); // source -> { named: Map<string, {str, isType}>, default: {str, isType}, namespace: {str, isType} }
+    for (const id of neededIdentifiers) {
+        const importInfo = oldImports.get(id);
+        if (importInfo) {
+            // Check if already imported in new file
+            const existing = newExistingImports.get(importInfo.source);
+            if (existing && existing.has(id)) {
+                continue; // Already imported
+            }
+            if (!importsToAdd.has(importInfo.source)) {
+                importsToAdd.set(importInfo.source, {
+                    named: new Map(),
+                    default: null,
+                    namespace: null,
+                });
+            }
+            const group = importsToAdd.get(importInfo.source);
+            const isType = importInfo.importKind === 'type';
+            if (importInfo.type === 'named') {
+                let importStr = id;
+                if (importInfo.importedName !== id) {
+                    importStr = `${importInfo.importedName} as ${id}`;
+                }
+                group.named.set(importStr, { str: importStr, isType });
+            }
+            else if (importInfo.type === 'default') {
+                group.default = { str: id, isType };
+            }
+            else if (importInfo.type === 'namespace') {
+                group.namespace = { str: id, isType };
+            }
+        }
+    }
+    const importBlocks = [];
+    for (const [source, info] of importsToAdd) {
+        // Check if source exists in new file to merge?
+        // For simplicity, we append new import lines.
+        // But we can try to be smart.
+        // If we have named imports
+        if (info.named.size > 0) {
+            const namedImports = Array.from(info.named.values());
+            const allTypes = namedImports.every((x) => x.isType);
+            if (allTypes) {
+                const names = namedImports.map((x) => x.str).join(', ');
+                importBlocks.push(`import type { ${names} } from '${source}';`);
+            }
+            else {
+                const names = namedImports
+                    .map((x) => (x.isType ? `type ${x.str}` : x.str))
+                    .join(', ');
+                importBlocks.push(`import { ${names} } from '${source}';`);
+            }
+        }
+        if (info.default) {
+            if (info.default.isType) {
+                importBlocks.push(`import type ${info.default.str} from '${source}';`);
+            }
+            else {
+                importBlocks.push(`import ${info.default.str} from '${source}';`);
+            }
+        }
+        if (info.namespace) {
+            if (info.namespace.isType) {
+                importBlocks.push(`import type * as ${info.namespace.str} from '${source}';`);
+            }
+            else {
+                importBlocks.push(`import * as ${info.namespace.str} from '${source}';`);
+            }
+        }
+    }
+    // 5. Apply edits
+    edits.sort((a, b) => b.start - a.start);
+    let output = newFile;
+    for (const edit of edits) {
+        output = output.slice(0, edit.start) + edit.text + output.slice(edit.end);
+    }
+    // Prepend imports
+    if (importBlocks.length > 0) {
+        // Check for leading comments (e.g. // Docs: ...)
+        // We want to insert imports AFTER the leading comments but BEFORE the first code/import
+        // Simple heuristic: match consecutive lines at start that begin with //
+        const commentMatch = output.match(/^(\s*\/\/.*(\r?\n|$))+/);
+        if (commentMatch) {
+            const commentEnd = commentMatch[0].length;
+            output =
+                output.slice(0, commentEnd) +
+                    '\n' +
+                    importBlocks.join('\n') +
+                    output.slice(commentEnd);
+        }
+        else {
+            output = importBlocks.join('\n') + '\n' + output;
+        }
+    }
+    return output;
+}
+//# sourceMappingURL=mergeSchema.js.map

package/dist/util/mergeSchema.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mergeSchema.js","sourceRoot":"","sources":["../../src/util/mergeSchema.js"],"names":[],"mappings":"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","sourcesContent":["import * as acorn from 'acorn';\nimport tsPlugin from 'acorn-typescript';\n\nconst node = acorn.Parser.extend(tsPlugin({ dts: false }));\n\n// --- Import Handling Helpers ---\n\nfunction collectImports(ast) {\n  const imports = new Map(); // localName -> { source, importedName, type, importKind }\n\n  for (const node of ast.body) {\n    if (node.type === 'ImportDeclaration') {\n      const source = node.source.value;\n      const declImportKind = node.importKind;\n\n      for (const specifier of node.specifiers) {\n        let kind = 'value';\n        if (declImportKind === 'type' || specifier.importKind === 'type') {\n          kind = 'type';\n        }\n\n        if (specifier.type === 'ImportSpecifier') {\n          imports.set(specifier.local.name, {\n            source,\n            importedName: specifier.imported.name,\n            type: 'named',\n            importKind: kind,\n          });\n        } else if (specifier.type === 'ImportDefaultSpecifier') {\n          imports.set(specifier.local.name, {\n            source,\n            type: 'default',\n            importKind: kind,\n          });\n        } else if (specifier.type === 'ImportNamespaceSpecifier') {\n          imports.set(specifier.local.name, {\n            source,\n            type: 'namespace',\n            importKind: kind,\n          });\n        }\n      }\n    }\n  }\n  return imports;\n}\n\nfunction collectExistingImports(ast) {\n  const existing = new Map(); // source -> Set<localName>\n\n  for (const node of ast.body) {\n    if (node.type === 'ImportDeclaration') {\n      const source = node.source.value;\n      if (!existing.has(source)) existing.set(source, new Set());\n\n      for (const specifier of node.specifiers) {\n        existing.get(source).add(specifier.local.name);\n      }\n    }\n  }\n  return existing;\n}\n\nfunction findIdentifiers(node, set = new Set()) {\n  if (!node) return set;\n\n  // If it's a Type Reference, grab the name\n  if (node.type === 'TSTypeReference') {\n    if (node.typeName.type === 'Identifier') {\n      set.add(node.typeName.name);\n    } else if (node.typeName.type === 'TSQualifiedName') {\n      // For A.B, we need A\n      let left = node.typeName.left;\n      while (left.type === 'TSQualifiedName') {\n        left = left.left;\n      }\n      if (left.type === 'Identifier') {\n        set.add(left.name);\n      }\n    }\n  }\n\n  // Recursive walk\n  for (const key in node) {\n    if (key === 'loc' || key === 'start' || key === 'end') continue;\n    if (typeof node[key] === 'object' && node[key] !== null) {\n      if (Array.isArray(node[key])) {\n        node[key].forEach((child) => findIdentifiers(child, set));\n      } else {\n        findIdentifiers(node[key], set);\n      }\n    }\n  }\n  return set;\n}\n\n// --- Schema Traversal Helpers ---\n\nfunction getPropName(prop) {\n  if (prop.key.type === 'Identifier') return prop.key.name;\n  if (prop.key.type === 'Literal') return prop.key.value;\n  return null;\n}\n\nfunction analyzeChain(node) {\n  let curr = node;\n  let typeParams = null;\n  let baseCall = null;\n\n  while (curr.type === 'CallExpression') {\n    if (curr.typeParameters) {\n      typeParams = curr.typeParameters;\n    }\n\n    if (\n      curr.callee.type === 'MemberExpression' &&\n      curr.callee.object.type === 'Identifier' &&\n      curr.callee.object.name === 'i'\n    ) {\n      baseCall = curr;\n    }\n\n    if (curr.callee.type === 'MemberExpression') {\n      curr = curr.callee.object;\n    } else {\n      break;\n    }\n  }\n  return { typeParams, baseCall };\n}\n\nfunction traverseSchema(node, path, callback) {\n  if (node.type === 'ObjectExpression') {\n    for (const prop of node.properties) {\n      const name = getPropName(prop);\n      if (!name) continue;\n      const newPath = path ? `${path}.${name}` : name;\n\n      if (prop.value.type === 'ObjectExpression') {\n        traverseSchema(prop.value, newPath, callback);\n      } else if (prop.value.type === 'CallExpression') {\n        let isEntity = false;\n        if (\n          prop.value.callee.type === 'MemberExpression' &&\n          prop.value.callee.property.name === 'entity' &&\n          prop.value.callee.object.type === 'Identifier' &&\n          prop.value.callee.object.name === 'i'\n        ) {\n          isEntity = true;\n        }\n\n        if (isEntity) {\n          callback(prop.value, newPath);\n          if (prop.value.arguments.length > 0) {\n            traverseSchema(prop.value.arguments[0], newPath, callback);\n          }\n        } else {\n          callback(prop.value, newPath);\n        }\n      }\n    }\n  }\n}\n\nfunction findSchemaObject(ast) {\n  let schemaObj = null;\n  function walk(node) {\n    if (!node) return;\n    if (schemaObj) return;\n    if (\n      node.type === 'CallExpression' &&\n      node.callee.type === 'MemberExpression' &&\n      node.callee.object.name === 'i' &&\n      node.callee.property.name === 'schema' &&\n      node.arguments.length > 0\n    ) {\n      schemaObj = node.arguments[0];\n      return;\n    }\n    for (const key in node) {\n      if (key === 'loc' || key === 'start' || key === 'end') continue;\n      if (node[key] && typeof node[key] === 'object') {\n        if (Array.isArray(node[key])) {\n          node[key].forEach(walk);\n        } else {\n          walk(node[key]);\n        }\n      }\n    }\n  }\n  walk(ast);\n  return schemaObj;\n}\n\nexport function mergeSchema(oldFile, newFile) {\n  const oldParsed = node.parse(oldFile, {\n    sourceType: 'module',\n    ecmaVersion: 'latest',\n    locations: true,\n  });\n\n  const newParsed = node.parse(newFile, {\n    sourceType: 'module',\n    ecmaVersion: 'latest',\n    locations: true,\n  });\n\n  const schemaMap = new Map(); // Path -> { src, ast }\n\n  // 1. Extract from old file\n  const oldSchemaObj = findSchemaObject(oldParsed);\n  if (oldSchemaObj) {\n    traverseSchema(oldSchemaObj, '', (node, path) => {\n      const { typeParams } = analyzeChain(node);\n      if (typeParams) {\n        const src = oldFile.slice(typeParams.start, typeParams.end);\n        schemaMap.set(path, { src, ast: typeParams });\n      }\n    });\n  }\n\n  // 2. Collect Imports\n  const oldImports = collectImports(oldParsed);\n  const newExistingImports = collectExistingImports(newParsed);\n  const neededIdentifiers = new Set();\n\n  // 3. Apply to new file & Collect needed identifiers\n  const edits = [];\n  const newSchemaObj = findSchemaObject(newParsed);\n\n  if (newSchemaObj) {\n    traverseSchema(newSchemaObj, '', (node, path) => {\n      const { typeParams, baseCall } = analyzeChain(node);\n      const stored = schemaMap.get(path);\n\n      if (stored) {\n        // Collect identifiers from the type params we are about to inject\n        findIdentifiers(stored.ast, neededIdentifiers);\n\n        if (typeParams) {\n          edits.push({\n            start: typeParams.start,\n            end: typeParams.end,\n            text: stored.src,\n          });\n        } else if (baseCall) {\n          edits.push({\n            start: baseCall.callee.end,\n            end: baseCall.callee.end,\n            text: stored.src,\n          });\n        }\n      }\n    });\n  }\n\n  // 4. Generate Import Statements\n  const importsToAdd = new Map(); // source -> { named: Map<string, {str, isType}>, default: {str, isType}, namespace: {str, isType} }\n\n  for (const id of neededIdentifiers) {\n    const importInfo = oldImports.get(id);\n    if (importInfo) {\n      // Check if already imported in new file\n      const existing = newExistingImports.get(importInfo.source);\n      if (existing && existing.has(id)) {\n        continue; // Already imported\n      }\n\n      if (!importsToAdd.has(importInfo.source)) {\n        importsToAdd.set(importInfo.source, {\n          named: new Map(),\n          default: null,\n          namespace: null,\n        });\n      }\n      const group = importsToAdd.get(importInfo.source);\n      const isType = importInfo.importKind === 'type';\n\n      if (importInfo.type === 'named') {\n        let importStr = id;\n        if (importInfo.importedName !== id) {\n          importStr = `${importInfo.importedName} as ${id}`;\n        }\n        group.named.set(importStr, { str: importStr, isType });\n      } else if (importInfo.type === 'default') {\n        group.default = { str: id, isType };\n      } else if (importInfo.type === 'namespace') {\n        group.namespace = { str: id, isType };\n      }\n    }\n  }\n\n  const importBlocks = [];\n\n  for (const [source, info] of importsToAdd) {\n    // Check if source exists in new file to merge?\n    // For simplicity, we append new import lines.\n    // But we can try to be smart.\n\n    // If we have named imports\n    if (info.named.size > 0) {\n      const namedImports = Array.from(info.named.values());\n      const allTypes = namedImports.every((x) => x.isType);\n\n      if (allTypes) {\n        const names = namedImports.map((x) => x.str).join(', ');\n        importBlocks.push(`import type { ${names} } from '${source}';`);\n      } else {\n        const names = namedImports\n          .map((x) => (x.isType ? `type ${x.str}` : x.str))\n          .join(', ');\n        importBlocks.push(`import { ${names} } from '${source}';`);\n      }\n    }\n    if (info.default) {\n      if (info.default.isType) {\n        importBlocks.push(`import type ${info.default.str} from '${source}';`);\n      } else {\n        importBlocks.push(`import ${info.default.str} from '${source}';`);\n      }\n    }\n    if (info.namespace) {\n      if (info.namespace.isType) {\n        importBlocks.push(\n          `import type * as ${info.namespace.str} from '${source}';`,\n        );\n      } else {\n        importBlocks.push(\n          `import * as ${info.namespace.str} from '${source}';`,\n        );\n      }\n    }\n  }\n\n  // 5. Apply edits\n  edits.sort((a, b) => b.start - a.start);\n\n  let output = newFile;\n  for (const edit of edits) {\n    output = output.slice(0, edit.start) + edit.text + output.slice(edit.end);\n  }\n\n  // Prepend imports\n  if (importBlocks.length > 0) {\n    // Check for leading comments (e.g. // Docs: ...)\n    // We want to insert imports AFTER the leading comments but BEFORE the first code/import\n\n    // Simple heuristic: match consecutive lines at start that begin with //\n    const commentMatch = output.match(/^(\\s*\\/\\/.*(\\r?\\n|$))+/);\n\n    if (commentMatch) {\n      const commentEnd = commentMatch[0].length;\n      output =\n        output.slice(0, commentEnd) +\n        '\\n' +\n        importBlocks.join('\\n') +\n        output.slice(commentEnd);\n    } else {\n      output = importBlocks.join('\\n') + '\\n' + output;\n    }\n  }\n\n  return output;\n}\n"]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "instant-cli",
   "type": "module",
-  "version": "0.22.95-experimental.surgical.20386947966.1",
+  "version": "0.22.95",
   "description": "Instant's CLI",
   "homepage": "https://github.com/instantdb/instant/tree/main/client/packages/cli",
   "repository": {
@@ -41,9 +41,9 @@
     "strip-ansi": "^7.1.2",
     "terminal-link": "^3.0.0",
     "unconfig": "^0.5.5",
-    "@instantdb/version": "0.22.95-experimental.surgical.20386947966.1",
-    "@instantdb/core": "0.22.95-experimental.surgical.20386947966.1",
-    "@instantdb/platform": "0.22.95-experimental.surgical.20386947966.1"
+    "@instantdb/platform": "0.22.95",
+    "@instantdb/version": "0.22.95",
+    "@instantdb/core": "0.22.95"
   },
   "devDependencies": {
     "@babel/core": "^7.17.9",

package/src/index.js

@@ -10,6 +10,7 @@ import {
   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';
@@ -49,8 +50,7 @@ import {
   getSchemaPathToWrite,
   getPermsPathToWrite,
 } from './util/findConfigCandidates.js';
-
-import { updateSchemaFile } from './util/updateSchemaFile.js';
+import { mergeSchema } from './util/mergeSchema.js';
 
 const execAsync = promisify(exec);
 
@@ -481,7 +481,7 @@ program
   )
   .option(
     '--experimental-type-preservation',
-    '[Experimental] Preserve manual type changes and schema edits when pulling schema',
+    "[Experimental] Preserve manual type changes like `status: i.json<'online' | 'offline'>()` when doing `instant-cli pull schema`",
   )
   .description('Pull schema and perm files from production.')
   .addHelpText(
@@ -1229,33 +1229,24 @@ async function pullSchema(
   const shortSchemaPath = getSchemaPathToWrite(prev?.path);
   const schemaPath = join(pkgDir, shortSchemaPath);
 
-  const serverSchema = apiSchemaToInstantSchemaDef(pullRes.data.schema);
-  let newSchemaContent;
+  let newSchemaContent = generateSchemaTypescriptFile(
+    prev?.schema,
+    apiSchemaToInstantSchemaDef(pullRes.data.schema),
+    instantModuleName,
+  );
 
   if (prev && experimentalTypePreservation) {
     try {
       const oldSchemaContent = await readFile(prev.path, 'utf-8');
-      newSchemaContent = await updateSchemaFile(
-        oldSchemaContent,
-        prev.schema,
-        serverSchema,
-      );
+      newSchemaContent = mergeSchema(oldSchemaContent, newSchemaContent);
     } catch (e) {
       warn(
-        'Failed to update schema with existing file. Overwriting instead.',
+        'Failed to merge schema with existing file. Overwriting instead.',
         e,
       );
     }
   }
 
-  if (!newSchemaContent) {
-    newSchemaContent = generateSchemaTypescriptFile(
-      prev?.schema,
-      serverSchema,
-      instantModuleName,
-    );
-  }
-
   await writeTypescript(schemaPath, newSchemaContent, 'utf-8');
 
   console.log('✅ Wrote schema to ' + shortSchemaPath);