prisma-zero 0.1.1 → 0.1.3

package/README.md

@@ -71,6 +71,32 @@ export const userTable = table('User')
   .primaryKey('id');
 ```
 
+## Postgres Time Support
+
+Prisma Postgres `DateTime` native types continue to map to Zero `number()` columns, including `@db.Time` and `@db.Timetz`:
+
+```prisma
+model StoreHours {
+  id       String   @id @default(uuid())
+  opensAt  DateTime @db.Time(6)
+  closesAt DateTime @db.Timetz(6)
+}
+```
+
+The generated Zero schema will include:
+
+```ts
+export const storeHoursTable = table('StoreHours')
+  .columns({
+    id: string(),
+    opensAt: number(),
+    closesAt: number(),
+  })
+  .primaryKey('id');
+```
+
+This generator intentionally keeps `time` and `timetz` fields as plain `number()` columns so they match Zero's existing date/time handling. If your app uses `@db.Time` or `@db.Timetz`, make sure your installed `@rocicorp/zero` version includes upstream support for those Postgres types (`0.26.0+`).
+
 ### Supported Array Types
 
 - **Scalar arrays**: `String[]`, `Int[]`, `Float[]`, `Boolean[]`, `DateTime[]`, `BigInt[]`, `Decimal[]`

package/dist/generator.cjs

@@ -39,7 +39,7 @@ var import_promises = require("fs/promises");
 var import_path = require("path");
 
 // package.json
-var version = "0.1.1";
+var version = "0.1.3";
 
 // src/generators/code-generator.ts
 function generateImports(schema, config) {
@@ -241,21 +241,27 @@ var TYPE_MAP = {
   BigInt: "number()",
   Decimal: "number()"
 };
+var ARRAY_TS_TYPE_MAP = {
+  String: "string[]",
+  Boolean: "boolean[]",
+  Int: "number[]",
+  Float: "number[]",
+  DateTime: "number[]",
+  Json: "any[]",
+  BigInt: "number[]",
+  Decimal: "number[]"
+};
 function mapPrismaTypeToZero(field) {
+  if (field.kind === "unsupported") {
+    return null;
+  }
   const isOptional = !field.isRequired;
   const mappedName = field.dbName && field.dbName !== field.name ? field.dbName : null;
   if (field.isList) {
-    const tsTypeMap = {
-      String: "string[]",
-      Boolean: "boolean[]",
-      Int: "number[]",
-      Float: "number[]",
-      DateTime: "number[]",
-      Json: "any[]",
-      BigInt: "number[]",
-      Decimal: "number[]"
-    };
-    const tsType = field.kind === "enum" ? `${field.type}[]` : tsTypeMap[field.type] || "any[]";
+    const tsType = field.kind === "enum" ? `${field.type}[]` : ARRAY_TS_TYPE_MAP[field.type];
+    if (!tsType) {
+      return null;
+    }
     return {
       type: `json<${tsType}>()`,
       isOptional,
@@ -269,7 +275,13 @@ function mapPrismaTypeToZero(field) {
       mappedName
     };
   }
-  const baseType = TYPE_MAP[field.type] || "string()";
+  if (field.kind !== "scalar") {
+    return null;
+  }
+  const baseType = TYPE_MAP[field.type];
+  if (!baseType) {
+    return null;
+  }
   return {
     type: baseType,
     isOptional,
@@ -337,6 +349,12 @@ function createImplicitManyToManyModel(model1, model2, relationName, config) {
   }
   const columnAType = mapPrismaTypeToZero(idFieldA);
   const columnBType = mapPrismaTypeToZero(idFieldB);
+  if (!columnAType || !columnBType) {
+    const unsupportedModel = !columnAType ? modelA : modelB;
+    throw new Error(
+      `Implicit relation ${relationName ?? "unknown"}: Model ${unsupportedModel.name} has an unsupported @id field.`
+    );
+  }
   return {
     tableName,
     originalTableName,
@@ -365,6 +383,14 @@ function createImplicitManyToManyModel(model1, model2, relationName, config) {
 }
 function mapRelationships(model, dmmf, config) {
   const relationships = {};
+  const isSupportedField = (target, fieldName) => {
+    const field = target.fields.find((f) => f.name === fieldName);
+    if (!field) {
+      return true;
+    }
+    return mapPrismaTypeToZero(field) !== null;
+  };
+  const areFieldsSupported = (target, fieldNames) => fieldNames.every((fieldName) => isSupportedField(target, fieldName));
   model.fields.filter((field) => field.relationName).forEach((field) => {
     var _a, _b, _c, _d, _e, _f, _g;
     const targetModel = dmmf.datamodel.models.find(
@@ -399,17 +425,25 @@ function mapRelationships(model, dmmf, config) {
         }
         const isSelfReferential = model.name === targetModel.name;
         const isModelA = isSelfReferential ? backReference ? field.name.localeCompare(backReference.name) < 0 : true : model.name === modelA.name;
+        const sourceField = [((_b = model.fields.find((f) => f.isId)) == null ? void 0 : _b.name) || "id"];
+        const destField = [isModelA ? "A" : "B"];
+        const targetDestField = [
+          ((_c = targetModel.fields.find((f) => f.isId)) == null ? void 0 : _c.name) || "id"
+        ];
+        if (!areFieldsSupported(model, sourceField) || !areFieldsSupported(targetModel, targetDestField)) {
+          return;
+        }
         relationships[field.name] = {
           type: "many",
           chain: [
             {
-              sourceField: [((_b = model.fields.find((f) => f.isId)) == null ? void 0 : _b.name) || "id"],
-              destField: [isModelA ? "A" : "B"],
+              sourceField,
+              destField,
               destSchema: getZeroTableName(joinTableName)
             },
             {
               sourceField: [isModelA ? "B" : "A"],
-              destField: [((_c = targetModel.fields.find((f) => f.isId)) == null ? void 0 : _c.name) || "id"],
+              destField: targetDestField,
               destSchema: getZeroTableName(targetModel.name)
             }
           ]
@@ -419,6 +453,9 @@ function mapRelationships(model, dmmf, config) {
         const primaryKeyFields = ((_e = model.primaryKey) == null ? void 0 : _e.fields) || (idField ? [idField] : []);
         const sourceFields = ensureStringArray(primaryKeyFields);
         const destFields = (backReference == null ? void 0 : backReference.relationFromFields) ? ensureStringArray(backReference.relationFromFields) : [];
+        if (!areFieldsSupported(model, sourceFields) || !areFieldsSupported(targetModel, destFields)) {
+          return;
+        }
         relationships[field.name] = {
           sourceField: sourceFields,
           destField: destFields,
@@ -436,6 +473,9 @@ function mapRelationships(model, dmmf, config) {
         sourceFields = backReference.relationToFields ? ensureStringArray(backReference.relationToFields) : [];
         destFields = ensureStringArray(backReference.relationFromFields);
       }
+      if (!areFieldsSupported(model, sourceFields) || !areFieldsSupported(targetModel, destFields)) {
+        return;
+      }
       relationships[field.name] = {
         sourceField: sourceFields,
         destField: destFields,
@@ -450,13 +490,29 @@ function mapModel(model, dmmf, config) {
   var _a, _b;
   const columns = {};
   model.fields.filter((field) => !field.relationName).forEach((field) => {
-    columns[field.name] = mapPrismaTypeToZero(field);
+    const mapping = mapPrismaTypeToZero(field);
+    if (!mapping) {
+      return;
+    }
+    columns[field.name] = mapping;
   });
   const idField = (_a = model.fields.find((f) => f.isId)) == null ? void 0 : _a.name;
   const primaryKey = ((_b = model.primaryKey) == null ? void 0 : _b.fields) || (idField ? [idField] : []);
   if (!primaryKey[0]) {
     throw new Error(`No primary key found for ${model.name}`);
   }
+  const unsupportedPrimaryKeys = primaryKey.filter((fieldName) => {
+    const field = model.fields.find((f) => f.name === fieldName);
+    if (!field) {
+      return false;
+    }
+    return mapPrismaTypeToZero(field) === null;
+  });
+  if (unsupportedPrimaryKeys.length > 0) {
+    throw new Error(
+      `Primary key field(s) ${unsupportedPrimaryKeys.join(", ")} in ${model.name} are not supported by Zero.`
+    );
+  }
   const databaseTableName = getTableNameFromModel(model);
   const tableName = getTableName(model.name, config);
   const shouldRemap = tableName !== databaseTableName;

package/dist/generator.js

@@ -6,7 +6,7 @@ import { mkdir, writeFile } from "fs/promises";
 import { join } from "path";
 
 // package.json
-var version = "0.1.1";
+var version = "0.1.3";
 
 // src/generators/code-generator.ts
 function generateImports(schema, config) {
@@ -208,21 +208,27 @@ var TYPE_MAP = {
   BigInt: "number()",
   Decimal: "number()"
 };
+var ARRAY_TS_TYPE_MAP = {
+  String: "string[]",
+  Boolean: "boolean[]",
+  Int: "number[]",
+  Float: "number[]",
+  DateTime: "number[]",
+  Json: "any[]",
+  BigInt: "number[]",
+  Decimal: "number[]"
+};
 function mapPrismaTypeToZero(field) {
+  if (field.kind === "unsupported") {
+    return null;
+  }
   const isOptional = !field.isRequired;
   const mappedName = field.dbName && field.dbName !== field.name ? field.dbName : null;
   if (field.isList) {
-    const tsTypeMap = {
-      String: "string[]",
-      Boolean: "boolean[]",
-      Int: "number[]",
-      Float: "number[]",
-      DateTime: "number[]",
-      Json: "any[]",
-      BigInt: "number[]",
-      Decimal: "number[]"
-    };
-    const tsType = field.kind === "enum" ? `${field.type}[]` : tsTypeMap[field.type] || "any[]";
+    const tsType = field.kind === "enum" ? `${field.type}[]` : ARRAY_TS_TYPE_MAP[field.type];
+    if (!tsType) {
+      return null;
+    }
     return {
       type: `json<${tsType}>()`,
       isOptional,
@@ -236,7 +242,13 @@ function mapPrismaTypeToZero(field) {
       mappedName
     };
   }
-  const baseType = TYPE_MAP[field.type] || "string()";
+  if (field.kind !== "scalar") {
+    return null;
+  }
+  const baseType = TYPE_MAP[field.type];
+  if (!baseType) {
+    return null;
+  }
   return {
     type: baseType,
     isOptional,
@@ -304,6 +316,12 @@ function createImplicitManyToManyModel(model1, model2, relationName, config) {
   }
   const columnAType = mapPrismaTypeToZero(idFieldA);
   const columnBType = mapPrismaTypeToZero(idFieldB);
+  if (!columnAType || !columnBType) {
+    const unsupportedModel = !columnAType ? modelA : modelB;
+    throw new Error(
+      `Implicit relation ${relationName ?? "unknown"}: Model ${unsupportedModel.name} has an unsupported @id field.`
+    );
+  }
   return {
     tableName,
     originalTableName,
@@ -332,6 +350,14 @@ function createImplicitManyToManyModel(model1, model2, relationName, config) {
 }
 function mapRelationships(model, dmmf, config) {
   const relationships = {};
+  const isSupportedField = (target, fieldName) => {
+    const field = target.fields.find((f) => f.name === fieldName);
+    if (!field) {
+      return true;
+    }
+    return mapPrismaTypeToZero(field) !== null;
+  };
+  const areFieldsSupported = (target, fieldNames) => fieldNames.every((fieldName) => isSupportedField(target, fieldName));
   model.fields.filter((field) => field.relationName).forEach((field) => {
     var _a, _b, _c, _d, _e, _f, _g;
     const targetModel = dmmf.datamodel.models.find(
@@ -366,17 +392,25 @@ function mapRelationships(model, dmmf, config) {
         }
         const isSelfReferential = model.name === targetModel.name;
         const isModelA = isSelfReferential ? backReference ? field.name.localeCompare(backReference.name) < 0 : true : model.name === modelA.name;
+        const sourceField = [((_b = model.fields.find((f) => f.isId)) == null ? void 0 : _b.name) || "id"];
+        const destField = [isModelA ? "A" : "B"];
+        const targetDestField = [
+          ((_c = targetModel.fields.find((f) => f.isId)) == null ? void 0 : _c.name) || "id"
+        ];
+        if (!areFieldsSupported(model, sourceField) || !areFieldsSupported(targetModel, targetDestField)) {
+          return;
+        }
         relationships[field.name] = {
           type: "many",
           chain: [
             {
-              sourceField: [((_b = model.fields.find((f) => f.isId)) == null ? void 0 : _b.name) || "id"],
-              destField: [isModelA ? "A" : "B"],
+              sourceField,
+              destField,
               destSchema: getZeroTableName(joinTableName)
             },
             {
               sourceField: [isModelA ? "B" : "A"],
-              destField: [((_c = targetModel.fields.find((f) => f.isId)) == null ? void 0 : _c.name) || "id"],
+              destField: targetDestField,
               destSchema: getZeroTableName(targetModel.name)
             }
           ]
@@ -386,6 +420,9 @@ function mapRelationships(model, dmmf, config) {
         const primaryKeyFields = ((_e = model.primaryKey) == null ? void 0 : _e.fields) || (idField ? [idField] : []);
         const sourceFields = ensureStringArray(primaryKeyFields);
         const destFields = (backReference == null ? void 0 : backReference.relationFromFields) ? ensureStringArray(backReference.relationFromFields) : [];
+        if (!areFieldsSupported(model, sourceFields) || !areFieldsSupported(targetModel, destFields)) {
+          return;
+        }
         relationships[field.name] = {
           sourceField: sourceFields,
           destField: destFields,
@@ -403,6 +440,9 @@ function mapRelationships(model, dmmf, config) {
         sourceFields = backReference.relationToFields ? ensureStringArray(backReference.relationToFields) : [];
         destFields = ensureStringArray(backReference.relationFromFields);
       }
+      if (!areFieldsSupported(model, sourceFields) || !areFieldsSupported(targetModel, destFields)) {
+        return;
+      }
       relationships[field.name] = {
         sourceField: sourceFields,
         destField: destFields,
@@ -417,13 +457,29 @@ function mapModel(model, dmmf, config) {
   var _a, _b;
   const columns = {};
   model.fields.filter((field) => !field.relationName).forEach((field) => {
-    columns[field.name] = mapPrismaTypeToZero(field);
+    const mapping = mapPrismaTypeToZero(field);
+    if (!mapping) {
+      return;
+    }
+    columns[field.name] = mapping;
   });
   const idField = (_a = model.fields.find((f) => f.isId)) == null ? void 0 : _a.name;
   const primaryKey = ((_b = model.primaryKey) == null ? void 0 : _b.fields) || (idField ? [idField] : []);
   if (!primaryKey[0]) {
     throw new Error(`No primary key found for ${model.name}`);
   }
+  const unsupportedPrimaryKeys = primaryKey.filter((fieldName) => {
+    const field = model.fields.find((f) => f.name === fieldName);
+    if (!field) {
+      return false;
+    }
+    return mapPrismaTypeToZero(field) === null;
+  });
+  if (unsupportedPrimaryKeys.length > 0) {
+    throw new Error(
+      `Primary key field(s) ${unsupportedPrimaryKeys.join(", ")} in ${model.name} are not supported by Zero.`
+    );
+  }
   const databaseTableName = getTableNameFromModel(model);
   const tableName = getTableName(model.name, config);
   const shouldRemap = tableName !== databaseTableName;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prisma-zero",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Generate Zero schemas from Prisma ORM schemas",
   "type": "module",
   "bin": {
@@ -36,27 +36,27 @@
     "url": "https://bugs.rocicorp.dev"
   },
   "dependencies": {
-    "@prisma/generator-helper": "^7.1.0",
+    "@prisma/generator-helper": "^7.5.0",
     "camelcase": "^9.0.0"
   },
   "devDependencies": {
     "@rocicorp/prettier-config": "^0.4.0",
-    "@rocicorp/zero": "0.25.2",
-    "@types/node": "^24.10.1",
-    "@types/pg": "^8.15.6",
+    "@rocicorp/zero": "1.0.0",
+    "@types/node": "^25.5.0",
+    "@types/pg": "^8.20.0",
     "@types/pluralize": "^0.0.33",
     "@types/ws": "^8.18.1",
-    "@vitest/browser": "^4.0.15",
-    "@vitest/coverage-v8": "4.0.15",
-    "@vitest/ui": "^4.0.15",
-    "oxlint": "^1.31.0",
-    "oxlint-tsgolint": "^0.8.3",
-    "prettier": "^3.7.4",
+    "@vitest/browser": "^4.1.1",
+    "@vitest/coverage-v8": "4.1.1",
+    "@vitest/ui": "^4.1.1",
+    "oxlint": "^1.57.0",
+    "oxlint-tsgolint": "^0.17.4",
+    "prettier": "^3.8.1",
     "tsup": "^8.5.1",
     "tsx": "^4.21.0",
-    "typescript": "^5.9.3",
-    "vite-tsconfig-paths": "^5.1.4",
-    "vitest": "^4.0.15"
+    "typescript": "^6.0.2",
+    "vite-tsconfig-paths": "^6.1.1",
+    "vitest": "^4.1.1"
   },
   "prettier": "@rocicorp/prettier-config",
   "scripts": {