prisma-zero 0.1.0-canary.2 → 0.1.1

package/README.md

@@ -93,6 +93,14 @@ generator zero {
   // Optional list of Prisma Model names you want to exclude from the generated schema
   // This does *not* change tables that replicate to zero-cache - only the types on the client
   excludeTables = ["Posts", "Comments", ...]
+  // When true, skip generating the query builder (`zql` and `builder` exports)
+  skipBuilder = true
+  // When true, skip generating the module augmentation for default types in Zero
+  skipDeclare = true
+  // When true, enable legacy CRUD mutators (sets `enableLegacyMutators` to `true` in the generated schema)
+  enableLegacyMutators = true
+  // When true, enable legacy CRUD queries (sets `enableLegacyQueries` to `true` in the generated schema)
+  enableLegacyQueries = true
 }
 ```
 

package/dist/generator.cjs

@@ -39,18 +39,20 @@ var import_promises = require("fs/promises");
 var import_path = require("path");
 
 // package.json
-var version = "0.1.0-canary.1";
+var version = "0.1.1";
 
 // src/generators/code-generator.ts
-function generateImports(schema) {
+function generateImports(schema, config) {
   const usedImports = /* @__PURE__ */ new Set();
   usedImports.add("table");
   usedImports.add("createSchema");
-  usedImports.add("createBuilder");
-  usedImports.add("createCRUDBuilder");
+  if (!config.skipBuilder) {
+    usedImports.add("createBuilder");
+  }
   schema.models.forEach((model) => {
     Object.values(model.columns).forEach((mapping) => {
-      const baseType = mapping.type.split("(")[0];
+      const match = mapping.type.match(/^([a-z]+)/);
+      const baseType = match == null ? void 0 : match[1];
       if (baseType) {
         usedImports.add(baseType);
       }
@@ -150,7 +152,7 @@ ${relationshipsStr}
   const filteredRelationships = modelRelationships.filter(Boolean);
   return filteredRelationships.length > 0 ? filteredRelationships.join("") : "";
 }
-function generateSchema(schema) {
+function generateSchema(schema, config) {
   let output = "/**\n";
   output += " * The Zero schema object.\n";
   output += " * This type is auto-generated from your Prisma schema definition.\n";
@@ -175,48 +177,53 @@ function generateSchema(schema) {
     });
     output += "  ],\n";
   }
+  if (config.enableLegacyMutators) {
+    output += "  enableLegacyMutators: true,\n";
+  }
+  if (config.enableLegacyQueries) {
+    output += "  enableLegacyQueries: true,\n";
+  }
   output += "});\n\n";
   output += "/**\n";
   output += " * Represents the Zero schema type.\n";
   output += " * This type is auto-generated from your Prisma schema definition.\n";
   output += " */\n";
   output += "export type Schema = typeof schema;\n";
-  output += "/**\n";
-  output += " * Represents the ZQL query builder.\n";
-  output += " * This type is auto-generated from your Prisma schema definition.\n";
-  output += " */\n";
-  output += "export const zql = createBuilder(schema);\n";
-  output += "/**\n";
-  output += " * Represents the Zero schema query builder.\n";
-  output += " * This type is auto-generated from your Prisma schema definition.\n";
-  output += " *\n";
-  output += " * @deprecated Use `zql` instead.\n";
-  output += " */\n";
-  output += "export const builder = zql;\n";
-  output += "/**\n";
-  output += " * Represents the Zero schema CRUD builder.\n";
-  output += " * This type is auto-generated from your Prisma schema definition.\n";
-  output += " */\n";
-  output += "export const crud = createCRUDBuilder(schema);\n";
-  output += "/** Defines the default types for Zero */\n";
-  output += 'declare module "@rocicorp/zero" {\n';
-  output += "  interface DefaultTypes {\n";
-  output += "    schema: Schema;\n";
-  output += "  }\n";
-  output += "}\n";
+  if (!config.skipBuilder) {
+    output += "/**\n";
+    output += " * Represents the ZQL query builder.\n";
+    output += " * This type is auto-generated from your Prisma schema definition.\n";
+    output += " */\n";
+    output += "export const zql = createBuilder(schema);\n";
+    output += "/**\n";
+    output += " * Represents the Zero schema query builder.\n";
+    output += " * This type is auto-generated from your Prisma schema definition.\n";
+    output += " *\n";
+    output += " * @deprecated Use `zql` instead.\n";
+    output += " */\n";
+    output += "export const builder = zql;\n";
+  }
+  if (!config.skipDeclare) {
+    output += "/** Defines the default types for Zero */\n";
+    output += 'declare module "@rocicorp/zero" {\n';
+    output += "  interface DefaultTypes {\n";
+    output += "    schema: Schema;\n";
+    output += "  }\n";
+    output += "}\n";
+  }
   return output;
 }
-function generateCode(schema) {
+function generateCode(schema, config) {
   let output = `${HEADER_PREFIX}
 
 `;
-  output += generateImports(schema);
+  output += generateImports(schema, config);
   output += generateUnionTypes(schema);
   schema.models.forEach((model) => {
     output += generateModelSchema(model);
   });
   output += generateRelationships(schema.models);
-  output += generateSchema(schema);
+  output += generateSchema(schema, config);
   return output;
 }
 var HEADER_PREFIX = `// This file was automatically generated by prisma-zero.
