pocketbase-zod-schema 0.1.4 → 0.2.1

package/dist/migration/analyzer.d.cts

@@ -61,6 +61,7 @@ interface SchemaAnalyzerConfig {
 declare function discoverSchemaFiles(config: SchemaAnalyzerConfig | string): string[];
 /**
  * Dynamically imports a schema module
+ * Supports both JavaScript and TypeScript files using tsx
  *
  * @param filePath - Path to the schema file (without extension)
  * @param config - Optional configuration for path transformation
@@ -75,6 +76,15 @@ declare function importSchemaModule(filePath: string, config?: SchemaAnalyzerCon
  * @returns The collection name
  */
 declare function getCollectionNameFromFile(filePath: string): string;
+/**
+ * Extracts the collection name from a Zod schema's metadata
+ * Checks if the schema was created with defineCollection() which stores
+ * the collection name in the schema description
+ *
+ * @param zodSchema - The Zod schema to extract collection name from
+ * @returns The collection name if found in metadata, null otherwise
+ */
+declare function extractCollectionNameFromSchema(zodSchema: z.ZodTypeAny): string | null;
 /**
  * Extracts Zod schema definitions from a module
  * Looks for schemas ending with configured patterns (default: "Schema" or "InputSchema")
@@ -183,4 +193,4 @@ declare class SchemaAnalyzer {
     convertZodSchemaToCollectionSchema(name: string, schema: z.ZodObject<any>): CollectionSchema;
 }
 
-export { SchemaAnalyzer, type SchemaAnalyzerConfig, buildFieldDefinition, buildSchemaDefinition, convertZodSchemaToCollectionSchema, discoverSchemaFiles, extractFieldDefinitions, extractIndexes, extractSchemaDefinitions, getCollectionNameFromFile, importSchemaModule, isAuthCollection, parseSchemaFiles, selectSchemaForCollection };
+export { SchemaAnalyzer, type SchemaAnalyzerConfig, buildFieldDefinition, buildSchemaDefinition, convertZodSchemaToCollectionSchema, discoverSchemaFiles, extractCollectionNameFromSchema, extractFieldDefinitions, extractIndexes, extractSchemaDefinitions, getCollectionNameFromFile, importSchemaModule, isAuthCollection, parseSchemaFiles, selectSchemaForCollection };

package/dist/migration/analyzer.d.ts

@@ -61,6 +61,7 @@ interface SchemaAnalyzerConfig {
 declare function discoverSchemaFiles(config: SchemaAnalyzerConfig | string): string[];
 /**
  * Dynamically imports a schema module
+ * Supports both JavaScript and TypeScript files using tsx
  *
  * @param filePath - Path to the schema file (without extension)
  * @param config - Optional configuration for path transformation
@@ -75,6 +76,15 @@ declare function importSchemaModule(filePath: string, config?: SchemaAnalyzerCon
  * @returns The collection name
  */
 declare function getCollectionNameFromFile(filePath: string): string;
+/**
+ * Extracts the collection name from a Zod schema's metadata
+ * Checks if the schema was created with defineCollection() which stores
+ * the collection name in the schema description
+ *
+ * @param zodSchema - The Zod schema to extract collection name from
+ * @returns The collection name if found in metadata, null otherwise
+ */
+declare function extractCollectionNameFromSchema(zodSchema: z.ZodTypeAny): string | null;
 /**
  * Extracts Zod schema definitions from a module
  * Looks for schemas ending with configured patterns (default: "Schema" or "InputSchema")
@@ -183,4 +193,4 @@ declare class SchemaAnalyzer {
     convertZodSchemaToCollectionSchema(name: string, schema: z.ZodObject<any>): CollectionSchema;
 }
 
-export { SchemaAnalyzer, type SchemaAnalyzerConfig, buildFieldDefinition, buildSchemaDefinition, convertZodSchemaToCollectionSchema, discoverSchemaFiles, extractFieldDefinitions, extractIndexes, extractSchemaDefinitions, getCollectionNameFromFile, importSchemaModule, isAuthCollection, parseSchemaFiles, selectSchemaForCollection };
+export { SchemaAnalyzer, type SchemaAnalyzerConfig, buildFieldDefinition, buildSchemaDefinition, convertZodSchemaToCollectionSchema, discoverSchemaFiles, extractCollectionNameFromSchema, extractFieldDefinitions, extractIndexes, extractSchemaDefinitions, getCollectionNameFromFile, importSchemaModule, isAuthCollection, parseSchemaFiles, selectSchemaForCollection };

package/dist/migration/analyzer.js

@@ -957,6 +957,16 @@ function isFieldRequired(zodType) {
 }
 
 // src/migration/analyzer.ts
+var tsxLoaderRegistered = false;
+async function ensureTsxLoader() {
+  if (tsxLoaderRegistered) return;
+  try {
+    await import('tsx/esm');
+    tsxLoaderRegistered = true;
+  } catch {
+    tsxLoaderRegistered = false;
+  }
+}
 var DEFAULT_CONFIG = {
   workspaceRoot: process.cwd(),
   excludePatterns: [
@@ -1054,24 +1064,37 @@ async function importSchemaModule(filePath, config) {
     } else {
       resolvedPath = jsPath;
     }
+    if (resolvedPath.endsWith(".ts")) {
+      await ensureTsxLoader();
+      if (!tsxLoaderRegistered) {
+        throw new SchemaParsingError(
+          `Failed to import TypeScript schema file. The 'tsx' package is required to load TypeScript files.
+Please install tsx: npm install tsx (or yarn add tsx, or pnpm add tsx)
+Alternatively, compile your schema files to JavaScript first.`,
+          filePath
+        );
+      }
+    }
     const fileUrl = new URL(`file://${path.resolve(resolvedPath)}`);
     const module = await import(fileUrl.href);
     return module;
   } catch (error) {
     const tsPath = `${filePath}.ts`;
     const isTypeScriptFile = fs.existsSync(tsPath);
+    if (isTypeScriptFile && error instanceof SchemaParsingError) {
+      throw error;
+    }
     if (isTypeScriptFile) {
       throw new SchemaParsingError(
-        `Failed to import TypeScript schema file. Node.js cannot import TypeScript files directly.
-Please either:
-  1. Compile your schema files to JavaScript first, or
-  2. Use tsx to run the migration tool (e.g., "npx tsx package/dist/cli/migrate.js status" or "tsx package/dist/cli/migrate.js status")`,
+        `Failed to import TypeScript schema file. The 'tsx' package is required to load TypeScript files.
+Please install tsx: npm install tsx (or yarn add tsx, or pnpm add tsx)
+Alternatively, compile your schema files to JavaScript first.`,
         filePath,
         error
       );
     }
     throw new SchemaParsingError(
-      `Failed to import schema module. Make sure the schema files are compiled to JavaScript.`,
+      `Failed to import schema module. Make sure the schema files exist and are valid.`,
       filePath,
       error
     );
@@ -1081,6 +1104,19 @@ function getCollectionNameFromFile(filePath) {
   const filename = path.basename(filePath).replace(/\.(ts|js)$/, "");
   return toCollectionName(filename);
 }
+function extractCollectionNameFromSchema(zodSchema) {
+  if (!zodSchema.description) {
+    return null;
+  }
+  try {
+    const metadata = JSON.parse(zodSchema.description);
+    if (metadata.collectionName && typeof metadata.collectionName === "string") {
+      return metadata.collectionName;
+    }
+  } catch {
+  }
+  return null;
+}
 function extractSchemaDefinitions(module, patterns = ["Schema", "InputSchema"]) {
   const result = {};
   for (const [key, value] of Object.entries(module)) {
@@ -1155,11 +1191,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;
@@ -1256,7 +1289,8 @@ async function buildSchemaDefinition(config) {
         console.warn(`No valid schema found in ${filePath}, skipping...`);
         continue;
       }
-      const collectionName = getCollectionNameFromFile(filePath);
+      const collectionNameFromSchema = extractCollectionNameFromSchema(zodSchema);
+      const collectionName = collectionNameFromSchema ?? getCollectionNameFromFile(filePath);
       const collectionSchema = convertZodSchemaToCollectionSchema(collectionName, zodSchema);
       collections.set(collectionName, collectionSchema);
     } catch (error) {
@@ -1300,6 +1334,6 @@ var SchemaAnalyzer = class {
   }
 };
 
-export { SchemaAnalyzer, buildFieldDefinition, buildSchemaDefinition, convertZodSchemaToCollectionSchema, discoverSchemaFiles, extractFieldDefinitions, extractIndexes, extractSchemaDefinitions, getCollectionNameFromFile, importSchemaModule, isAuthCollection, parseSchemaFiles, selectSchemaForCollection };
+export { SchemaAnalyzer, buildFieldDefinition, buildSchemaDefinition, convertZodSchemaToCollectionSchema, discoverSchemaFiles, extractCollectionNameFromSchema, extractFieldDefinitions, extractIndexes, extractSchemaDefinitions, getCollectionNameFromFile, importSchemaModule, isAuthCollection, parseSchemaFiles, selectSchemaForCollection };
 //# sourceMappingURL=analyzer.js.map
 //# sourceMappingURL=analyzer.js.map