pocketbase-zod-schema 0.2.0 → 0.2.2

package/dist/index.d.cts

@@ -3,7 +3,7 @@ export { UserMutator } from './mutator.cjs';
 export { ProjectInputType, ProjectType, TypedPocketBase, UserInputType, UserType } from './types.cjs';
 export { CollectionConfig, PermissionTemplates, PermissionValidationResult, RelationConfig, RelationField, RelationsConfig, RelationsField, baseImageFileSchema, baseSchema, baseSchemaWithTimestamps, boolField, createPermissions, dateField, defineCollection, editorField, emailField, extractRelationMetadata, fileField, filesField, geoPointField, inputImageFileSchema, isPermissionSchema, isTemplateConfig, jsonField, mergePermissions, numberField, omitImageFilesSchema, resolveTemplate, selectField, textField, urlField, validatePermissionConfig, validateRuleExpression, withIndexes, withPermissions } from './schema.cjs';
 export { A as APIRuleType, P as PermissionSchema, a as PermissionTemplate, b as PermissionTemplateConfig, R as RuleExpression } from './permissions-ZHafVSIx.cjs';
-export { b as ProjectCollection, P as ProjectInputSchema, a as ProjectSchema, e as UserCollection, c as UserCollectionSchema, U as UserInputSchema, d as UserSchema } from './user-DTJQIj4K.cjs';
+export { P as ProjectCollection, a as ProjectInputSchema, b as ProjectSchema, U as UserCollection, d as UserCollectionSchema, c as UserInputSchema, e as UserSchema } from './user-BnFWg5tw.cjs';
 export { SchemaAnalyzer, SchemaAnalyzerConfig, buildFieldDefinition, buildSchemaDefinition, convertZodSchemaToCollectionSchema, discoverSchemaFiles, extractFieldDefinitions, extractIndexes, extractSchemaDefinitions, getCollectionNameFromFile, importSchemaModule, isAuthCollection, parseSchemaFiles, selectSchemaForCollection } from './migration/analyzer.cjs';
 export { SnapshotConfig, SnapshotManager, convertPocketBaseMigration, findLatestSnapshot, getSnapshotPath, getSnapshotVersion, loadBaseMigration, loadSnapshot, loadSnapshotIfExists, loadSnapshotWithMigrations, mergeSnapshots, saveSnapshot, snapshotExists, validateSnapshot } from './migration/snapshot.cjs';
 export { ChangeSummary, DestructiveChange, DiffEngine, DiffEngineConfig, aggregateChanges, categorizeChangesBySeverity, compare, compareFieldConstraints, compareFieldOptions, compareFieldTypes, comparePermissions, compareRelationConfigurations, detectDestructiveChanges, detectFieldChanges, filterSystemCollections, findNewCollections, findNewFields, findRemovedCollections, findRemovedFields, generateChangeSummary, getUsersSystemFields, isSystemCollection, matchCollectionsByName, matchFieldsByName, requiresForceFlag } from './migration/diff.cjs';

package/dist/index.d.ts

@@ -3,7 +3,7 @@ export { UserMutator } from './mutator.js';
 export { ProjectInputType, ProjectType, TypedPocketBase, UserInputType, UserType } from './types.js';
 export { CollectionConfig, PermissionTemplates, PermissionValidationResult, RelationConfig, RelationField, RelationsConfig, RelationsField, baseImageFileSchema, baseSchema, baseSchemaWithTimestamps, boolField, createPermissions, dateField, defineCollection, editorField, emailField, extractRelationMetadata, fileField, filesField, geoPointField, inputImageFileSchema, isPermissionSchema, isTemplateConfig, jsonField, mergePermissions, numberField, omitImageFilesSchema, resolveTemplate, selectField, textField, urlField, validatePermissionConfig, validateRuleExpression, withIndexes, withPermissions } from './schema.js';
 export { A as APIRuleType, P as PermissionSchema, a as PermissionTemplate, b as PermissionTemplateConfig, R as RuleExpression } from './permissions-ZHafVSIx.js';
