lazypock 0.10.2 → 0.12.0

package/dist/index.cjs

@@ -1437,6 +1437,7 @@ function fieldTypeScriptType(field, fallback = "unknown") {
     case "editor":
     case "date":
     case "datetime":
+    case "autodate":
       return "string";
     case "number":
       return "number";
@@ -1480,6 +1481,7 @@ function fieldTypeKind(field) {
     case "editor":
     case "date":
     case "datetime":
+    case "autodate":
     case "select":
     case "file":
       return "string";
@@ -1525,6 +1527,13 @@ function schemaFieldType(field) {
 }
 
 // src/codegen.ts
+var BASE_RECORD_KEYS = /* @__PURE__ */ new Set([
+  "id",
+  "collectionId",
+  "collectionName",
+  "created",
+  "updated"
+]);
 function collectionTypeName(name) {
   return name.split(/[^a-zA-Z0-9]+/).filter(Boolean).map((part) => part.charAt(0).toUpperCase() + part.slice(1)).join("").replace(/^[0-9]/, "_$&");
 }
@@ -1553,10 +1562,13 @@ function generateTypes(collections, options = {}) {
   updated: string;
 }`);
   }
+  const collById = new Map(
+    filtered.filter((c) => c.id !== void 0 && c.id !== "").map((c) => [String(c.id), c])
+  );
   for (const coll of filtered) {
     const typeName = collectionTypeName(coll.name);
     const fields = coll.fields ?? [];
-    const lines = fields.map((f) => memberLine(f)).filter((l) => l !== "");
+    const lines = fields.map((f) => memberLine(f, includeBaseFields)).filter((l) => l !== "");
     const body = lines.join("\n");
     sections.push(
       `export interface ${typeName}Record${renderInterface({
@@ -1582,6 +1594,7 @@ function generateTypes(collections, options = {}) {
     for (const f of fields) {
       if (f.type === "password") continue;
       const key = fieldKey(f.name);
+      if (includeBaseFields && BASE_RECORD_KEYS.has(key)) continue;
       const type = fieldTypeScriptType(f);
       if (type === "never") continue;
       queryLines.push(`  ${JSON.stringify(key)}?: ${type};`);
@@ -1592,6 +1605,24 @@ function generateTypes(collections, options = {}) {
         body: queryLines.join("\n")
       })}`
     );
+    const expandLines = [];
+    for (const f of fields) {
+      if (f.type !== "relation") continue;
+      const target = collById.get(String(f.options?.collectionId ?? "")) ?? filtered.find(
+        (c) => c.name === String(f.options?.collection ?? "")
+      );
+      if (!target) continue;
+      const targetType = `${collectionTypeName(target.name)}Record${target.type === "auth" ? " & AuthRecord" : ""}`;
+      const many = (f.options?.maxSelect ?? 1) > 1;
+      expandLines.push(
+        `  ${JSON.stringify(fieldKey(f.name))}: ${many ? `Array<${targetType}>` : targetType};`
+      );
+    }
+    sections.push(
+      `export interface ${typeName}ExpandMap${renderInterface({
+        body: expandLines.join("\n")
+      })}`
+    );
   }
   sections.push(`export interface AuthRecord extends BaseRecord {
   email: string;
@@ -1612,6 +1643,10 @@ ${createMapEntries}
   ).join("\n");
   sections.push(`export interface LazypockQueryFields {
 ${queryMapEntries}
+}`);
+  const expandMapEntries = filtered.map((c) => `  "${c.name}": ${collectionTypeName(c.name)}ExpandMap;`).join("\n");
+  sections.push(`export interface LazypockExpandMaps {
+${expandMapEntries}
 }`);
   const schemaEntries = collections.map(
     (c) => `  {
@@ -1665,25 +1700,31 @@ export class TypedClient extends LazypockClient {
   // The (string & {}) intersection keeps the union from collapsing to plain
   // string (which would silently kill the suggestions).
   //
-  // The service binds three types: the read model, the write-only *CreateData,
-  // and the *QueryFields (filter/sort/expand/select keys). QueryFields is what
-  // lets hidden relation fields \u2014 excluded from the read model but still
-  // expandable/filterable at runtime \u2014 typecheck:
+  // The service binds four types: the read model, the write-only *CreateData,
+  // the *QueryFields (filter/sort/expand/select keys), and the *ExpandMap
+  // (relation field \u2192 target record type). QueryFields is what lets hidden
+  // relation fields \u2014 excluded from the read model but still expandable/
+  // filterable at runtime \u2014 typecheck:
   //   client.collection("project_members").getFullList({ expand: "user" }) // \u2713
+  // ExpandMap is what types the expanded data on the result:
+  //   const [rec] = await client.collection("posts").getFullList({ expand: "user" });
+  //   rec.expand?.user // \u2713 UsersRecord, not unknown
   override collection<K extends keyof LazypockCollections | (string & {})>(
     name: K,
   ): K extends keyof LazypockCollections
     ? CollectionService<
         LazypockCollections[K],
         LazypockCreateData[K],
-        LazypockQueryFields[K]
+        LazypockQueryFields[K],
+        LazypockExpandMaps[K]
       >
     : CollectionService<unknown> {
     return super.collection(name) as K extends keyof LazypockCollections
       ? CollectionService<
           LazypockCollections[K],
           LazypockCreateData[K],
-          LazypockQueryFields[K]
+          LazypockQueryFields[K],
+          LazypockExpandMaps[K]
         >
       : CollectionService<unknown>;
   }
@@ -1698,9 +1739,10 @@ function renderInterface(opts) {
 ${opts.body}
 }`;
 }
-function memberLine(f) {
+function memberLine(f, skipBaseKeys = false) {
   if (f.hidden) return "";
   const key = fieldKey(f.name);
+  if (skipBaseKeys && BASE_RECORD_KEYS.has(key)) return "";
   const req = f.required || f.type === "password" ? "" : "?";
   const type = fieldTypeScriptType(f);
   if (type === "never") return "";