@carlonicora/nextjs-jsonapi 1.110.0 → 1.111.1

package/dist/scripts/generate-web-module/templates/components/list-container.template.js

@@ -22,8 +22,8 @@ import { Modules } from "@carlonicora/nextjs-jsonapi/core";
 
 function ${names.pascalCase}ListContainerInternal() {
   return (
-    <RoundPageContainer module={Modules.${names.pascalCase}}>
-      <${names.pascalCase}List />
+    <RoundPageContainer module={Modules.${names.pascalCase}} fullWidth>
+      <${names.pascalCase}List fullWidth />
     </RoundPageContainer>
   );
 }

package/dist/scripts/generate-web-module/templates/components/list.template.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"list.template.d.ts","sourceRoot":"","sources":["../../../../../scripts/generate-web-module/templates/components/list.template.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAG3E;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,oBAAoB,GAAG,MAAM,CAyCvE"}
+{"version":3,"file":"list.template.d.ts","sourceRoot":"","sources":["../../../../../scripts/generate-web-module/templates/components/list.template.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAG3E;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,oBAAoB,GAAG,MAAM,CA8CvE"}

package/dist/scripts/generate-web-module/templates/components/list.template.js

@@ -30,7 +30,11 @@ import { DataListRetriever, useDataListRetriever } from "@carlonicora/nextjs-jso
 import { useTranslations } from "next-intl";
 import { ReactNode } from "react";
 
-export default function ${names.pascalCase}List() {
+type ${names.pascalCase}ListProps = {
+  fullWidth?: boolean;
+};
+
+export default function ${names.pascalCase}List({ fullWidth }: ${names.pascalCase}ListProps) {
   const t = useTranslations();
 
   const data: DataListRetriever<${names.pascalCase}Interface> = useDataListRetriever({
@@ -48,6 +52,7 @@ export default function ${names.pascalCase}List() {
       tableGeneratorType={Modules.${names.pascalCase}}
       functions={functions}
       title={t(\`entities.${names.pluralCamel.toLowerCase()}\`, { count: 2 })}
+      fullWidth={fullWidth}
     />
   );
 }

package/dist/scripts/generate-web-module/templates/components/list.template.js.map

@@ -1 +1 @@
-{"version":3,"file":"list.template.js","sourceRoot":"","sources":["../../../../../scripts/generate-web-module/templates/components/list.template.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"list.template.js","sourceRoot":"","sources":["../../../../../scripts/generate-web-module/templates/components/list.template.ts"],"names":[],"mappings":"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"}

package/dist/scripts/generate-web-module/templates/components/selector.template.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"selector.template.d.ts","sourceRoot":"","sources":["../../../../../scripts/generate-web-module/templates/components/selector.template.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAE3E;;;;;GAKG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,oBAAoB,GAAG,MAAM,CA4K3E"}
+{"version":3,"file":"selector.template.d.ts","sourceRoot":"","sources":["../../../../../scripts/generate-web-module/templates/components/selector.template.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAE3E;;;;;GAKG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,oBAAoB,GAAG,MAAM,CAwK3E"}

package/dist/scripts/generate-web-module/templates/components/selector.template.js

@@ -20,11 +20,14 @@ function generateSelectorTemplate(data) {
     return `"use client";
 
 import {
+  Button,
   Command,
+  CommandEmpty,
+  CommandGroup,
+  CommandInput,
   CommandItem,
   CommandList,
   FormFieldWrapper,
-  Input,
   Popover,
   PopoverContent,
   PopoverTrigger,
@@ -35,7 +38,7 @@ import { DataListRetriever, useDataListRetriever } from "@carlonicora/nextjs-jso
 import { useDebounce } from "@carlonicora/nextjs-jsonapi/client";
 import { Modules } from "@carlonicora/nextjs-jsonapi/core";
 
-import { CircleX, RefreshCwIcon, SearchIcon, XIcon } from "lucide-react";
+import { ChevronsUpDown, Loader2, XIcon } from "lucide-react";
 import { useTranslations } from "next-intl";
 import { useCallback, useEffect, useRef, useState } from "react";
 
@@ -97,12 +100,12 @@ export default function ${names.pascalCase}Selector({
   const set${names.pascalCase} = (${names.camelCase}?: ${names.pascalCase}Interface) => {
     if (onChange) onChange(${names.camelCase});
     if (!${names.camelCase}) {
-      form.setValue(id, undefined, { shouldDirty: true });
+      form.setValue(id, undefined);
       setOpen(false);
       return;
     }
 
-    form.setValue(id, { id: ${names.camelCase}.id, name: ${names.camelCase}.${displayProp} }, { shouldDirty: true });
+    form.setValue(id, { id: ${names.camelCase}.id, name: ${names.camelCase}.${displayProp} });
     setOpen(false);
 
     setTimeout(() => {
@@ -117,62 +120,55 @@ export default function ${names.pascalCase}Selector({
           <Popover open={open} onOpenChange={setOpen} modal={true}>
             <div className="flex w-full flex-row items-center justify-between">
               <PopoverTrigger className="w-full">
-                <div className="flex w-full flex-row items-center justify-start rounded-md">
-                  {field.value ? (
-                    <div className="bg-input/20 dark:bg-input/30 border-input flex h-7 w-full flex-row items-center justify-start rounded-md border px-2 py-0.5 text-sm md:text-xs/relaxed">
-                      <span>{field.value?.name ?? ""}</span>
-                    </div>
-                  ) : (
-                    <div className="bg-input/20 dark:bg-input/30 border-input text-muted-foreground flex h-7 w-full flex-row items-center justify-start rounded-md border px-2 py-0.5 text-sm md:text-xs/relaxed">
-                      {placeholder ?? t(\`generic.search.placeholder\`, { type: t(\`entities.${i18nKey}\`, { count: 1 }) })}
-                    </div>
-                  )}
-                </div>
+                <Button
+                  variant="outline"
+                  role="combobox"
+                  aria-expanded={open}
+                  className="h-auto min-h-10 w-full justify-between px-3 py-2"
+                >
+                  <span className={field.value ? "" : "text-muted-foreground"}>
+                    {field.value?.name ?? placeholder ?? t(\`generic.search.placeholder\`, { type: t(\`entities.${i18nKey}\`, { count: 1 }) })}
+                  </span>
+                  <ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
+                </Button>
               </PopoverTrigger>
               {field.value && (
-                <CircleX
-                  className="text-muted hover:text-destructive ml-2 h-4 w-4 shrink-0 cursor-pointer"
+                <XIcon
+                  className="text-muted-foreground hover:text-destructive ml-2 h-5 w-5 cursor-pointer"
                   onClick={() => set${names.pascalCase}()}
                 />
               )}
             </div>
-            <PopoverContent align="start" className="w-(--anchor-width)">
+            <PopoverContent className="w-(--radix-popover-trigger-width) p-0" align="start">
               <Command shouldFilter={false}>
-                <div className="relative mb-2 w-full">
-                  <SearchIcon className="text-muted-foreground absolute top-2.5 left-2.5 h-4 w-4" />
-                  <Input
-                    placeholder={t(\`generic.search.placeholder\`, { type: t(\`entities.${i18nKey}\`, { count: 1 }) })}
-                    type="text"
-                    className="w-full pr-8 pl-8"
-                    onChange={(e) => setSearchTerm(e.target.value)}
-                    value={searchTerm}
-                  />
-                  {isSearching ? (
-                    <RefreshCwIcon className="text-muted-foreground absolute top-2.5 right-2.5 h-4 w-4 animate-spin" />
-                  ) : searchTermRef.current ? (
-                    <XIcon
-                      className={\`absolute top-2.5 right-2.5 h-4 w-4 \${searchTermRef.current ? "cursor-pointer" : "text-muted-foreground"}\`}
-                      onClick={() => {
-                        setSearchTerm("");
-                        search("");
-                      }}
-                    />
-                  ) : (
-                    <></>
-                  )}
-                </div>
+                <CommandInput
+                  placeholder={t(\`generic.search.placeholder\`, { type: t(\`entities.${i18nKey}\`, { count: 1 }) })}
+                  value={searchTerm}
+                  onValueChange={setSearchTerm}
+                />
                 <CommandList>
-                  {data.data &&
-                    data.data.length > 0 &&
-                    (data.data as ${names.pascalCase}Interface[]).map((${names.camelCase}: ${names.pascalCase}Interface) => (
-                      <CommandItem
-                        className="cursor-pointer hover:bg-muted data-selected:hover:bg-muted bg-transparent data-selected:bg-transparent"
-                        key={${names.camelCase}.id}
-                        onSelect={() => set${names.pascalCase}(${names.camelCase})}
-                      >
-                        {${names.camelCase}.${displayProp}}
-                      </CommandItem>
-                    ))}
+                  {isSearching && (
+                    <div className="flex items-center justify-center py-6">
+                      <Loader2 className="text-muted-foreground h-4 w-4 animate-spin" />
+                    </div>
+                  )}
+                  {!isSearching && data.data && data.data.length === 0 && (
+                    <CommandEmpty>{t(\`generic.search.no_results\`)}</CommandEmpty>
+                  )}
+                  {!isSearching && data.data && data.data.length > 0 && (
+                    <CommandGroup>
+                      {(data.data as ${names.pascalCase}Interface[]).map((${names.camelCase}: ${names.pascalCase}Interface) => (
+                        <CommandItem
+                          key={${names.camelCase}.id}
+                          value={${names.camelCase}.id}
+                          onSelect={() => set${names.pascalCase}(${names.camelCase})}
+                          className="hover:bg-muted data-selected:hover:bg-muted bg-transparent data-selected:bg-transparent cursor-pointer"
+                        >
+                          {${names.camelCase}.${displayProp}}
+                        </CommandItem>
+                      ))}
+                    </CommandGroup>
+                  )}
                 </CommandList>
               </Command>
             </PopoverContent>

package/dist/scripts/generate-web-module/templates/components/selector.template.js.map

@@ -1 +1 @@
-{"version":3,"file":"selector.template.js","sourceRoot":"","sources":["../../../../../scripts/generate-web-module/templates/components/selector.template.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;AAUH,4DA4KC;AAlLD;;;;;GAKG;AACH,SAAgB,wBAAwB,CAAC,IAA0B;IACjE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC;IAC/C,MAAM,YAAY,GAAG,cAAc,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC;IAC7E,MAAM,OAAO,GAAG,KAAK,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC;IAChD,MAAM,WAAW,GAAG,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;IAEjD,OAAO;;;;;;;;;;;;WAYE,KAAK,CAAC,UAAU,gCAAgC,IAAI,CAAC,eAAe,IAAI,KAAK,CAAC,SAAS,SAAS,KAAK,CAAC,UAAU;WAChH,KAAK,CAAC,UAAU,8BAA8B,IAAI,CAAC,eAAe,IAAI,KAAK,CAAC,SAAS,SAAS,KAAK,CAAC,UAAU;;;;;;;;;OASlH,KAAK,CAAC,UAAU;;;;;gBAKP,KAAK,CAAC,SAAS,MAAM,KAAK,CAAC,UAAU;;;;0BAI3B,KAAK,CAAC,UAAU;;;;;;;KAOrC,KAAK,CAAC,UAAU;;;;;;;;;;kCAUa,KAAK,CAAC,UAAU;;eAEnC,KAAK,CAAC,UAAU;;;sBAGT,KAAK,CAAC,UAAU;;;;;;;;;;;;;;;;;;;;;;;;aAwBzB,KAAK,CAAC,UAAU,OAAO,KAAK,CAAC,SAAS,MAAM,KAAK,CAAC,UAAU;6BAC5C,KAAK,CAAC,SAAS;WACjC,KAAK,CAAC,SAAS;;;;;;8BAMI,KAAK,CAAC,SAAS,cAAc,KAAK,CAAC,SAAS,IAAI,WAAW;;;;;;;;;;;;;;;;;;;;;;+FAsBM,OAAO;;;;;;;;sCAQhE,KAAK,CAAC,UAAU;;;;;;;;;0FASoC,OAAO;;;;;;;;;;;;;;;;;;;;;;;oCAuB7D,KAAK,CAAC,UAAU,qBAAqB,KAAK,CAAC,SAAS,KAAK,KAAK,CAAC,UAAU;;;+BAG9E,KAAK,CAAC,SAAS;6CACD,KAAK,CAAC,UAAU,IAAI,KAAK,CAAC,SAAS;;2BAErD,KAAK,CAAC,SAAS,IAAI,WAAW;;;;;;;;;;;;CAYxD,CAAC;AACF,CAAC"}
+{"version":3,"file":"selector.template.js","sourceRoot":"","sources":["../../../../../scripts/generate-web-module/templates/components/selector.template.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;AAUH,4DAwKC;AA9KD;;;;;GAKG;AACH,SAAgB,wBAAwB,CAAC,IAA0B;IACjE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC;IAC/C,MAAM,YAAY,GAAG,cAAc,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC;IAC7E,MAAM,OAAO,GAAG,KAAK,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC;IAChD,MAAM,WAAW,GAAG,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;IAEjD,OAAO;;;;;;;;;;;;;;;WAeE,KAAK,CAAC,UAAU,gCAAgC,IAAI,CAAC,eAAe,IAAI,KAAK,CAAC,SAAS,SAAS,KAAK,CAAC,UAAU;WAChH,KAAK,CAAC,UAAU,8BAA8B,IAAI,CAAC,eAAe,IAAI,KAAK,CAAC,SAAS,SAAS,KAAK,CAAC,UAAU;;;;;;;;;OASlH,KAAK,CAAC,UAAU;;;;;gBAKP,KAAK,CAAC,SAAS,MAAM,KAAK,CAAC,UAAU;;;;0BAI3B,KAAK,CAAC,UAAU;;;;;;;KAOrC,KAAK,CAAC,UAAU;;;;;;;;;;kCAUa,KAAK,CAAC,UAAU;;eAEnC,KAAK,CAAC,UAAU;;;sBAGT,KAAK,CAAC,UAAU;;;;;;;;;;;;;;;;;;;;;;;;aAwBzB,KAAK,CAAC,UAAU,OAAO,KAAK,CAAC,SAAS,MAAM,KAAK,CAAC,UAAU;6BAC5C,KAAK,CAAC,SAAS;WACjC,KAAK,CAAC,SAAS;;;;;;8BAMI,KAAK,CAAC,SAAS,cAAc,KAAK,CAAC,SAAS,IAAI,WAAW;;;;;;;;;;;;;;;;;;;;;;kHAsByB,OAAO;;;;;;;;sCAQnF,KAAK,CAAC,UAAU;;;;;;;wFAOkC,OAAO;;;;;;;;;;;;;;;uCAexD,KAAK,CAAC,UAAU,qBAAqB,KAAK,CAAC,SAAS,KAAK,KAAK,CAAC,UAAU;;iCAE/E,KAAK,CAAC,SAAS;mCACb,KAAK,CAAC,SAAS;+CACH,KAAK,CAAC,UAAU,IAAI,KAAK,CAAC,SAAS;;;6BAGrD,KAAK,CAAC,SAAS,IAAI,WAAW;;;;;;;;;;;;;;CAc1D,CAAC;AACF,CAAC"}

package/dist/scripts/generate-web-module/templates/data/interface.template.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interface.template.d.ts","sourceRoot":"","sources":["../../../../../scripts/generate-web-module/templates/data/interface.template.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,oBAAoB,EAAuC,MAAM,qCAAqC,CAAC;AAGhH;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,oBAAoB,GAAG,MAAM,CAa5E"}
+{"version":3,"file":"interface.template.d.ts","sourceRoot":"","sources":["../../../../../scripts/generate-web-module/templates/data/interface.template.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,oBAAoB,EAAuC,MAAM,qCAAqC,CAAC;AAWhH;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,oBAAoB,GAAG,MAAM,CAc5E"}

package/dist/scripts/generate-web-module/templates/data/interface.template.js

@@ -7,6 +7,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateInterfaceTemplate = generateInterfaceTemplate;
 const name_transformer_1 = require("../../transformers/name-transformer");
+/**
+ * Build the named `<Pascal>RelationshipMeta` interface name for a relationship
+ * that carries edge fields (mirrors live OpportunityInterface.ts).
+ */
+function relationshipMetaName(rel) {
+    return `${(0, name_transformer_1.toPascalCase)(rel.alias ?? rel.name)}RelationshipMeta`;
+}
 /**
  * Generate the interface file content
  *
@@ -16,15 +23,32 @@ const name_transformer_1 = require("../../transformers/name-transformer");
 function generateInterfaceTemplate(data) {
     const { names, extendsContent, fields, relationships } = data;
     const imports = generateImports(data);
+    const metaInterfaces = generateMetaInterfaces(data);
     const inputType = generateInputType(data);
     const interfaceDefinition = generateInterface(data);
     return `${imports}
-
+${metaInterfaces ? `\n${metaInterfaces}\n` : ""}
 ${inputType}
 
 ${interfaceDefinition}
 `;
 }
+/**
+ * Generate named `<Pascal>RelationshipMeta` interfaces for relationships that
+ * carry edge fields. Reused by getters and the Input type's meta arrays.
+ */
+function generateMetaInterfaces(data) {
+    return data.relationships
+        .filter((rel) => rel.fields && rel.fields.length > 0)
+        .map((rel) => {
+        const metaName = relationshipMetaName(rel);
+        const body = rel
+            .fields.map((f) => `  ${f.name}${f.nullable ? "?" : ""}: ${f.tsType};`)
+            .join("\n");
+        return `export interface ${metaName} {\n${body}\n}`;
+    })
+        .join("\n\n");
+}
 /**
  * Generate import statements
  */
@@ -57,10 +81,9 @@ function generateImports(data) {
 function generateInputType(data) {
     const { names, extendsContent, fields, relationships } = data;
     const fieldLines = ["  id: string;"];
-    // Add fields (excluding inherited ones if extending Content)
-    const fieldsToInclude = extendsContent
-        ? fields.filter((f) => !["name", "tldr", "abstract"].includes(f.name))
-        : fields;
+    // Add fields (excluding inherited ones if extending Content, and read-only
+    // fields which are server-derived and never sent back in the Input).
+    const fieldsToInclude = (extendsContent ? fields.filter((f) => !["name", "tldr", "abstract"].includes(f.name)) : fields).filter((f) => !f.readOnly);
     fieldsToInclude.forEach((field) => {
         const optional = field.nullable ? "?" : "";
         fieldLines.push(`  ${field.name}${optional}: ${field.tsType};`);
@@ -84,6 +107,11 @@ function generateInputType(data) {
             const effectiveMany = rel.alias || rel.name;
             const key = `${(0, name_transformer_1.toCamelCase)(effectiveMany)}Ids`;
             fieldLines.push(`  ${key}?: string[];`);
+            // For many relationships with edge fields, also emit a parallel meta array.
+            if (rel.fields && rel.fields.length > 0) {
+                const metaShape = rel.fields.map((f) => `${f.name}: ${f.tsType}`).join("; ");
+                fieldLines.push(`  ${(0, name_transformer_1.toCamelCase)(effectiveMany)}Meta?: { id: string; ${metaShape} }[];`);
+            }
         }
     });
     if (extendsContent) {
@@ -115,11 +143,11 @@ function generateInterface(data) {
         const effectiveName = rel.alias || rel.variant || rel.name;
         if (rel.single) {
             const propertyName = (0, name_transformer_1.toCamelCase)(effectiveName);
-            // Build return type - use intersection if relationship has fields
+            // Build return type - intersect with the named meta interface if the
+            // relationship has edge fields.
             let baseType = rel.interfaceName;
             if (rel.fields && rel.fields.length > 0) {
-                const metaFields = rel.fields.map((f) => `${f.name}?: ${f.tsType}`).join("; ");
-                baseType = `${rel.interfaceName} & { ${metaFields} }`;
+                baseType = `${rel.interfaceName} & ${relationshipMetaName(rel)}`;
             }
             const type = rel.nullable ? `(${baseType}) | undefined` : baseType;
             getterLines.push(`  get ${propertyName}(): ${type};`);
@@ -127,10 +155,9 @@ function generateInterface(data) {
         else {
             const effectiveMany = rel.alias || rel.name;
             const propertyName = (0, name_transformer_1.pluralize)((0, name_transformer_1.toCamelCase)(effectiveMany));
-            // Use intersection type if relationship has fields (edge properties)
+            // Intersect with the named meta interface if the relationship has edge fields.
             if (rel.fields && rel.fields.length > 0) {
-                const metaFields = rel.fields.map((f) => `${f.name}?: ${f.tsType}`).join("; ");
-                getterLines.push(`  get ${propertyName}(): (${rel.interfaceName} & { ${metaFields} })[];`);
+                getterLines.push(`  get ${propertyName}(): (${rel.interfaceName} & ${relationshipMetaName(rel)})[];`);
             }
             else {
                 getterLines.push(`  get ${propertyName}(): ${rel.interfaceName}[];`);

package/dist/scripts/generate-web-module/templates/data/interface.template.js.map

@@ -1 +1 @@
-{"version":3,"file":"interface.template.js","sourceRoot":"","sources":["../../../../../scripts/generate-web-module/templates/data/interface.template.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"interface.template.js","sourceRoot":"","sources":["../../../../../scripts/generate-web-module/templates/data/interface.template.ts"],"names":[],"mappings":"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"}

package/dist/scripts/generate-web-module/templates/data/model.template.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model.template.d.ts","sourceRoot":"","sources":["../../../../../scripts/generate-web-module/templates/data/model.template.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAiB,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAE1F;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,oBAAoB,GAAG,MAAM,CAuBxE"}
+{"version":3,"file":"model.template.d.ts","sourceRoot":"","sources":["../../../../../scripts/generate-web-module/templates/data/model.template.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,EAAuC,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAyBhH;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,oBAAoB,GAAG,MAAM,CAuBxE"}

package/dist/scripts/generate-web-module/templates/data/model.template.js

@@ -7,7 +7,30 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateModelTemplate = generateModelTemplate;
 const name_transformer_1 = require("../../transformers/name-transformer");
+const relationship_key_1 = require("../../transformers/relationship-key");
 const field_mapping_types_1 = require("../../types/field-mapping.types");
+/**
+ * Build the named `<Pascal>RelationshipMeta` interface name for a relationship
+ * that carries edge fields (mirrors live Opportunity.ts / OpportunityInterface.ts).
+ *
+ * These named interfaces are declared in the module's OWN `<Module>Interface.ts`
+ * (emitted by interface.template.ts), so the model imports them from there.
+ */
+function relMetaName(rel) {
+    return `${(0, name_transformer_1.toPascalCase)(rel.alias ?? rel.name)}RelationshipMeta`;
+}
+/**
+ * Determine whether the model needs the `formatLocalDate` helper imported.
+ *
+ * True when any data field is a date/datetime, or any relationship edge field
+ * is a date/datetime (edge dates would also be serialized via the helper).
+ */
+function hasDateField(data) {
+    const fieldIsDate = (type) => type === "date" || type === "datetime";
+    if (data.fields.some((f) => fieldIsDate(f.type)))
+        return true;
+    return data.relationships.some((rel) => (rel.fields ?? []).some((f) => fieldIsDate(f.type)));
+}
 /**
  * Generate the model file content
  *
@@ -41,8 +64,21 @@ ${createJsonApiMethod}
 function generateImports(data) {
     const { names, extendsContent, relationships } = data;
     const imports = [];
-    // Own interface import
-    imports.push(`import { ${names.pascalCase}Input, ${names.pascalCase}Interface } from "@/features/${data.importTargetDir}/${names.kebabCase}/data/${names.pascalCase}Interface";`);
+    // Own interface import — also pull in the named `<Pascal>RelationshipMeta`
+    // interfaces, which are all declared in this module's own Interface file.
+    const ownNamedImports = [`${names.pascalCase}Input`, `${names.pascalCase}Interface`];
+    const seenMeta = new Set();
+    relationships.forEach((rel) => {
+        if (!rel.fields || rel.fields.length === 0)
+            return;
+        const metaName = relMetaName(rel);
+        if (seenMeta.has(metaName))
+            return;
+        seenMeta.add(metaName);
+        ownNamedImports.push(metaName);
+    });
+    ownNamedImports.sort((a, b) => a.toLowerCase().localeCompare(b.toLowerCase()));
+    imports.push(`import { ${ownNamedImports.join(", ")} } from "@/features/${data.importTargetDir}/${names.kebabCase}/data/${names.pascalCase}Interface";`);
     // Relationship interface imports (deduplicated, skip self-referential)
     const seenInterfaces = new Set();
     relationships.forEach((rel) => {
@@ -54,13 +90,17 @@ function generateImports(data) {
         seenInterfaces.add(rel.interfaceName);
         imports.push(`import { ${rel.interfaceName} } from "${rel.interfaceImportPath}";`);
     });
-    // Base class and core imports
+    // Base class and core imports (sorted case-insensitively to match live output)
+    const byName = (a, b) => a.toLowerCase().localeCompare(b.toLowerCase());
+    const coreNames = ["JsonApiHydratedDataInterface", "Modules"];
+    if (hasDateField(data))
+        coreNames.push("formatLocalDate");
     if (extendsContent) {
         imports.push(`import { Content } from "@/features/content/data/Content";`);
-        imports.push(`import { JsonApiHydratedDataInterface, Modules } from "@carlonicora/nextjs-jsonapi/core";`);
+        imports.push(`import { ${coreNames.sort(byName).join(", ")} } from "@carlonicora/nextjs-jsonapi/core";`);
     }
     else {
-        imports.push(`import { AbstractApiData, JsonApiHydratedDataInterface, Modules } from "@carlonicora/nextjs-jsonapi/core";`);
+        imports.push(`import { ${["AbstractApiData", ...coreNames].sort(byName).join(", ")} } from "@carlonicora/nextjs-jsonapi/core";`);
     }
     return imports.join("\n");
 }
@@ -83,21 +123,19 @@ function generatePrivateFields(data) {
             const effectiveName = rel.alias || rel.variant || rel.name;
             if (rel.single) {
                 const propName = (0, name_transformer_1.toCamelCase)(effectiveName);
-                // Use intersection type if relationship has fields
+                // Use intersection with the named meta interface if relationship has fields
                 let typeDecl = rel.interfaceName;
                 if (rel.fields && rel.fields.length > 0) {
-                    const metaFields = rel.fields.map((f) => `${f.name}?: ${f.tsType}`).join("; ");
-                    typeDecl = `${rel.interfaceName} & { ${metaFields} }`;
+                    typeDecl = `${rel.interfaceName} & ${relMetaName(rel)}`;
                 }
                 lines.push(`  private _${propName}?: ${typeDecl};`);
             }
             else {
                 const effectiveMany = rel.alias || rel.name;
                 const propName = (0, name_transformer_1.pluralize)((0, name_transformer_1.toCamelCase)(effectiveMany));
-                // Use intersection type if relationship has fields (edge properties)
+                // Use intersection with the named meta interface if relationship has fields (edge properties)
                 if (rel.fields && rel.fields.length > 0) {
-                    const metaFields = rel.fields.map((f) => `${f.name}?: ${f.tsType}`).join("; ");
-                    lines.push(`  private _${propName}?: (${rel.interfaceName} & { ${metaFields} })[];`);
+                    lines.push(`  private _${propName}?: (${rel.interfaceName} & ${relMetaName(rel)})[];`);
                 }
                 else {
                     lines.push(`  private _${propName}?: ${rel.interfaceName}[];`);
@@ -129,11 +167,10 @@ function generateGetters(data) {
             const effectiveName = rel.alias || rel.variant || rel.name;
             if (rel.single) {
                 const propName = (0, name_transformer_1.toCamelCase)(effectiveName);
-                // Build return type - use intersection if relationship has fields
+                // Build return type - intersect with the named meta interface if relationship has fields
                 let baseType = rel.interfaceName;
                 if (rel.fields && rel.fields.length > 0) {
-                    const metaFields = rel.fields.map((f) => `${f.name}?: ${f.tsType}`).join("; ");
-                    baseType = `${rel.interfaceName} & { ${metaFields} }`;
+                    baseType = `${rel.interfaceName} & ${relMetaName(rel)}`;
                 }
                 if (rel.nullable) {
                     lines.push(`  get ${propName}(): (${baseType}) | undefined {
@@ -150,10 +187,9 @@ function generateGetters(data) {
             else {
                 const effectiveMany = rel.alias || rel.name;
                 const propName = (0, name_transformer_1.pluralize)((0, name_transformer_1.toCamelCase)(effectiveMany));
-                // Use intersection type if relationship has fields (edge properties)
+                // Intersect with the named meta interface if relationship has fields (edge properties)
                 if (rel.fields && rel.fields.length > 0) {
-                    const metaFields = rel.fields.map((f) => `${f.name}?: ${f.tsType}`).join("; ");
-                    lines.push(`  get ${propName}(): (${rel.interfaceName} & { ${metaFields} })[] {
+                    lines.push(`  get ${propName}(): (${rel.interfaceName} & ${relMetaName(rel)})[] {
     return this._${propName} ?? [];
   }`);
                 }
@@ -199,10 +235,10 @@ function generateRehydrateMethod(data) {
             const effectiveName = rel.alias || rel.variant || rel.name;
             if (rel.single) {
                 const propName = (0, name_transformer_1.toCamelCase)(effectiveName);
-                const relationshipKey = (0, name_transformer_1.toCamelCase)(effectiveName);
+                const relationshipKey = (0, relationship_key_1.resolveRelationshipKey)(rel);
                 // Use _readIncludedWithMeta for relationships with fields
                 if (rel.fields && rel.fields.length > 0) {
-                    const metaType = `{ ${rel.fields.map((f) => `${f.name}?: ${f.tsType}`).join("; ")} }`;
+                    const metaType = relMetaName(rel);
                     const singleCast = rel.nullable
                         ? ` as (${rel.interfaceName} & ${metaType}) | undefined`
                         : ` as ${rel.interfaceName} & ${metaType}`;
@@ -215,10 +251,10 @@ function generateRehydrateMethod(data) {
             else {
                 const effectiveMany = rel.alias || rel.name;
                 const propName = (0, name_transformer_1.pluralize)((0, name_transformer_1.toCamelCase)(effectiveMany));
-                const relationshipKey = (0, name_transformer_1.toCamelCase)(effectiveMany);
+                const relationshipKey = (0, relationship_key_1.resolveRelationshipKey)(rel);
                 // Use _readIncludedWithMeta for relationships with fields (edge properties)
                 if (rel.fields && rel.fields.length > 0) {
-                    const metaType = `{ ${rel.fields.map((f) => `${f.name}?: ${f.tsType}`).join("; ")} }`;
+                    const metaType = relMetaName(rel);
                     lines.push(`    this._${propName} = this._readIncludedWithMeta<${rel.interfaceName}, ${metaType}>(data, "${relationshipKey}", Modules.${rel.name}) as (${rel.interfaceName} & ${metaType})[];`);
                 }
                 else {
@@ -255,14 +291,19 @@ function generateCreateJsonApiMethod(data) {
         lines.push(`    super.addContentInput(response, data);`);
         lines.push(``);
     }
-    // Field serialization (excluding inherited)
-    const fieldsToInclude = extendsContent
-        ? fields.filter((f) => !["name", "tldr", "abstract"].includes(f.name))
-        : fields;
+    // Field serialization (excluding inherited and read-only fields).
+    // read-only fields are server-derived: present in rehydrate/getters but never sent back.
+    const fieldsToInclude = (extendsContent ? fields.filter((f) => !["name", "tldr", "abstract"].includes(f.name)) : fields).filter((f) => !f.readOnly);
     fieldsToInclude.forEach((field) => {
         if (field.isContentField) {
             lines.push(`    if (data.${field.name} !== undefined) response.data.attributes.${field.name} = JSON.stringify(data.${field.name});`);
         }
+        else if (field.type === "date") {
+            lines.push(`    if (data.${field.name} !== undefined) response.data.attributes.${field.name} = formatLocalDate(data.${field.name});`);
+        }
+        else if (field.type === "datetime") {
+            lines.push(`    if (data.${field.name} !== undefined) response.data.attributes.${field.name} = data.${field.name}.toISOString();`);
+        }
         else {
             lines.push(`    if (data.${field.name} !== undefined) response.data.attributes.${field.name} = data.${field.name};`);
         }
@@ -274,7 +315,7 @@ function generateCreateJsonApiMethod(data) {
         relationshipsToSerialize.forEach((rel) => {
             const effectiveName = rel.alias || rel.variant || rel.name;
             const payloadKey = rel.single ? `${(0, name_transformer_1.toCamelCase)(effectiveName)}Id` : `${(0, name_transformer_1.toCamelCase)(effectiveName)}Ids`;
-            const relationshipKey = (0, name_transformer_1.toCamelCase)(effectiveName);
+            const relationshipKey = (0, relationship_key_1.resolveRelationshipKey)(rel);
             if (rel.single) {
                 lines.push(`    if (data.${payloadKey}) {`);
                 lines.push(`      response.data.relationships.${relationshipKey} = {`);
@@ -294,6 +335,22 @@ function generateCreateJsonApiMethod(data) {
                 lines.push(`      };`);
                 lines.push(`    }`);
             }
+            else if (rel.fields && rel.fields.length > 0) {
+                // MANY relationship with edge fields: per-item meta resolved from a meta array.
+                const metaProp = `${(0, name_transformer_1.toCamelCase)(effectiveName)}Meta`;
+                lines.push(`    if (data.${payloadKey} !== undefined) {`);
+                lines.push(`      response.data.relationships.${relationshipKey} = {`);
+                lines.push(`        data: data.${payloadKey}.map((id) => {`);
+                lines.push(`          const meta = data.${metaProp}?.find((m) => m.id === id);`);
+                lines.push(`          return {`);
+                lines.push(`            type: Modules.${rel.name}.name,`);
+                lines.push(`            id,`);
+                lines.push(`            ...(meta ? { meta: { ${rel.fields.map((f) => `${f.name}: meta.${f.name}`).join(", ")} } } : {}),`);
+                lines.push(`          };`);
+                lines.push(`        }),`);
+                lines.push(`      };`);
+                lines.push(`    }`);
+            }
             else {
                 lines.push(`    if (data.${payloadKey} && data.${payloadKey}.length > 0) {`);
                 lines.push(`      response.data.relationships.${relationshipKey} = {`);