pocketbase-zod-schema 0.7.0 → 0.7.2

package/dist/cli/migrate.js

@@ -1196,6 +1196,60 @@ function unwrapZodType(zodType) {
   }
   return unwrapped;
 }
+function dedentSql(value) {
+  const lines = value.replace(/\r\n/g, "\n").split("\n");
+  while (lines.length > 0 && lines[0].trim() === "") {
+    lines.shift();
+  }
+  while (lines.length > 0 && lines[lines.length - 1].trim() === "") {
+    lines.pop();
+  }
+  if (lines.length === 0) {
+    return "";
+  }
+  let minIndent = Infinity;
+  for (const line of lines) {
+    if (line.trim() === "") continue;
+    const indent = line.length - line.trimStart().length;
+    if (indent < minIndent) {
+      minIndent = indent;
+    }
+  }
+  if (!Number.isFinite(minIndent) || minIndent === 0) {
+    return lines.map((line) => line.trimEnd()).join("\n");
+  }
+  return lines.map((line) => line.slice(minIndent).trimEnd()).join("\n");
+}
+function stripLeadingComments(query) {
+  let remaining = query.trim();
+  while (remaining.length > 0) {
+    if (remaining.startsWith("--")) {
+      const newline = remaining.indexOf("\n");
+      remaining = newline === -1 ? "" : remaining.slice(newline + 1).trim();
+      continue;
+    }
+    if (remaining.startsWith("/*")) {
+      const end = remaining.indexOf("*/");
+      remaining = end === -1 ? "" : remaining.slice(end + 2).trim();
+      continue;
+    }
+    break;
+  }
+  return remaining;
+}
+function validateViewQuery(collectionName, viewQuery) {
+  if (typeof viewQuery !== "string" || viewQuery.trim() === "") {
+    throw new Error(
+      `View collection "${collectionName}" requires a non-empty viewQuery. Provide the SQL SELECT statement backing the view.`
+    );
+  }
+  const body = stripLeadingComments(viewQuery);
+  if (!/^(select|with)\b/i.test(body)) {
+    throw new Error(
+      `View collection "${collectionName}" has an invalid viewQuery: it must start with SELECT or WITH. Received: ${body.slice(0, 40)}${body.length > 40 ? "..." : ""}`
+    );
+  }
+}
 function getCollectionNameFromFile(filePath) {
   const filename = path8.basename(filePath).replace(/\.(ts|js)$/, "");
   return toCollectionName(filename);
@@ -1219,13 +1273,26 @@ function extractCollectionTypeFromSchema(zodSchema) {
   }
   try {
     const metadata = JSON.parse(zodSchema.description);
-    if (metadata.type === "base" || metadata.type === "auth") {
+    if (metadata.type === "base" || metadata.type === "auth" || metadata.type === "view") {
       return metadata.type;
     }
   } catch {
   }
   return null;
 }
+function extractViewQueryFromSchema(zodSchema) {
+  if (!zodSchema.description) {
+    return null;
+  }
+  try {
+    const metadata = JSON.parse(zodSchema.description);
+    if (typeof metadata.viewQuery === "string") {
+      return metadata.viewQuery;
+    }
+  } catch {
+  }
+  return null;
+}
 function extractSchemaDefinitions(module, patterns = ["Schema", "InputSchema", "Collection"]) {
   const result = {};
   if (module.default instanceof z.ZodObject) {
@@ -1384,6 +1451,15 @@ function convertZodSchemaToCollectionSchema(collectionName, zodSchema) {
   const rawFields = extractFieldDefinitions(zodSchema);
   const explicitType = extractCollectionTypeFromSchema(zodSchema);
   const collectionType = explicitType ?? (isAuthCollection(rawFields) ? "auth" : "base");
+  const isView = collectionType === "view";
+  const viewQuery = extractViewQueryFromSchema(zodSchema);
+  if (isView) {
+    validateViewQuery(collectionName, viewQuery);
+  } else if (viewQuery !== null) {
+    console.warn(
+      `[${collectionName}] viewQuery is only used by view collections and will be ignored. Use defineView() or set type: "view" to define a view collection.`
+    );
+  }
   const fields = rawFields.filter((f) => !["created", "updated"].includes(f.name)).map(({ name, zodType }) => buildFieldDefinition(name, zodType));
   if (collectionType === "auth") {
     const authSystemFields = [
@@ -1443,26 +1519,43 @@ function convertZodSchemaToCollectionSchema(collectionName, zodSchema) {
     }
   }
   const indexes = extractIndexes(zodSchema) || [];
+  if (isView && indexes.length > 0) {
+    throw new Error(
+      `View collection "${collectionName}" cannot declare indexes. PocketBase view collections are backed by a SQL query and do not support indexes.`
+    );
+  }
   const permissionAnalyzer = new PermissionAnalyzer();
   let permissions = void 0;
   const schemaDescription = zodSchema.description;
   const extractedPermissions = permissionAnalyzer.extractPermissions(schemaDescription);
   if (extractedPermissions) {
     const resolvedPermissions = permissionAnalyzer.resolvePermissions(extractedPermissions);
-    const validationResults = permissionAnalyzer.validatePermissions(
-      collectionName,
-      resolvedPermissions,
-      fields,
-      collectionType === "auth"
-    );
-    for (const [ruleType, result] of validationResults) {
-      if (!result.valid) {
-        console.error(`[${collectionName}] Permission validation failed for ${ruleType}:`);
-        result.errors.forEach((error) => console.error(`  - ${error}`));
+    if (isView) {
+      for (const ruleType of ["createRule", "updateRule", "deleteRule", "manageRule"]) {
+        if (resolvedPermissions[ruleType]) {
+          console.warn(
+            `[${collectionName}] ${ruleType} is not supported on view collections and will be set to null.`
+          );
+        }
+        resolvedPermissions[ruleType] = null;
       }
-      if (result.warnings.length > 0) {
-        console.warn(`[${collectionName}] Permission warnings for ${ruleType}:`);
-        result.warnings.forEach((warning) => console.warn(`  - ${warning}`));
+    }
+    if (!isView) {
+      const validationResults = permissionAnalyzer.validatePermissions(
+        collectionName,
+        resolvedPermissions,
+        fields,
+        collectionType === "auth"
+      );
+      for (const [ruleType, result] of validationResults) {
+        if (!result.valid) {
+          console.error(`[${collectionName}] Permission validation failed for ${ruleType}:`);
+          result.errors.forEach((error) => console.error(`  - ${error}`));
+        }
+        if (result.warnings.length > 0) {
+          console.warn(`[${collectionName}] Permission warnings for ${ruleType}:`);
+          result.warnings.forEach((warning) => console.warn(`  - ${warning}`));
+        }
       }
     }
     permissions = permissionAnalyzer.mergeWithDefaults(resolvedPermissions);
@@ -1483,6 +1576,9 @@ function convertZodSchemaToCollectionSchema(collectionName, zodSchema) {
     },
     permissions
   };
+  if (isView) {
+    collectionSchema.viewQuery = viewQuery;
+  }
   return collectionSchema;
 }
 var tsxLoaderRegistered = false;
@@ -1740,8 +1836,9 @@ function convertPocketBaseField(pbField) {
 }
 function convertPocketBaseCollection(pbCollection) {
   const fields = [];
+  const isView = pbCollection.type === "view";
   const systemFieldNames = ["id", "created", "updated", "collectionId", "collectionName", "expand"];
-  if (pbCollection.fields && Array.isArray(pbCollection.fields)) {
+  if (!isView && pbCollection.fields && Array.isArray(pbCollection.fields)) {
     for (const pbField of pbCollection.fields) {
       if (pbField.system || systemFieldNames.includes(pbField.name)) {
         const isAuthSystemField = pbCollection.type === "auth" && ["email", "emailVisibility", "verified", "password", "tokenKey"].includes(pbField.name);
@@ -1761,6 +1858,9 @@ function convertPocketBaseCollection(pbCollection) {
   if (pbCollection.id) {
     schema.id = pbCollection.id;
   }
+  if (typeof pbCollection.viewQuery === "string") {
+    schema.viewQuery = dedentSql(pbCollection.viewQuery);
+  }
   if (pbCollection.indexes && Array.isArray(pbCollection.indexes)) {
     schema.indexes = pbCollection.indexes;
   }
@@ -1862,6 +1962,24 @@ function findMigrationsAfterSnapshot(migrationsPath, snapshotTimestamp) {
     return [];
   }
 }
+function skipTemplateLiteral(content, start) {
+  let i = start + 1;
+  while (i < content.length) {
+    const char = content[i];
+    if (char === "\\") {
+      i += 2;
+      continue;
+    }
+    if (char === "`") {
+      return i + 1;
+    }
+    i++;
+  }
+  return i;
+}
+function unescapeTemplateLiteral(raw) {
+  return raw.replace(/\\(`|\$\{|\\)/g, "$1");
+}
 function parseMigrationOperationsFromContent(content) {
   const collectionsToCreate = [];
   const collectionsToDelete = [];
@@ -1950,6 +2068,10 @@ function parseMigrationOperationsFromContent(content) {
       while (i < content.length && bCount > 0) {
         const char = content[i];
         const prev = i > 0 ? content[i - 1] : "";
+        if (!inStr && char === "`") {
+          i = skipTemplateLiteral(content, i);
+          continue;
+        }
         if (!inStr && (char === '"' || char === "'")) {
           inStr = true;
           strChar = char;
@@ -2139,6 +2261,95 @@ function parseMigrationOperationsFromContent(content) {
         }
       }
     }
+    const viewQueryRegex = /(\w+)\.viewQuery\s*=\s*/g;
+    let viewQueryMatch;
+    while ((viewQueryMatch = viewQueryRegex.exec(content)) !== null) {
+      const varInfo = variables.get(viewQueryMatch[1]);
+      if (!varInfo || varInfo.type !== "collection") continue;
+      const valueStart = viewQueryMatch.index + viewQueryMatch[0].length;
+      if (content[valueStart] === "`") {
+        const end = skipTemplateLiteral(content, valueStart);
+        const raw = content.substring(valueStart + 1, end - 1);
+        getUpdate(varInfo.name).viewQuery = dedentSql(unescapeTemplateLiteral(raw));
+        viewQueryRegex.lastIndex = end;
+      } else {
+        const terminator = content.indexOf(";", valueStart);
+        const valueStr = content.substring(valueStart, terminator === -1 ? content.length : terminator);
+        try {
+          getUpdate(varInfo.name).viewQuery = dedentSql(new Function("app", `return ${valueStr}`)(mockApp));
+        } catch {
+          getUpdate(varInfo.name).viewQuery = dedentSql(valueStr.trim());
+        }
+      }
+    }
+    const unmarshalRegex = /unmarshal\s*\(/g;
+    let unmarshalMatch;
+    while ((unmarshalMatch = unmarshalRegex.exec(content)) !== null) {
+      let i = unmarshalMatch.index + unmarshalMatch[0].length;
+      while (i < content.length && /\s/.test(content[i])) i++;
+      if (content[i] !== "{") continue;
+      const objStart = i;
+      let braceCount = 1;
+      let inStr = false;
+      let strChar = null;
+      i++;
+      while (i < content.length && braceCount > 0) {
+        const ch = content[i];
+        const prev = i > 0 ? content[i - 1] : "";
+        if (!inStr && ch === "`") {
+          i = skipTemplateLiteral(content, i);
+          continue;
+        }
+        if (!inStr && (ch === '"' || ch === "'")) {
+          inStr = true;
+          strChar = ch;
+        } else if (inStr && ch === strChar && prev !== "\\") {
+          inStr = false;
+          strChar = null;
+        }
+        if (!inStr) {
+          if (ch === "{") braceCount++;
+          if (ch === "}") braceCount--;
+        }
+        i++;
+      }
+      if (braceCount !== 0) continue;
+      const objStr = content.substring(objStart, i);
+      while (i < content.length && /[\s,]/.test(content[i])) i++;
+      const varStart = i;
+      while (i < content.length && /\w/.test(content[i])) i++;
+      const colVarName = content.substring(varStart, i);
+      const colInfo = variables.get(colVarName);
+      if (!colInfo || colInfo.type !== "collection") continue;
+      const keyValRegex = /"(\w+Rule)"\s*:\s*([^,}\n]+)/g;
+      let kvMatch;
+      while ((kvMatch = keyValRegex.exec(objStr)) !== null) {
+        const ruleKey = kvMatch[1];
+        const valStr = kvMatch[2].trim();
+        try {
+          const value = new Function("app", `return ${valStr}`)(mockApp);
+          getUpdate(colInfo.name).rulesToUpdate[ruleKey] = value;
+        } catch {
+          getUpdate(colInfo.name).rulesToUpdate[ruleKey] = valStr;
+        }
+      }
+      const viewQueryKey = objStr.match(/"viewQuery"\s*:\s*/);
+      if (viewQueryKey) {
+        const valueStart = viewQueryKey.index + viewQueryKey[0].length;
+        if (objStr[valueStart] === "`") {
+          const end = skipTemplateLiteral(objStr, valueStart);
+          const raw = objStr.substring(valueStart + 1, end - 1);
+          getUpdate(colInfo.name).viewQuery = dedentSql(unescapeTemplateLiteral(raw));
+        } else {
+          const valStr = objStr.substring(valueStart).replace(/[,}\s]+$/, "");
+          try {
+            getUpdate(colInfo.name).viewQuery = dedentSql(new Function("app", `return ${valStr}`)(mockApp));
+          } catch {
+            getUpdate(colInfo.name).viewQuery = dedentSql(valStr);
+          }
+        }
+      }
+    }
     const idxPushRegex = /(\w+)\.indexes\.push\s*\(/g;
     let match;
     while ((match = idxPushRegex.exec(content)) !== null) {
@@ -2268,6 +2479,10 @@ function parseMigrationOperations(migrationContent) {
     while (i < migrationContent.length && braceCount > 0) {
       const char = migrationContent[i];
       const prevChar = i > 0 ? migrationContent[i - 1] : "";
+      if (!inString && char === "`") {
+        i = skipTemplateLiteral(migrationContent, i);
+        continue;
+      }
       if (!inString && (char === '"' || char === "'")) {
         inString = true;
         stringChar = char;
@@ -2375,6 +2590,9 @@ function applyMigrationOperations(snapshot, operations) {
           collection.indexes = collection.indexes.filter((idx) => !update.indexesToRemove.includes(idx));
         }
       }
+      if (update.viewQuery !== void 0) {
+        collection.viewQuery = update.viewQuery;
+      }
       if (Object.keys(update.rulesToUpdate).length > 0) {
         if (!collection.rules) collection.rules = {};
         if (!collection.permissions) collection.permissions = {};
@@ -2838,7 +3056,45 @@ function compareCollectionFields(currentCollection, previousCollection, config,
   fieldsToRemove = fieldsToRemove.filter((_, index) => !processedRemoveIndices.has(index));
   return { fieldsToAdd, fieldsToRemove, fieldsToModify };
 }
+function normalizeSql(query) {
+  if (!query) {
+    return "";
+  }
+  return query.split("\n").map((line) => line.trim()).join(" ").replace(/\s+/g, " ").trim();
+}
+function compareViewQuery(currentCollection, previousCollection) {
+  const newValue = currentCollection.viewQuery;
+  if (typeof newValue !== "string") {
+    return void 0;
+  }
+  if (normalizeSql(newValue) === normalizeSql(previousCollection.viewQuery)) {
+    return void 0;
+  }
+  return {
+    oldValue: previousCollection.viewQuery ?? null,
+    newValue
+  };
+}
 function buildCollectionModification(currentCollection, previousCollection, config, collectionIdToName) {
+  const isView = currentCollection.type === "view" || previousCollection.type === "view";
+  if (isView) {
+    return {
+      collection: currentCollection.name,
+      fieldsToAdd: [],
+      fieldsToRemove: [],
+      fieldsToModify: [],
+      indexesToAdd: [],
+      indexesToRemove: [],
+      rulesToUpdate: compareRules(
+        currentCollection.rules,
+        previousCollection.rules,
+        currentCollection.permissions,
+        previousCollection.permissions
+      ),
+      permissionsToUpdate: comparePermissions(currentCollection.permissions, previousCollection.permissions),
+      viewQueryUpdate: compareViewQuery(currentCollection, previousCollection)
+    };
+  }
   const { fieldsToAdd, fieldsToRemove, fieldsToModify } = compareCollectionFields(
     currentCollection,
     previousCollection,
@@ -2870,7 +3126,11 @@ function categorizeChangesBySeverity(diff, _config) {
   const destructive = [];
   const nonDestructive = [];
   for (const collection of diff.collectionsToDelete) {
-    destructive.push(`Delete collection: ${collection.name}`);
+    if (collection.type === "view") {
+      nonDestructive.push(`Delete view collection: ${collection.name}`);
+    } else {
+      destructive.push(`Delete collection: ${collection.name}`);
+    }
   }
   for (const collection of diff.collectionsToCreate) {
     nonDestructive.push(`Create collection: ${collection.name}`);
@@ -2905,6 +3165,9 @@ function categorizeChangesBySeverity(diff, _config) {
     for (const rule of modification.rulesToUpdate) {
       nonDestructive.push(`Update rule: ${collectionName}.${rule.ruleType}`);
     }
+    if (modification.viewQueryUpdate) {
+      nonDestructive.push(`Update view query: ${collectionName}`);
+    }
   }
   return { destructive, nonDestructive };
 }
@@ -2933,12 +3196,11 @@ function filterDiff(diff, options) {
   });
   let collectionsToDelete = diff.collectionsToDelete;
   if (skipDestructive) {
-    collectionsToDelete = [];
-  } else {
-    collectionsToDelete = collectionsToDelete.filter((col) => {
-      return matchesPattern(col.name, patterns);
-    });
+    collectionsToDelete = collectionsToDelete.filter((col) => col.type === "view");
   }
+  collectionsToDelete = collectionsToDelete.filter((col) => {
+    return matchesPattern(col.name, patterns);
+  });
   const collectionsToModify = diff.collectionsToModify.map((mod) => {
     const collectionMatches = matchesPattern(mod.collection, patterns);
     const fieldsToAdd = mod.fieldsToAdd.filter((field) => {
@@ -2963,6 +3225,7 @@ function filterDiff(diff, options) {
     const indexesToRemove = collectionMatches ? mod.indexesToRemove : [];
     const rulesToUpdate = collectionMatches ? mod.rulesToUpdate : [];
     const permissionsToUpdate = collectionMatches ? mod.permissionsToUpdate : [];
+    const viewQueryUpdate = collectionMatches ? mod.viewQueryUpdate : void 0;
     return {
       ...mod,
       fieldsToAdd,
@@ -2971,10 +3234,11 @@ function filterDiff(diff, options) {
       indexesToAdd,
       indexesToRemove,
       rulesToUpdate,
-      permissionsToUpdate
+      permissionsToUpdate,
+      viewQueryUpdate
     };
   }).filter((mod) => {
-    return mod.fieldsToAdd.length > 0 || mod.fieldsToRemove.length > 0 || mod.fieldsToModify.length > 0 || mod.indexesToAdd.length > 0 || mod.indexesToRemove.length > 0 || mod.rulesToUpdate.length > 0 || mod.permissionsToUpdate.length > 0;
+    return mod.fieldsToAdd.length > 0 || mod.fieldsToRemove.length > 0 || mod.fieldsToModify.length > 0 || mod.indexesToAdd.length > 0 || mod.indexesToRemove.length > 0 || mod.rulesToUpdate.length > 0 || mod.permissionsToUpdate.length > 0 || mod.viewQueryUpdate !== void 0;
   });
   return {
     ...diff,
@@ -2986,7 +3250,7 @@ function filterDiff(diff, options) {
 
 // src/migration/diff/index.ts
 function hasChanges(modification) {
-  return modification.fieldsToAdd.length > 0 || modification.fieldsToRemove.length > 0 || modification.fieldsToModify.length > 0 || modification.indexesToAdd.length > 0 || modification.indexesToRemove.length > 0 || modification.rulesToUpdate.length > 0 || modification.permissionsToUpdate.length > 0;
+  return modification.fieldsToAdd.length > 0 || modification.fieldsToRemove.length > 0 || modification.fieldsToModify.length > 0 || modification.indexesToAdd.length > 0 || modification.indexesToRemove.length > 0 || modification.rulesToUpdate.length > 0 || modification.permissionsToUpdate.length > 0 || modification.viewQueryUpdate !== void 0;
 }
 function aggregateChanges(currentSchema, previousSnapshot, config) {
   const collectionIdToName = /* @__PURE__ */ new Map();
@@ -3165,6 +3429,13 @@ function formatValue(value) {
   }
   return String(value);
 }
+function formatSqlTemplate(query, indent = "      ") {
+  const escaped = query.replace(/\\/g, "\\\\").replace(/`/g, "\\`").replace(/\$\{/g, "\\${");
+  const body = escaped.split("\n").map((line) => line.trim() === "" ? "" : `${indent}${line}`).join("\n");
+  return `\`
+${body}
+${indent.slice(0, -2)}\``;
+}
 function getFieldConstructorName(fieldType) {
   const constructorMap = {
     text: "TextField",
@@ -3203,6 +3474,36 @@ function getSystemFields() {
     }
   ];
 }
+function getSystemTimestampFields() {
+  return [
+    {
+      name: "created",
+      id: "autodate2990389176",
+      type: "autodate",
+      required: false,
+      options: {
+        hidden: false,
+        onCreate: true,
+        onUpdate: false,
+        presentable: false,
+        system: true
+      }
+    },
+    {
+      name: "updated",
+      id: "autodate3332085495",
+      type: "autodate",
+      required: false,
+      options: {
+        hidden: false,
+        onCreate: true,
+        onUpdate: true,
+        presentable: false,
+        system: true
+      }
+    }
+  ];
+}
 function getAuthSystemFields() {
   return [
     {
@@ -3495,6 +3796,15 @@ function generateCollectionRules(rules, collectionType = "base") {
   if (!rules) {
     return "";
   }
+  if (collectionType === "view") {
+    return [
+      `"listRule": ${formatValue(rules.listRule ?? null)}`,
+      `"viewRule": ${formatValue(rules.viewRule ?? null)}`,
+      `"createRule": null`,
+      `"updateRule": null`,
+      `"deleteRule": null`
+    ].join(",\n    ");
+  }
   const parts = [];
   if (rules.listRule !== void 0) {
     parts.push(`"listRule": ${formatValue(rules.listRule)}`);
@@ -3520,6 +3830,15 @@ function generateCollectionPermissions(permissions, collectionType = "base") {
   if (!permissions) {
     return "";
   }
+  if (collectionType === "view") {
+    return [
+      `"listRule": ${formatValue(permissions.listRule ?? null)}`,
+      `"viewRule": ${formatValue(permissions.viewRule ?? null)}`,
+      `"createRule": null`,
+      `"updateRule": null`,
+      `"deleteRule": null`
+    ].join(",\n    ");
+  }
   const parts = [];
   if (permissions.listRule !== void 0) {
     parts.push(`"listRule": ${formatValue(permissions.listRule)}`);
@@ -3557,6 +3876,28 @@ function generatePermissionUpdate(collectionName, ruleType, newValue, varName, i
   lines.push(isLast ? `  return app.save(${collectionVar});` : `  app.save(${collectionVar});`);
   return lines.join("\n");
 }
+function generateViewQueryUpdate(collectionName, viewQuery, varName, isLast = false, collectionIdMap) {
+  const lines = [];
+  const collectionVar = varName || `collection_${collectionName}_viewQuery`;
+  lines.push(`  const ${collectionVar} = ${generateFindCollectionCode(collectionName, collectionIdMap)};`);
+  lines.push(`  unmarshal({`);
+  lines.push(`    "viewQuery": ${formatSqlTemplate(viewQuery, "      ")},`);
+  lines.push(`  }, ${collectionVar})`);
+  lines.push(isLast ? `  return app.save(${collectionVar});` : `  app.save(${collectionVar});`);
+  return lines.join("\n");
+}
+function generateGroupedRuleUpdates(collectionName, entries, varSuffix, isLast = false, collectionIdMap) {
+  const collectionVar = `collection_${collectionName}_${varSuffix}`;
+  const lines = [];
+  lines.push(`  const ${collectionVar} = ${generateFindCollectionCode(collectionName, collectionIdMap)};`);
+  lines.push(`  unmarshal({`);
+  for (const entry of entries) {
+    lines.push(`    "${entry.ruleType}": ${formatValue(entry.value)},`);
+  }
+  lines.push(`  }, ${collectionVar})`);
+  lines.push(isLast ? `  return app.save(${collectionVar});` : `  app.save(${collectionVar});`);
+  return lines.join("\n");
+}
 
 // src/migration/generator/collections.ts
 function generateCollectionCreation(collection, varName = "collection", isLast = false, collectionIdMap) {
@@ -3575,16 +3916,24 @@ function generateCollectionCreation(collection, varName = "collection", isLast =
   } else if (rulesCode) {
     lines.push(`    ${rulesCode},`);
   }
+  if (collection.type === "view") {
+    lines.push(`    "viewQuery": ${formatSqlTemplate(collection.viewQuery ?? "")},`);
+    lines.push(`  });`);
+    lines.push(``);
+    lines.push(isLast ? `  return app.save(${varName});` : `  app.save(${varName});`);
+    return lines.join("\n");
+  }
   const systemFieldNames = ["created", "updated", "id"];
   if (collection.type === "auth") {
     systemFieldNames.push(...getAuthSystemFields().map((f) => f.name));
   }
   const userFields = collection.fields.filter((f) => !systemFieldNames.includes(f.name));
-  const allFields = [...getSystemFields().filter((f) => f.name === "id")];
+  const allFields = [...getSystemFields()];
   if (collection.type === "auth") {
     allFields.push(...getAuthSystemFields());
   }
   allFields.push(...userFields);
+  allFields.push(...getSystemTimestampFields());
   lines.push(`    "fields": ${generateFieldsArray(allFields, collectionIdMap)},`);
   let allIndexes = [...collection.indexes || []];
   if (collection.type === "auth") {
@@ -3614,7 +3963,21 @@ function generateOperationUpMigration(operation, collectionIdMap) {
     const modification = operation.modifications;
     const collectionName = typeof operation.collection === "string" ? operation.collection : operation.collection?.name ?? modification.collection;
     let operationCount = 0;
-    const totalOperations = modification.fieldsToAdd.length + modification.fieldsToModify.length + modification.fieldsToRemove.length + modification.indexesToAdd.length + modification.indexesToRemove.length + modification.rulesToUpdate.length + modification.permissionsToUpdate.length;
+    const totalOperations = modification.fieldsToAdd.length + modification.fieldsToModify.length + modification.fieldsToRemove.length + modification.indexesToAdd.length + modification.indexesToRemove.length + (modification.viewQueryUpdate ? 1 : 0) + (modification.permissionsToUpdate.length > 0 ? 1 : modification.rulesToUpdate.length > 0 ? 1 : 0);
+    if (modification.viewQueryUpdate) {
+      operationCount++;
+      const isLast = operationCount === totalOperations;
+      lines.push(
+        generateViewQueryUpdate(
+          collectionName,
+          modification.viewQueryUpdate.newValue,
+          void 0,
+          isLast,
+          collectionIdMap
+        )
+      );
+      if (!isLast) lines.push("");
+    }
     for (let i = 0; i < modification.fieldsToAdd.length; i++) {
       const field = modification.fieldsToAdd[i];
       operationCount++;
@@ -3654,23 +4017,29 @@ function generateOperationUpMigration(operation, collectionIdMap) {
       if (!isLast) lines.push("");
     }
     if (modification.permissionsToUpdate && modification.permissionsToUpdate.length > 0) {
-      for (const permission of modification.permissionsToUpdate) {
-        operationCount++;
+      operationCount++;
+      const isLast = operationCount === totalOperations;
+      if (modification.permissionsToUpdate.length >= 2) {
+        const entries = modification.permissionsToUpdate.map((p) => ({ ruleType: p.ruleType, value: p.newValue }));
+        lines.push(generateGroupedRuleUpdates(collectionName, entries, "rules", isLast, collectionIdMap));
+      } else {
+        const permission = modification.permissionsToUpdate[0];
         const varName = `collection_${collectionName}_perm_${permission.ruleType}`;
-        const isLast = operationCount === totalOperations;
-        lines.push(
-          generatePermissionUpdate(collectionName, permission.ruleType, permission.newValue, varName, isLast, collectionIdMap)
-        );
-        if (!isLast) lines.push("");
+        lines.push(generatePermissionUpdate(collectionName, permission.ruleType, permission.newValue, varName, isLast, collectionIdMap));
       }
+      if (!isLast) lines.push("");
     } else if (modification.rulesToUpdate.length > 0) {
-      for (const rule of modification.rulesToUpdate) {
-        operationCount++;
+      operationCount++;
+      const isLast = operationCount === totalOperations;
+      if (modification.rulesToUpdate.length >= 2) {
+        const entries = modification.rulesToUpdate.map((r) => ({ ruleType: r.ruleType, value: r.newValue }));
+        lines.push(generateGroupedRuleUpdates(collectionName, entries, "rules", isLast, collectionIdMap));
+      } else {
+        const rule = modification.rulesToUpdate[0];
         const varName = `collection_${collectionName}_rule_${rule.ruleType}`;
-        const isLast = operationCount === totalOperations;
         lines.push(generateRuleUpdate(collectionName, rule.ruleType, rule.newValue, varName, isLast, collectionIdMap));
-        if (!isLast) lines.push("");
       }
+      if (!isLast) lines.push("");
     }
   } else if (operation.type === "delete") {
     const collectionName = typeof operation.collection === "string" ? operation.collection : operation.collection.name;
@@ -3709,25 +4078,45 @@ function generateOperationDownMigration(operation, collectionIdMap) {
     const modification = operation.modifications;
     const collectionName = typeof operation.collection === "string" ? operation.collection : operation.collection?.name ?? modification.collection;
     let operationCount = 0;
-    const totalOperations = modification.fieldsToAdd.length + modification.fieldsToModify.length + modification.fieldsToRemove.length + modification.indexesToAdd.length + modification.indexesToRemove.length + modification.rulesToUpdate.length + modification.permissionsToUpdate.length;
+    const totalOperations = modification.fieldsToAdd.length + modification.fieldsToModify.length + modification.fieldsToRemove.length + modification.indexesToAdd.length + modification.indexesToRemove.length + (modification.viewQueryUpdate ? 1 : 0) + (modification.permissionsToUpdate.length > 0 ? 1 : modification.rulesToUpdate.length > 0 ? 1 : 0);
+    if (modification.viewQueryUpdate) {
+      operationCount++;
+      const isLast = operationCount === totalOperations;
+      lines.push(
+        generateViewQueryUpdate(
+          collectionName,
+          modification.viewQueryUpdate.oldValue ?? "",
+          `collection_${collectionName}_revert_viewQuery`,
+          isLast,
+          collectionIdMap
+        )
+      );
+      if (!isLast) lines.push("");
+    }
     if (modification.permissionsToUpdate && modification.permissionsToUpdate.length > 0) {
-      for (const permission of modification.permissionsToUpdate) {
-        operationCount++;
+      operationCount++;
+      const isLast = operationCount === totalOperations;
+      if (modification.permissionsToUpdate.length >= 2) {
+        const entries = modification.permissionsToUpdate.map((p) => ({ ruleType: p.ruleType, value: p.oldValue }));
+        lines.push(generateGroupedRuleUpdates(collectionName, entries, "revert_rules", isLast, collectionIdMap));
+      } else {
+        const permission = modification.permissionsToUpdate[0];
         const varName = `collection_${collectionName}_revert_perm_${permission.ruleType}`;
-        const isLast = operationCount === totalOperations;
-        lines.push(
-          generatePermissionUpdate(collectionName, permission.ruleType, permission.oldValue, varName, isLast, collectionIdMap)
-        );
-        if (!isLast) lines.push("");
+        lines.push(generatePermissionUpdate(collectionName, permission.ruleType, permission.oldValue, varName, isLast, collectionIdMap));
       }
+      if (!isLast) lines.push("");
     } else if (modification.rulesToUpdate.length > 0) {
-      for (const rule of modification.rulesToUpdate) {
-        operationCount++;
+      operationCount++;
+      const isLast = operationCount === totalOperations;
+      if (modification.rulesToUpdate.length >= 2) {
+        const entries = modification.rulesToUpdate.map((r) => ({ ruleType: r.ruleType, value: r.oldValue }));
+        lines.push(generateGroupedRuleUpdates(collectionName, entries, "revert_rules", isLast, collectionIdMap));
+      } else {
+        const rule = modification.rulesToUpdate[0];
         const varName = `collection_${collectionName}_revert_rule_${rule.ruleType}`;
-        const isLast = operationCount === totalOperations;
         lines.push(generateRuleUpdate(collectionName, rule.ruleType, rule.oldValue, varName, isLast, collectionIdMap));
-        if (!isLast) lines.push("");
       }
+      if (!isLast) lines.push("");
     }
     for (let i = 0; i < modification.indexesToRemove.length; i++) {
       operationCount++;
@@ -3976,6 +4365,9 @@ function generate(diff, config) {
 function detectCollectionDeletions(diff) {
   const changes = [];
   for (const collection of diff.collectionsToDelete) {
+    if (collection.type === "view") {
+      continue;
+    }
     changes.push({
       type: "collection_deletion" /* COLLECTION_DELETION */,
       description: `Delete collection: ${collection.name}`,
@@ -4386,7 +4778,11 @@ function formatChangeSummary(diff) {
     lines.push(chalk.green.bold(`\u2713 ${totalCollectionsToCreate} collection(s) to create:`));
     for (const collection of diff.collectionsToCreate) {
       lines.push(chalk.green(`  + ${collection.name} (${collection.type})`));
-      lines.push(chalk.gray(`    ${collection.fields.length} field(s)`));
+      if (collection.type === "view") {
+        lines.push(chalk.gray(`    fields derived from the view query`));
+      } else {
+        lines.push(chalk.gray(`    ${collection.fields.length} field(s)`));
+      }
     }
     lines.push("");
   }
@@ -4431,6 +4827,9 @@ function formatChangeSummary(diff) {
       if (modification.rulesToUpdate.length > 0) {
         lines.push(chalk.yellow(`    ~ ${modification.rulesToUpdate.length} rule(s) to update`));
       }
+      if (modification.viewQueryUpdate) {
+        lines.push(chalk.yellow(`    ~ view query to update`));
+      }
       lines.push("");
     }
   }
@@ -4816,11 +5215,14 @@ var TypeGenerator = class {
   }
   generateCollectionType(collection) {
     const typeName = this.toPascalCase(collection.name);
+    const isView = collection.type === "view";
     const lines = [];
     lines.push(`export interface ${typeName}Record {`);
     lines.push(`  id: string;`);
-    lines.push(`  created: string;`);
-    lines.push(`  updated: string;`);
+    if (!isView) {
+      lines.push(`  created: string;`);
+      lines.push(`  updated: string;`);
+    }
     lines.push(`  collectionId: string;`);
     lines.push(`  collectionName: "${collection.name}";`);
     for (const field of collection.fields) {
@@ -4832,7 +5234,7 @@ var TypeGenerator = class {
     lines.push(`}`);
     lines.push(``);
     const expandFields = [];
-    for (const field of collection.fields) {
+    for (const field of isView ? [] : collection.fields) {
       if (field.type === "relation" && field.relation) {
         const targetCollection = field.relation.collection;
         let targetType = "RecordModel";