@@ -372,7 +379,8 @@ function mapRelationships(model, dmmf, config) {
       return;
     }
     const backReference = targetModel.fields.find(
-      (f) => f.relationName === field.relationName && f.type === model.name
+      (f) => f.relationName === field.relationName && f.type === model.name && f.name !== field.name
+      // Exclude current field for self-referential relations
     );
     if (field.isList) {
       if (backReference == null ? void 0 : backReference.isList) {
@@ -389,7 +397,8 @@ function mapRelationships(model, dmmf, config) {
             `Implicit relation ${field.name}: Model ${model.name} or ${targetModel.name} not found.`
           );
         }
-        const isModelA = model.name === modelA.name;
+        const isSelfReferential = model.name === targetModel.name;
+        const isModelA = isSelfReferential ? backReference ? field.name.localeCompare(backReference.name) < 0 : true : model.name === modelA.name;
         relationships[field.name] = {
           type: "many",
           chain: [
@@ -448,12 +457,12 @@ function mapModel(model, dmmf, config) {
   if (!primaryKey[0]) {
     throw new Error(`No primary key found for ${model.name}`);
   }
-  const tableName = getTableNameFromModel(model);
-  const camelCasedName = (config == null ? void 0 : config.camelCase) ? toCamelCase(tableName) : tableName;
-  const shouldRemap = config.camelCase && camelCasedName !== tableName;
+  const databaseTableName = getTableNameFromModel(model);
+  const tableName = getTableName(model.name, config);
+  const shouldRemap = tableName !== databaseTableName;
   return {
-    tableName: shouldRemap ? camelCasedName : tableName,
-    originalTableName: shouldRemap ? tableName : null,
+    tableName,
+    originalTableName: shouldRemap ? databaseTableName : null,
     modelName: model.name,
     zeroTableName: getZeroTableName(model.name),
     columns,
@@ -476,10 +485,13 @@ function transformSchema(dmmf, config) {
       if (!targetModel) return null;
       if ((_a = config.excludeTables) == null ? void 0 : _a.includes(targetModel.name)) return null;
       const backReference = targetModel.fields.find(
-        (f) => f.relationName === field.relationName && f.type === model.name
+        (f) => f.relationName === field.relationName && f.type === model.name && f.name !== field.name
+        // Exclude current field for self-referential relations
       );
       if (backReference == null ? void 0 : backReference.isList) {
-        if (model.name.localeCompare(targetModel.name) < 0) {
+        const isSelfReferential = model.name === targetModel.name;
+        const shouldCreate = isSelfReferential ? field.name.localeCompare(backReference.name) < 0 : model.name.localeCompare(targetModel.name) < 0;
+        if (shouldCreate) {
           return createImplicitManyToManyModel(
             model,
             targetModel,
@@ -515,10 +527,18 @@ async function onGenerate(options) {
     // Default true
     camelCase: generator.config.camelCase === "true",
     // Default false
-    excludeTables: loadExcludeTables(generator)
+    excludeTables: loadExcludeTables(generator),
+    skipBuilder: generator.config.skipBuilder === "true",
+    // Default false
+    skipDeclare: generator.config.skipDeclare === "true",
+    // Default false
+    enableLegacyMutators: generator.config.enableLegacyMutators === "true",
+    // Default false
+    enableLegacyQueries: generator.config.enableLegacyQueries === "true"
+    // Default false
   };
   const transformedSchema = transformSchema(dmmf, config);
-  let output = generateCode(transformedSchema);
+  let output = generateCode(transformedSchema, config);
   if (config.prettier) {
     let prettier;
     try {

package/dist/generator.js

@@ -6,18 +6,20 @@ import { mkdir, writeFile } from "fs/promises";
 import { join } from "path";
 
 // package.json
-var version = "0.1.0-canary.1";
+var version = "0.1.1";
 
 // src/generators/code-generator.ts
-function generateImports(schema) {
+function generateImports(schema, config) {
   const usedImports = /* @__PURE__ */ new Set();
   usedImports.add("table");
   usedImports.add("createSchema");
-  usedImports.add("createBuilder");
-  usedImports.add("createCRUDBuilder");
+  if (!config.skipBuilder) {
+    usedImports.add("createBuilder");
+  }
   schema.models.forEach((model) => {
     Object.values(model.columns).forEach((mapping) => {
-      const baseType = mapping.type.split("(")[0];
+      const match = mapping.type.match(/^([a-z]+)/);
+      const baseType = match == null ? void 0 : match[1];
       if (baseType) {
         usedImports.add(baseType);
       }
@@ -117,7 +119,7 @@ ${relationshipsStr}
   const filteredRelationships = modelRelationships.filter(Boolean);
   return filteredRelationships.length > 0 ? filteredRelationships.join("") : "";
 }
-function generateSchema(schema) {
+function generateSchema(schema, config) {
   let output = "/**\n";
   output += " * The Zero schema object.\n";
   output += " * This type is auto-generated from your Prisma schema definition.\n";
@@ -142,48 +144,53 @@ function generateSchema(schema) {
     });
     output += "  ],\n";
   }
+  if (config.enableLegacyMutators) {
+    output += "  enableLegacyMutators: true,\n";
+  }
+  if (config.enableLegacyQueries) {
+    output += "  enableLegacyQueries: true,\n";
+  }
   output += "});\n\n";
   output += "/**\n";
   output += " * Represents the Zero schema type.\n";
   output += " * This type is auto-generated from your Prisma schema definition.\n";
   output += " */\n";
   output += "export type Schema = typeof schema;\n";
-  output += "/**\n";
-  output += " * Represents the ZQL query builder.\n";
-  output += " * This type is auto-generated from your Prisma schema definition.\n";
-  output += " */\n";
-  output += "export const zql = createBuilder(schema);\n";
-  output += "/**\n";
-  output += " * Represents the Zero schema query builder.\n";
-  output += " * This type is auto-generated from your Prisma schema definition.\n";
-  output += " *\n";
-  output += " * @deprecated Use `zql` instead.\n";
-  output += " */\n";
-  output += "export const builder = zql;\n";
-  output += "/**\n";
-  output += " * Represents the Zero schema CRUD builder.\n";
-  output += " * This type is auto-generated from your Prisma schema definition.\n";
-  output += " */\n";
-  output += "export const crud = createCRUDBuilder(schema);\n";
-  output += "/** Defines the default types for Zero */\n";
-  output += 'declare module "@rocicorp/zero" {\n';
-  output += "  interface DefaultTypes {\n";
-  output += "    schema: Schema;\n";
-  output += "  }\n";
-  output += "}\n";
+  if (!config.skipBuilder) {
+    output += "/**\n";
+    output += " * Represents the ZQL query builder.\n";
+    output += " * This type is auto-generated from your Prisma schema definition.\n";
+    output += " */\n";
+    output += "export const zql = createBuilder(schema);\n";
+    output += "/**\n";
+    output += " * Represents the Zero schema query builder.\n";
+    output += " * This type is auto-generated from your Prisma schema definition.\n";
+    output += " *\n";
+    output += " * @deprecated Use `zql` instead.\n";
+    output += " */\n";
+    output += "export const builder = zql;\n";
+  }
+  if (!config.skipDeclare) {
+    output += "/** Defines the default types for Zero */\n";
+    output += 'declare module "@rocicorp/zero" {\n';
+    output += "  interface DefaultTypes {\n";
+    output += "    schema: Schema;\n";
+    output += "  }\n";
+    output += "}\n";
+  }
   return output;
 }
-function generateCode(schema) {
+function generateCode(schema, config) {
   let output = `${HEADER_PREFIX}
 
 `;
-  output += generateImports(schema);
+  output += generateImports(schema, config);
   output += generateUnionTypes(schema);
   schema.models.forEach((model) => {
     output += generateModelSchema(model);
   });
   output += generateRelationships(schema.models);
-  output += generateSchema(schema);
+  output += generateSchema(schema, config);
   return output;
 }
 var HEADER_PREFIX = `// This file was automatically generated by prisma-zero.
@@ -339,7 +346,8 @@ function mapRelationships(model, dmmf, config) {
       return;
     }
     const backReference = targetModel.fields.find(
-      (f) => f.relationName === field.relationName && f.type === model.name
+      (f) => f.relationName === field.relationName && f.type === model.name && f.name !== field.name
+      // Exclude current field for self-referential relations
     );
     if (field.isList) {
       if (backReference == null ? void 0 : backReference.isList) {
@@ -356,7 +364,8 @@ function mapRelationships(model, dmmf, config) {
             `Implicit relation ${field.name}: Model ${model.name} or ${targetModel.name} not found.`
           );
         }
-        const isModelA = model.name === modelA.name;
+        const isSelfReferential = model.name === targetModel.name;
+        const isModelA = isSelfReferential ? backReference ? field.name.localeCompare(backReference.name) < 0 : true : model.name === modelA.name;
         relationships[field.name] = {
           type: "many",
           chain: [
@@ -415,12 +424,12 @@ function mapModel(model, dmmf, config) {
   if (!primaryKey[0]) {
     throw new Error(`No primary key found for ${model.name}`);
   }
-  const tableName = getTableNameFromModel(model);
-  const camelCasedName = (config == null ? void 0 : config.camelCase) ? toCamelCase(tableName) : tableName;
-  const shouldRemap = config.camelCase && camelCasedName !== tableName;
+  const databaseTableName = getTableNameFromModel(model);
+  const tableName = getTableName(model.name, config);
+  const shouldRemap = tableName !== databaseTableName;
   return {
-    tableName: shouldRemap ? camelCasedName : tableName,
-    originalTableName: shouldRemap ? tableName : null,
+    tableName,
+    originalTableName: shouldRemap ? databaseTableName : null,
     modelName: model.name,
     zeroTableName: getZeroTableName(model.name),
     columns,
@@ -443,10 +452,13 @@ function transformSchema(dmmf, config) {
       if (!targetModel) return null;
       if ((_a = config.excludeTables) == null ? void 0 : _a.includes(targetModel.name)) return null;
       const backReference = targetModel.fields.find(
-        (f) => f.relationName === field.relationName && f.type === model.name
+        (f) => f.relationName === field.relationName && f.type === model.name && f.name !== field.name
+        // Exclude current field for self-referential relations
       );
       if (backReference == null ? void 0 : backReference.isList) {
-        if (model.name.localeCompare(targetModel.name) < 0) {
+        const isSelfReferential = model.name === targetModel.name;
+        const shouldCreate = isSelfReferential ? field.name.localeCompare(backReference.name) < 0 : model.name.localeCompare(targetModel.name) < 0;
+        if (shouldCreate) {
           return createImplicitManyToManyModel(
             model,
             targetModel,
@@ -482,10 +494,18 @@ async function onGenerate(options) {
     // Default true
     camelCase: generator.config.camelCase === "true",
     // Default false
-    excludeTables: loadExcludeTables(generator)
+    excludeTables: loadExcludeTables(generator),
+    skipBuilder: generator.config.skipBuilder === "true",
+    // Default false
+    skipDeclare: generator.config.skipDeclare === "true",
+    // Default false
+    enableLegacyMutators: generator.config.enableLegacyMutators === "true",
+    // Default false
+    enableLegacyQueries: generator.config.enableLegacyQueries === "true"
+    // Default false
   };
   const transformedSchema = transformSchema(dmmf, config);
-  let output = generateCode(transformedSchema);
+  let output = generateCode(transformedSchema, config);
   if (config.prettier) {
     let prettier;
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prisma-zero",
-  "version": "0.1.0-canary.2",
+  "version": "0.1.1",
   "description": "Generate Zero schemas from Prisma ORM schemas",
   "type": "module",
   "bin": {
@@ -41,8 +41,7 @@
   },
   "devDependencies": {
     "@rocicorp/prettier-config": "^0.4.0",
-    "@rocicorp/zero": "0.24.3000000000",
-    "@ts-morph/common": "^0.28.1",
+    "@rocicorp/zero": "0.25.2",
     "@types/node": "^24.10.1",
     "@types/pg": "^8.15.6",
     "@types/pluralize": "^0.0.33",