-export { b as ProjectCollection, P as ProjectInputSchema, a as ProjectSchema, e as UserCollection, c as UserCollectionSchema, U as UserInputSchema, d as UserSchema } from './user-DTJQIj4K.js';
+export { P as ProjectCollection, a as ProjectInputSchema, b as ProjectSchema, U as UserCollection, d as UserCollectionSchema, c as UserInputSchema, e as UserSchema } from './user-BnFWg5tw.js';
 export { SchemaAnalyzer, SchemaAnalyzerConfig, buildFieldDefinition, buildSchemaDefinition, convertZodSchemaToCollectionSchema, discoverSchemaFiles, extractFieldDefinitions, extractIndexes, extractSchemaDefinitions, getCollectionNameFromFile, importSchemaModule, isAuthCollection, parseSchemaFiles, selectSchemaForCollection } from './migration/analyzer.js';
 export { SnapshotConfig, SnapshotManager, convertPocketBaseMigration, findLatestSnapshot, getSnapshotPath, getSnapshotVersion, loadBaseMigration, loadSnapshot, loadSnapshotIfExists, loadSnapshotWithMigrations, mergeSnapshots, saveSnapshot, snapshotExists, validateSnapshot } from './migration/snapshot.js';
 export { ChangeSummary, DestructiveChange, DiffEngine, DiffEngineConfig, aggregateChanges, categorizeChangesBySeverity, compare, compareFieldConstraints, compareFieldOptions, compareFieldTypes, comparePermissions, compareRelationConfigurations, detectDestructiveChanges, detectFieldChanges, filterSystemCollections, findNewCollections, findNewFields, findRemovedCollections, findRemovedFields, generateChangeSummary, getUsersSystemFields, isSystemCollection, matchCollectionsByName, matchFieldsByName, requiresForceFlag } from './migration/diff.js';

package/dist/index.js

