postgresdk 0.6.7 → 0.6.8

package/dist/cli.js

@@ -1005,7 +1005,7 @@ function emitZod(table, opts) {
   const Type = pascal(table.name);
   const zFor = (pg) => {
     if (pg === "uuid")
-      return `z.string().uuid()`;
+      return `z.string()`;
     if (pg === "bool" || pg === "boolean")
       return `z.boolean()`;
     if (pg === "int2" || pg === "int4" || pg === "int8")
@@ -2732,28 +2732,24 @@ function generateSampleDataFromSchema(table, hasForeignKeys = false) {
     }
   }
   for (const col of table.columns) {
-    if (col.hasDefault) {
-      const autoGenerated = ["id", "created_at", "updated_at", "created", "updated", "modified_at"];
-      if (autoGenerated.includes(col.name.toLowerCase())) {
-        continue;
-      }
-    }
-    if (col.name === "deleted_at" || col.name === "deleted") {
+    const isAutoGenerated = col.hasDefault && ["id", "created_at", "updated_at", "created", "updated", "modified_at"].includes(col.name.toLowerCase());
+    if (isAutoGenerated) {
       continue;
     }
-    if (!col.nullable) {
-      const foreignTable = foreignKeyColumns.get(col.name);
-      if (foreignTable) {
-        fields.push(`    ${col.name}: ${foreignTable}Id`);
+    if (col.name === "deleted_at" || col.name === "deleted") {
+      if (col.nullable) {
+        fields.push(`    ${col.name}: null`);
       } else {
         const value = generateValueForColumn(col);
         fields.push(`    ${col.name}: ${value}`);
       }
-    } else {
-      const foreignTable = foreignKeyColumns.get(col.name);
+      continue;
+    }
+    const foreignTable = foreignKeyColumns.get(col.name);
+    if (!col.nullable || foreignTable || col.hasDefault && !isAutoGenerated || shouldIncludeNullableColumn(col)) {
       if (foreignTable) {
         fields.push(`    ${col.name}: ${foreignTable}Id`);
-      } else if (shouldIncludeNullableColumn(col)) {
+      } else {
         const value = generateValueForColumn(col);
         fields.push(`    ${col.name}: ${value}`);
       }
@@ -2813,80 +2809,15 @@ function shouldIncludeNullableColumn(col) {
   return importantPatterns.some((pattern) => name.includes(pattern));
 }
 function generateValueForColumn(col, isUpdate = false) {
-  const name = col.name.toLowerCase();
   const type = col.pgType.toLowerCase();
-  if (name.includes("email")) {
-    return `'test${isUpdate ? ".updated" : ""}@example.com'`;
-  }
-  if (name.includes("phone")) {
-    return `'555-${isUpdate ? "0200" : "0100"}'`;
-  }
-  if (name.includes("url") || name.includes("website")) {
-    return `'https://example.com${isUpdate ? "/updated" : ""}'`;
-  }
-  if (name.includes("password")) {
-    return `'hashedPassword123'`;
-  }
-  if (name === "name" || name.includes("_name") || name.includes("name_")) {
-    return `'Test ${pascal(col.name)}${isUpdate ? " Updated" : ""}'`;
-  }
-  if (name === "title" || name.includes("title")) {
-    return `'Test Title${isUpdate ? " Updated" : ""}'`;
-  }
-  if (name.includes("description") || name === "bio" || name === "about") {
-    return `'Test description${isUpdate ? " updated" : ""}'`;
-  }
-  if (name === "slug") {
-    return `'test-slug${isUpdate ? "-updated" : ""}'`;
-  }
-  if (name === "status") {
-    return `'${isUpdate ? "updated" : "active"}'`;
-  }
-  if (name === "type" || name === "kind" || name === "category") {
-    return `'${isUpdate ? "type2" : "type1"}'`;
-  }
-  if (name === "color" || name === "colour") {
-    return `'${isUpdate ? "#FF0000" : "#0000FF"}'`;
-  }
-  if (name === "gender") {
-    return `'${isUpdate ? "F" : "M"}'`;
-  }
-  if (name.includes("price") || name === "cost" || name === "amount") {
-    return isUpdate ? "99.99" : "10.50";
-  }
-  if (name === "quantity" || name === "count" || name.includes("qty")) {
-    return isUpdate ? "5" : "1";
-  }
-  if (name === "age") {
-    return isUpdate ? "30" : "25";
-  }
-  if (name.includes("percent") || name === "rate" || name === "ratio") {
-    return isUpdate ? "0.75" : "0.5";
-  }
-  if (name.includes("latitude") || name === "lat") {
-    return "40.7128";
-  }
-  if (name.includes("longitude") || name === "lng" || name === "lon") {
-    return "-74.0060";
-  }
-  if (type.includes("date") || type.includes("timestamp")) {
-    if (name.includes("birth") || name === "dob") {
-      return `new Date('1990-01-01')`;
-    }
-    if (name.includes("end") || name.includes("expire")) {
-      return `new Date('2025-12-31')`;
-    }
-    if (name.includes("start") || name.includes("begin")) {
-      return `new Date('2024-01-01')`;
-    }
-    return `new Date()`;
-  }
   switch (type) {
     case "text":
     case "varchar":
     case "char":
     case "character varying":
-      return `'test_value${isUpdate ? "_updated" : ""}'`;
+    case "bpchar":
+    case "name":
+      return `'str_${Math.random().toString(36).substring(7)}'`;
     case "int":
     case "int2":
     case "int4":
@@ -2894,6 +2825,8 @@ function generateValueForColumn(col, isUpdate = false) {
     case "integer":
     case "smallint":
     case "bigint":
+    case "serial":
+    case "bigserial":
       return isUpdate ? "42" : "1";
     case "decimal":
     case "numeric":
@@ -2902,37 +2835,85 @@ function generateValueForColumn(col, isUpdate = false) {
     case "float":
     case "float4":
     case "float8":
+    case "money":
       return isUpdate ? "99.99" : "10.50";
     case "boolean":
     case "bool":
       return isUpdate ? "false" : "true";
+    case "date":
+    case "timestamp":
+    case "timestamptz":
+    case "timestamp without time zone":
+    case "timestamp with time zone":
+    case "time":
+    case "timetz":
+    case "time without time zone":
+    case "time with time zone":
+      return `new Date()`;
+    case "interval":
+      return `'1 day'`;
     case "json":
     case "jsonb":
-      return `{ key: '${isUpdate ? "updated" : "value"}' }`;
+      return `{}`;
     case "uuid":
-      return `'${isUpdate ? "550e8400-e29b-41d4-a716-446655440001" : "550e8400-e29b-41d4-a716-446655440000"}'`;
+      return `'${generateUUID()}'`;
     case "inet":
-      return `'${isUpdate ? "192.168.1.2" : "192.168.1.1"}'`;
+      return `'192.168.1.1'`;
     case "cidr":
       return `'192.168.1.0/24'`;
     case "macaddr":
-      return `'08:00:2b:01:02:0${isUpdate ? "4" : "3"}'`;
+    case "macaddr8":
+      return `'08:00:2b:01:02:03'`;
+    case "point":
+      return `'(1,2)'`;
+    case "line":
+      return `'{1,2,3}'`;
+    case "lseg":
+      return `'[(0,0),(1,1)]'`;
+    case "box":
+      return `'((0,0),(1,1))'`;
+    case "path":
+      return `'[(0,0),(1,1),(2,0)]'`;
+    case "polygon":
+      return `'((0,0),(1,1),(1,0))'`;
+    case "circle":
+      return `'<(0,0),1>'`;
+    case "bit":
+    case "bit varying":
+    case "varbit":
+      return `'101'`;
+    case "bytea":
+      return `'\\\\x0102'`;
     case "xml":
-      return `'<root>${isUpdate ? "updated" : "value"}</root>'`;
+      return `'<root/>'`;
+    case "tsvector":
+      return `'a fat cat'`;
+    case "tsquery":
+      return `'fat & cat'`;
+    case "oid":
+    case "regproc":
+    case "regprocedure":
+    case "regoper":
+    case "regoperator":
+    case "regclass":
+    case "regtype":
+    case "regconfig":
+    case "regdictionary":
+      return "1";
     default:
-      if (type.endsWith("[]")) {
-        const baseType = type.slice(0, -2);
-        if (baseType === "text" || baseType === "varchar") {
-          return `['item1', 'item2${isUpdate ? "_updated" : ""}']`;
-        }
-        if (baseType === "int" || baseType === "integer") {
-          return `[1, 2, ${isUpdate ? "3" : ""}]`;
-        }
+      if (type.endsWith("[]") || type.startsWith("_")) {
         return `[]`;
       }
-      return `'test${isUpdate ? "_updated" : ""}'`;
+      return `'value1'`;
   }
 }
+function generateUUID() {
+  return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) {
+    const r = Math.random() * 16 | 0;
+    const v = c === "x" ? r : r & 3 | 8;
+    return v.toString(16);
+  });
+}
 function generateTestCases(table, sampleData, updateData, hasForeignKeys = false) {
   const Type = pascal(table.name);
   const hasData = sampleData !== "{}";

package/dist/index.js

@@ -735,7 +735,7 @@ function emitZod(table, opts) {
   const Type = pascal(table.name);
   const zFor = (pg) => {
     if (pg === "uuid")
-      return `z.string().uuid()`;
+      return `z.string()`;
     if (pg === "bool" || pg === "boolean")
       return `z.boolean()`;
     if (pg === "int2" || pg === "int4" || pg === "int8")
@@ -2462,28 +2462,24 @@ function generateSampleDataFromSchema(table, hasForeignKeys = false) {
     }
   }
   for (const col of table.columns) {
-    if (col.hasDefault) {
-      const autoGenerated = ["id", "created_at", "updated_at", "created", "updated", "modified_at"];
-      if (autoGenerated.includes(col.name.toLowerCase())) {
-        continue;
-      }
-    }
-    if (col.name === "deleted_at" || col.name === "deleted") {
+    const isAutoGenerated = col.hasDefault && ["id", "created_at", "updated_at", "created", "updated", "modified_at"].includes(col.name.toLowerCase());
+    if (isAutoGenerated) {
       continue;
     }
-    if (!col.nullable) {
-      const foreignTable = foreignKeyColumns.get(col.name);
-      if (foreignTable) {
-        fields.push(`    ${col.name}: ${foreignTable}Id`);
+    if (col.name === "deleted_at" || col.name === "deleted") {
+      if (col.nullable) {
+        fields.push(`    ${col.name}: null`);
       } else {
         const value = generateValueForColumn(col);
         fields.push(`    ${col.name}: ${value}`);
       }
-    } else {
-      const foreignTable = foreignKeyColumns.get(col.name);
+      continue;
+    }
+    const foreignTable = foreignKeyColumns.get(col.name);
+    if (!col.nullable || foreignTable || col.hasDefault && !isAutoGenerated || shouldIncludeNullableColumn(col)) {
       if (foreignTable) {
         fields.push(`    ${col.name}: ${foreignTable}Id`);
-      } else if (shouldIncludeNullableColumn(col)) {
+      } else {
         const value = generateValueForColumn(col);
         fields.push(`    ${col.name}: ${value}`);
       }
@@ -2543,80 +2539,15 @@ function shouldIncludeNullableColumn(col) {
   return importantPatterns.some((pattern) => name.includes(pattern));
 }
 function generateValueForColumn(col, isUpdate = false) {
-  const name = col.name.toLowerCase();
   const type = col.pgType.toLowerCase();
-  if (name.includes("email")) {
-    return `'test${isUpdate ? ".updated" : ""}@example.com'`;
-  }
-  if (name.includes("phone")) {
-    return `'555-${isUpdate ? "0200" : "0100"}'`;
-  }
-  if (name.includes("url") || name.includes("website")) {
-    return `'https://example.com${isUpdate ? "/updated" : ""}'`;
-  }
-  if (name.includes("password")) {
-    return `'hashedPassword123'`;
-  }
-  if (name === "name" || name.includes("_name") || name.includes("name_")) {
-    return `'Test ${pascal(col.name)}${isUpdate ? " Updated" : ""}'`;
-  }
-  if (name === "title" || name.includes("title")) {
-    return `'Test Title${isUpdate ? " Updated" : ""}'`;
-  }
-  if (name.includes("description") || name === "bio" || name === "about") {
-    return `'Test description${isUpdate ? " updated" : ""}'`;
-  }
-  if (name === "slug") {
-    return `'test-slug${isUpdate ? "-updated" : ""}'`;
-  }
-  if (name === "status") {
-    return `'${isUpdate ? "updated" : "active"}'`;
-  }
-  if (name === "type" || name === "kind" || name === "category") {
-    return `'${isUpdate ? "type2" : "type1"}'`;
-  }
-  if (name === "color" || name === "colour") {
-    return `'${isUpdate ? "#FF0000" : "#0000FF"}'`;
-  }
-  if (name === "gender") {
-    return `'${isUpdate ? "F" : "M"}'`;
-  }
-  if (name.includes("price") || name === "cost" || name === "amount") {
-    return isUpdate ? "99.99" : "10.50";
-  }
-  if (name === "quantity" || name === "count" || name.includes("qty")) {
-    return isUpdate ? "5" : "1";
-  }
-  if (name === "age") {
-    return isUpdate ? "30" : "25";
-  }
-  if (name.includes("percent") || name === "rate" || name === "ratio") {
-    return isUpdate ? "0.75" : "0.5";
-  }
-  if (name.includes("latitude") || name === "lat") {
-    return "40.7128";
-  }
-  if (name.includes("longitude") || name === "lng" || name === "lon") {
-    return "-74.0060";
-  }
-  if (type.includes("date") || type.includes("timestamp")) {
-    if (name.includes("birth") || name === "dob") {
-      return `new Date('1990-01-01')`;
-    }
-    if (name.includes("end") || name.includes("expire")) {
-      return `new Date('2025-12-31')`;
-    }
-    if (name.includes("start") || name.includes("begin")) {
-      return `new Date('2024-01-01')`;
-    }
-    return `new Date()`;
-  }
   switch (type) {
     case "text":
     case "varchar":
     case "char":
     case "character varying":
-      return `'test_value${isUpdate ? "_updated" : ""}'`;
+    case "bpchar":
+    case "name":
+      return `'str_${Math.random().toString(36).substring(7)}'`;
     case "int":
     case "int2":
     case "int4":
@@ -2624,6 +2555,8 @@ function generateValueForColumn(col, isUpdate = false) {
     case "integer":
     case "smallint":
     case "bigint":
+    case "serial":
+    case "bigserial":
       return isUpdate ? "42" : "1";
     case "decimal":
     case "numeric":
@@ -2632,37 +2565,85 @@ function generateValueForColumn(col, isUpdate = false) {
     case "float":
     case "float4":
     case "float8":
+    case "money":
       return isUpdate ? "99.99" : "10.50";
     case "boolean":
     case "bool":
       return isUpdate ? "false" : "true";
+    case "date":
+    case "timestamp":
+    case "timestamptz":
+    case "timestamp without time zone":
+    case "timestamp with time zone":
+    case "time":
+    case "timetz":
+    case "time without time zone":
+    case "time with time zone":
+      return `new Date()`;
+    case "interval":
+      return `'1 day'`;
     case "json":
     case "jsonb":
-      return `{ key: '${isUpdate ? "updated" : "value"}' }`;
+      return `{}`;
     case "uuid":
-      return `'${isUpdate ? "550e8400-e29b-41d4-a716-446655440001" : "550e8400-e29b-41d4-a716-446655440000"}'`;
+      return `'${generateUUID()}'`;
     case "inet":
-      return `'${isUpdate ? "192.168.1.2" : "192.168.1.1"}'`;
+      return `'192.168.1.1'`;
     case "cidr":
       return `'192.168.1.0/24'`;
     case "macaddr":
-      return `'08:00:2b:01:02:0${isUpdate ? "4" : "3"}'`;
+    case "macaddr8":
+      return `'08:00:2b:01:02:03'`;
+    case "point":
+      return `'(1,2)'`;
+    case "line":
+      return `'{1,2,3}'`;
+    case "lseg":
+      return `'[(0,0),(1,1)]'`;
+    case "box":
+      return `'((0,0),(1,1))'`;
+    case "path":
+      return `'[(0,0),(1,1),(2,0)]'`;
+    case "polygon":
+      return `'((0,0),(1,1),(1,0))'`;
+    case "circle":
+      return `'<(0,0),1>'`;
+    case "bit":
+    case "bit varying":
+    case "varbit":
+      return `'101'`;
+    case "bytea":
+      return `'\\\\x0102'`;
     case "xml":
-      return `'<root>${isUpdate ? "updated" : "value"}</root>'`;
+      return `'<root/>'`;
+    case "tsvector":
+      return `'a fat cat'`;
+    case "tsquery":
+      return `'fat & cat'`;
+    case "oid":
+    case "regproc":
+    case "regprocedure":
+    case "regoper":
+    case "regoperator":
+    case "regclass":
+    case "regtype":
+    case "regconfig":
+    case "regdictionary":
+      return "1";
     default:
-      if (type.endsWith("[]")) {
-        const baseType = type.slice(0, -2);
-        if (baseType === "text" || baseType === "varchar") {
-          return `['item1', 'item2${isUpdate ? "_updated" : ""}']`;
-        }
-        if (baseType === "int" || baseType === "integer") {
-          return `[1, 2, ${isUpdate ? "3" : ""}]`;
-        }
+      if (type.endsWith("[]") || type.startsWith("_")) {
         return `[]`;
       }
-      return `'test${isUpdate ? "_updated" : ""}'`;
+      return `'value1'`;
   }
 }
+function generateUUID() {
+  return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) {
+    const r = Math.random() * 16 | 0;
+    const v = c === "x" ? r : r & 3 | 8;
+    return v.toString(16);
+  });
+}
 function generateTestCases(table, sampleData, updateData, hasForeignKeys = false) {
   const Type = pascal(table.name);
   const hasData = sampleData !== "{}";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postgresdk",
-  "version": "0.6.7",
+  "version": "0.6.8",
   "description": "Generate a typed server/client SDK from a Postgres schema (includes, Zod, Hono).",
   "type": "module",
   "bin": {