@@ -19,7 +19,9 @@ var baseSchema = {
   id: z.string().describe("unique id"),
   collectionId: z.string().describe("collection id"),
   collectionName: z.string().describe("collection name"),
-  expand: z.record(z.any()).describe("expandable fields")
+  expand: z.record(z.any()).describe("expandable fields"),
+  created: z.string().describe("creation timestamp"),
+  updated: z.string().describe("last update timestamp")
 };
 var baseSchemaWithTimestamps = {
   ...baseSchema,
@@ -150,10 +152,13 @@ function withIndexes(schema, indexes) {
   return schema.describe(JSON.stringify(metadata));
 }
 function defineCollection(config) {
-  const { collectionName, schema, permissions, indexes, ...futureOptions } = config;
+  const { collectionName, schema, permissions, indexes, type, ...futureOptions } = config;
   const metadata = {
     collectionName
   };
+  if (type) {
+    metadata.type = type;
+  }
   if (permissions) {
     metadata.permissions = permissions;
   }
@@ -422,7 +427,8 @@ var UserCollectionSchema = z.object({
 });
 var UserSchema = UserCollectionSchema.extend(baseSchema);
 var UserCollection = defineCollection({
-  collectionName: "Users",
+  collectionName: "users",
+  type: "auth",
   schema: UserSchema,
   permissions: {
     // Users can list their own profile
@@ -1987,7 +1993,7 @@ var DEFAULT_CONFIG = {
     "permission-templates.js"
   ],
   includeExtensions: [".ts", ".js"],
-  schemaPatterns: ["Schema", "InputSchema"],
+  schemaPatterns: ["Schema", "InputSchema", "Collection"],
   useCompiledFiles: true
 };
 function mergeConfig(config) {
@@ -2124,14 +2130,35 @@ function extractCollectionNameFromSchema(zodSchema) {
   }
   return null;
 }
-function extractSchemaDefinitions(module, patterns = ["Schema", "InputSchema"]) {
+function extractCollectionTypeFromSchema(zodSchema) {
+  if (!zodSchema.description) {
+    return null;
+  }
+  try {
+    const metadata = JSON.parse(zodSchema.description);
+    if (metadata.type === "base" || metadata.type === "auth") {
+      return metadata.type;
+    }
+  } catch {
+  }
+  return null;
+}
+function extractSchemaDefinitions(module, patterns = ["Schema", "InputSchema", "Collection"]) {
   const result = {};
+  if (module.default instanceof z.ZodObject) {
+    result.schema = module.default;
+  }
   for (const [key, value] of Object.entries(module)) {
+    if (key === "default") continue;
     if (value instanceof z.ZodObject) {
       if (patterns.includes("InputSchema") && key.endsWith("InputSchema")) {
         result.inputSchema = value;
-      } else if (patterns.includes("Schema") && key.endsWith("Schema") && !key.endsWith("InputSchema")) {
-        result.schema = value;
+      } else if (!result.schema) {
+        if (patterns.includes("Collection") && key.endsWith("Collection")) {
+          result.schema = value;
+        } else if (patterns.includes("Schema") && key.endsWith("Schema") && !key.endsWith("InputSchema")) {
+          result.schema = value;
+        }
       }
     }
   }
@@ -2198,11 +2225,8 @@ function buildFieldDefinition(fieldName, zodType) {
       // Default to false, can be configured later
     };
     if (fieldDef.options) {
-      const { min, max, pattern, ...relationSafeOptions } = fieldDef.options;
-      console.log("min", min);
-      console.log("max", max);
-      console.log("pattern", pattern);
-      fieldDef.options = Object.keys(relationSafeOptions).length > 0 ? relationSafeOptions : void 0;
+      const { min: _min, max: _max, pattern: _pattern, ...relationSafeOptions } = fieldDef.options;
+      fieldDef.options = Object.keys(relationSafeOptions).length ? relationSafeOptions : void 0;
     }
   }
   return fieldDef;
@@ -2223,8 +2247,13 @@ function extractIndexes(schema) {
 }
 function convertZodSchemaToCollectionSchema(collectionName, zodSchema) {
   const rawFields = extractFieldDefinitions(zodSchema);
-  const collectionType = isAuthCollection(rawFields) ? "auth" : "base";
-  const fields = rawFields.map(({ name, zodType }) => buildFieldDefinition(name, zodType));
+  const explicitType = extractCollectionTypeFromSchema(zodSchema);
+  const collectionType = explicitType ?? (isAuthCollection(rawFields) ? "auth" : "base");
+  let fields = rawFields.map(({ name, zodType }) => buildFieldDefinition(name, zodType));
+  if (collectionType === "auth") {
+    const authSystemFieldNames = ["email", "emailVisibility", "verified", "password", "tokenKey"];
+    fields = fields.filter((field) => !authSystemFieldNames.includes(field.name));
+  }
   const indexes = extractIndexes(zodSchema) || [];
   const permissionAnalyzer = new PermissionAnalyzer();
   let permissions = void 0;
@@ -3208,9 +3237,14 @@ function matchCollectionsByName(currentSchema, previousSnapshot) {
   if (!previousSnapshot) {
     return matches;
   }
+  const previousCollectionsLower = /* @__PURE__ */ new Map();
+  for (const [name, collection] of previousSnapshot.collections) {
+    previousCollectionsLower.set(name.toLowerCase(), [name, collection]);
+  }
   for (const [collectionName, currentCollection] of currentSchema.collections) {
-    const previousCollection = previousSnapshot.collections.get(collectionName);
-    if (previousCollection) {
+    const previousEntry = previousCollectionsLower.get(collectionName.toLowerCase());
+    if (previousEntry) {
+      const [, previousCollection] = previousEntry;
       matches.push([currentCollection, previousCollection]);
     }
   }