fimo 0.6.0-experimental.1 → 0.6.0-experimental.2

package/assets/content-templates/hooks-template.eta

@@ -11,7 +11,7 @@
 // AUTO-GENERATED ⚠️ – do not edit by hand
 import { <% if (!model.isSingleton) { %>useInfiniteQuery, <% } %>useSuspenseQuery, useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
 <% if (!model.isSingleton) { -%>
-import type { InfiniteData, UseInfiniteQueryResult, UseQueryResult } from "@tanstack/react-query";
+import type { InfiniteData, UseInfiniteQueryResult, UseQueryResult, UseSuspenseQueryResult } from "@tanstack/react-query";
 <% } -%>
 import { FimoString, FimoMedia, FimoBoolean, FimoRichText, useLocale<% if (!model.isSingleton) { %>, parseCollectionResponse<% } %> } from "fimo/ui";
 // @ts-ignore - virtual module provided by Fimo's Vite plugin
@@ -36,16 +36,35 @@ export type { <%= model.pascal %>, <%= model.pascal %>Fields, <%= model.pascal %
  * Wraps raw API data with Fimo types for source tracking
  */
 export function wrapWithSource(entry: Record<string, any>): <%= model.pascal %> {
+<% if (!model.isSingleton) { -%>
+  const documentId = entry.documentId;
+  const locale = entry.locale;
+  const sourcePrefix = `<%= model.pascal %>.v2:${documentId}:${encodeURIComponent(locale)}`;
+<% } else { -%>
   const id = entry.id;
-  const sourcePrefix = `<%= model.pascal %>.${id}`;
+  const documentId = entry.documentId;
+  const locale = entry.locale ?? defaultLocale();
+  const usesV2Identity = typeof id !== "string";
+  const sourcePrefix = usesV2Identity
+    ? `<%= model.pascal %>.v2:${documentId}:${encodeURIComponent(locale)}`
+    : `<%= model.pascal %>.${id}`;
+<% } -%>
   const entryFimo = entry.__fimo && typeof entry.__fimo === "object" ? entry.__fimo : {};
 
   return {
-    id,
-    documentId: entry.documentId,
+<% if (!model.isSingleton) { -%>
+    documentId,
+<% } else { -%>
+    ...(typeof id === "string" ? { id } : {}),
+    documentId,
+<% } -%>
     slug: entry.slug != null ? new FimoString(entry.slug, `${sourcePrefix}.slug`) : entry.slug,
-<% if (model.localized) { -%>
-    locale: entry.locale,
+<% if (!model.isSingleton) { -%>
+    locale,
+<% } else if (model.localized) { -%>
+    locale,
+<% } else { -%>
+    ...(usesV2Identity ? { locale } : {}),
 <% } -%>
     createdAt: entry.createdAt,
     updatedAt: entry.updatedAt,
@@ -101,11 +120,11 @@ if (model.fields) {
         const wrapper = field.target === model.uid ? 'wrapWithSource' : `wrap${field.targetPascal}WithSource`;
         if (field.many) {
 -%>
-    <%= key %>: Array.isArray(entry.<%= key %>) ? entry.<%= key %>.map((value: any) => value != null && typeof value === "object" && typeof value.id === "string" ? <%= wrapper %>(value) : value) : entry.<%= key %>,
+    <%= key %>: Array.isArray(entry.<%= key %>) ? entry.<%= key %>.map((value: any) => isPopulatedEntry(value) ? <%= wrapper %>(value) : value) : entry.<%= key %>,
 <%
         } else {
 -%>
-    <%= key %>: entry.<%= key %> != null && typeof entry.<%= key %> === "object" && typeof entry.<%= key %>.id === "string" ? <%= wrapper %>(entry.<%= key %>) : entry.<%= key %>,
+    <%= key %>: isPopulatedEntry(entry.<%= key %>) ? <%= wrapper %>(entry.<%= key %>) : entry.<%= key %>,
 <%
         }
         break;
@@ -121,6 +140,23 @@ if (model.fields) {
   } as <%= model.pascal %>;
 }
 
+interface PopulatedEntryRecord extends Record<string, unknown> {
+  documentId: string;
+  __fimo: { contentType: string };
+}
+
+function isPopulatedEntry(value: unknown): value is PopulatedEntryRecord {
+  if (value == null || typeof value !== "object") {
+    return false;
+  }
+  const entry = value as Record<string, unknown>;
+  const fimo = entry.__fimo;
+  return typeof entry.documentId === "string"
+    && fimo != null
+    && typeof fimo === "object"
+    && typeof (fimo as Record<string, unknown>).contentType === "string";
+}
+
 <%
 const hasPolymorphicReferences = model.fields && Object.values(model.fields).some((field) => field.type === 'reference' && Array.isArray(field.targetRefs) && field.targetRefs.length > 0);
 if (hasPolymorphicReferences) {
@@ -132,7 +168,9 @@ if (hasPolymorphicReferences) {
  * (unpopulated) values pass through untouched.
  */
 function wrapPolymorphic(value: any, wrappers: Record<string, (entry: Record<string, any>) => any>): any {
-  if (value == null || typeof value !== "object" || typeof value.id !== "string") return value;
+  if (!isPopulatedEntry(value)) {
+    return value;
+  }
   const contentType = value.__fimo && typeof value.__fimo.contentType === "string" ? value.__fimo.contentType : null;
   const wrapper = contentType ? wrappers[contentType] : undefined;
   if (!wrapper) return value;
@@ -172,8 +210,12 @@ function readLocale(
   ownerUsesLocale: boolean,
   fallbackLocale = defaultLocale()
 ): string | undefined {
+<% if (!model.isSingleton) { -%>
+  return options.locale ?? fallbackLocale;
+<% } else { -%>
   const populatesLocalizedTarget = populateFields(options.populate).some((field) => LOCALIZED_REFERENCE_FIELDS.has(field));
   return ownerUsesLocale || populatesLocalizedTarget ? options.locale ?? fallbackLocale : undefined;
+<% } -%>
 }
 
 function fimoHeaders(extra?: Record<string, string>): Record<string, string> {
@@ -249,11 +291,11 @@ export type InfiniteListResult<TItem> = UseInfiniteQueryResult<
   readonly isLoadingMore: boolean;
 };
 
-export async function getById<TPopulate extends <%= model.pascal %>Populate | undefined = undefined>(
-  id: string,
+export async function getByDocumentId<TPopulate extends <%= model.pascal %>Populate | undefined = undefined>(
+  documentId: string,
   options: { locale?: string; populate?: TPopulate; localeFallbacks?: boolean } = {}
 ): Promise<<%= model.pascal %>Result<undefined, TPopulate>> {
-  const res = await fetch(`${base}${withReadOptions(`/entries/<%= model.uid %>/${id}`, options, false)}`, { headers: fimoHeaders() });
+  const res = await fetch(`${base}${withReadOptions(`/v2/entries/<%= model.uid %>/${documentId}`, options)}`, { headers: fimoHeaders() });
   if (!res.ok) throw new Error(await res.text());
   const data = await res.json();
   return wrapWithSource(data.data) as <%= model.pascal %>Result<undefined, TPopulate>;
@@ -263,7 +305,7 @@ export async function getBySlug<TPopulate extends <%= model.pascal %>Populate |
   slug: string,
   options: { locale?: string; populate?: TPopulate; localeFallbacks?: boolean } = {}
 ): Promise<<%= model.pascal %>Result<undefined, TPopulate> | null> {
-  const res = await fetch(`${base}${withReadOptions(`/entries/<%= model.uid %>/slug/${encodeURIComponent(slug)}`, options)}`, { headers: fimoHeaders() });
+  const res = await fetch(`${base}${withReadOptions(`/v2/entries/<%= model.uid %>/slug/${encodeURIComponent(slug)}`, options)}`, { headers: fimoHeaders() });
   if (res.status === 404) return null;
   if (!res.ok) throw new Error(await res.text());
   const data = await res.json();
@@ -275,7 +317,7 @@ export async function getByField<TPopulate extends <%= model.pascal %>Populate |
   value: string,
   options: { locale?: string; populate?: TPopulate; localeFallbacks?: boolean } = {}
 ): Promise<<%= model.pascal %>Result<undefined, TPopulate> | null> {
-  const res = await fetch(`${base}${withReadOptions(`/entries/<%= model.uid %>/field/${encodeURIComponent(fieldName)}/${encodeURIComponent(value)}`, options)}`, { headers: fimoHeaders() });
+  const res = await fetch(`${base}${withReadOptions(`/v2/entries/<%= model.uid %>/field/${encodeURIComponent(fieldName)}/${encodeURIComponent(value)}`, options)}`, { headers: fimoHeaders() });
   if (res.status === 404) return null;
   if (!res.ok) throw new Error(await res.text());
   const data = await res.json();
@@ -321,7 +363,7 @@ export async function list<
   TPopulate extends <%= model.pascal %>Populate | undefined = undefined,
 >(params: <%= model.pascal %>Query<TFields, TPopulate> = {} as <%= model.pascal %>Query<TFields, TPopulate>): Promise<CollectionPage<<%= model.pascal %>Result<TFields, TPopulate>>> {
   const qs = toQueryString(params);
-  const res = await fetch(`${base}/entries/<%= model.uid %>${qs ? "?" + qs : ""}`, { headers: fimoHeaders() });
+  const res = await fetch(`${base}/v2/entries/<%= model.uid %>${qs ? "?" + qs : ""}`, { headers: fimoHeaders() });
   if (!res.ok) throw new Error(await res.text());
   const data = parseCollectionResponse(await res.json());
   const items = data.data.map(wrapWithSource) as <%= model.pascal %>Result<TFields, TPopulate>[];
@@ -343,7 +385,7 @@ export async function get<
 }
 
 export async function create(payload: <%= model.pascal %>Input): Promise<<%= model.pascal %>> {
-  const res = await fetch(`${base}/entries/<%= model.uid %>`, {
+  const res = await fetch(`${base}/v2/entries/<%= model.uid %>`, {
     method: "POST",
     headers: fimoHeaders({ "Content-Type": "application/json" }),
     body: JSON.stringify(splitWritePayload(payload))
@@ -353,19 +395,22 @@ export async function create(payload: <%= model.pascal %>Input): Promise<<%= mod
   return wrapWithSource(data.data);
 }
 
-export async function update(id: string, payload: Partial<<%= model.pascal %>Input>): Promise<<%= model.pascal %>> {
-  const res = await fetch(`${base}/entries/<%= model.uid %>/${id}`, {
+export async function update(documentId: string, payload: Partial<<%= model.pascal %>Input>): Promise<<%= model.pascal %>> {
+  const write = splitWritePayload(payload) as { data: Record<string, unknown>; locale?: string };
+  const url = withReadOptions(`/v2/entries/<%= model.uid %>/${documentId}`, { locale: write.locale });
+  const res = await fetch(`${base}${url}`, {
     method: "PUT",
     headers: fimoHeaders({ "Content-Type": "application/json" }),
-    body: JSON.stringify(splitWritePayload(payload))
+    body: JSON.stringify({ data: write.data })
   });
   if (!res.ok) throw new Error(await res.text());
   const data = await res.json();
   return wrapWithSource(data.data);
 }
 
-export async function remove(id: string): Promise<void> {
-  const res = await fetch(`${base}/entries/<%= model.uid %>/${id}`, { method: "DELETE", headers: fimoHeaders() });
+export async function remove(documentId: string, options: { locale?: string } = {}): Promise<void> {
+  const url = withReadOptions(`/v2/entries/<%= model.uid %>/${documentId}`, options);
+  const res = await fetch(`${base}${url}`, { method: "DELETE", headers: fimoHeaders() });
   if (!res.ok) throw new Error(await res.text());
 }
 <% } else { -%>
@@ -399,7 +444,7 @@ export async function update(payload: Partial<<%= model.pascal %>Input>): Promis
 <% if (!model.isSingleton) { -%>
 const qk = {
   root       : ["<%= model.pascal %>"] as const,
-  byId       : <TPopulate extends <%= model.pascal %>Populate | undefined = undefined>(id: string, options: { locale?: string; populate?: TPopulate; localeFallbacks?: boolean } = {}) => ["<%= model.pascal %>", id, options.locale, options.populate] as const,
+  byDocumentId: <TPopulate extends <%= model.pascal %>Populate | undefined = undefined>(documentId: string, options: { locale?: string; populate?: TPopulate; localeFallbacks?: boolean } = {}) => ["<%= model.pascal %>", "document", documentId, options.locale, options.populate] as const,
   bySlug     : <TPopulate extends <%= model.pascal %>Populate | undefined = undefined>(slug: string, options: { locale?: string; populate?: TPopulate; localeFallbacks?: boolean } = {}) => ["<%= model.pascal %>", "slug", slug, options.locale, options.populate] as const,
   byField    : <TPopulate extends <%= model.pascal %>Populate | undefined = undefined>(field: string, value: string, options: { locale?: string; populate?: TPopulate; localeFallbacks?: boolean } = {}) => ["<%= model.pascal %>", field, value, options.locale, options.populate] as const,
   list       : (params: <%= model.pascal %>Query) => ["<%= model.pascal %>", params] as const,
@@ -409,10 +454,10 @@ const qk = {
   >(params: InfiniteListQuery<TFields, TPopulate>) => ["<%= model.pascal %>", "infinite", params] as const
 };
 
-export function useGetById<TPopulate extends <%= model.pascal %>Populate | undefined = undefined>(id: string, options: { locale?: string; populate?: TPopulate; localeFallbacks?: boolean } = {}) {
-  const locale = readLocale(options, false, useQueryLocale(options.locale));
+export function useGetByDocumentId<TPopulate extends <%= model.pascal %>Populate | undefined = undefined>(documentId: string, options: { locale?: string; populate?: TPopulate; localeFallbacks?: boolean } = {}): UseQueryResult<<%= model.pascal %>Result<undefined, TPopulate>, Error> {
+  const locale = useQueryLocale(options.locale);
   const localizedOptions = { ...options, locale };
-  return useQuery<<%= model.pascal %>Result<undefined, TPopulate>, Error>({ queryKey: qk.byId(id, localizedOptions), queryFn: () => getById(id, localizedOptions) });
+  return useQuery<<%= model.pascal %>Result<undefined, TPopulate>, Error>({ queryKey: qk.byDocumentId(documentId, localizedOptions), queryFn: () => getByDocumentId(documentId, localizedOptions) });
 }
 
 export function useGetBySlug<TPopulate extends <%= model.pascal %>Populate | undefined = undefined>(slug: string, options: { locale?: string; populate?: TPopulate; localeFallbacks?: boolean } = {}) {
@@ -475,10 +520,10 @@ export function useInfiniteList<
   };
 }
 
-export function useSuspenseGetById<TPopulate extends <%= model.pascal %>Populate | undefined = undefined>(id: string, options: { locale?: string; populate?: TPopulate; localeFallbacks?: boolean } = {}) {
-  const locale = readLocale(options, false, useQueryLocale(options.locale));
+export function useSuspenseGetByDocumentId<TPopulate extends <%= model.pascal %>Populate | undefined = undefined>(documentId: string, options: { locale?: string; populate?: TPopulate; localeFallbacks?: boolean } = {}): UseSuspenseQueryResult<<%= model.pascal %>Result<undefined, TPopulate>, Error> {
+  const locale = useQueryLocale(options.locale);
   const localizedOptions = { ...options, locale };
-  return useSuspenseQuery<<%= model.pascal %>Result<undefined, TPopulate>, Error>({ queryKey: qk.byId(id, localizedOptions), queryFn: () => getById(id, localizedOptions) });
+  return useSuspenseQuery<<%= model.pascal %>Result<undefined, TPopulate>, Error>({ queryKey: qk.byDocumentId(documentId, localizedOptions), queryFn: () => getByDocumentId(documentId, localizedOptions) });
 }
 
 export function useSuspenseGetBySlug<TPopulate extends <%= model.pascal %>Populate | undefined = undefined>(slug: string, options: { locale?: string; populate?: TPopulate; localeFallbacks?: boolean } = {}) {
@@ -516,22 +561,22 @@ export function useCreate() {
 
 export function useUpdate() {
   const qc = useQueryClient();
-  return useMutation<<%= model.pascal %>, Error, { id: string } & Partial<<%= model.pascal %>Input>>({
-    mutationFn   : ({ id, ...patch }) => update(id, patch),
+  return useMutation<<%= model.pascal %>, Error, { documentId: string; locale?: string } & Partial<<%= model.pascal %>Input>>({
+    mutationFn   : ({ documentId, ...patch }) => update(documentId, patch),
     onSuccess    : (_data, vars) => {
       qc.invalidateQueries({ queryKey: qk.root });
-      qc.invalidateQueries({ queryKey: qk.byId(vars.id) });
+      qc.invalidateQueries({ queryKey: qk.byDocumentId(vars.documentId, { locale: vars.locale ?? defaultLocale() }) });
     }
   });
 }
 
 export function useRemove() {
   const qc = useQueryClient();
-  return useMutation<void, Error, string>({
-    mutationFn   : remove,
-    onSuccess    : (_data, id) => {
+  return useMutation<void, Error, { documentId: string; locale?: string }>({
+    mutationFn   : ({ documentId, locale }) => remove(documentId, { locale }),
+    onSuccess    : (_data, { documentId, locale }) => {
       qc.invalidateQueries({ queryKey: qk.root });
-      qc.removeQueries({ queryKey: ["<%= model.pascal %>", id], exact: false });
+      qc.removeQueries({ queryKey: qk.byDocumentId(documentId, { locale: locale ?? defaultLocale() }), exact: false });
     }
   });
 }
@@ -569,7 +614,7 @@ export function useUpdate() {
 export default {
 <% if (!model.isSingleton) { -%>
   /* async helpers */
-  getById,
+  getByDocumentId,
   getBySlug,
   getByField,
   list,
@@ -579,13 +624,13 @@ export default {
   remove,
 
   /* hooks */
-  useGetById,
+  useGetByDocumentId,
   useGetBySlug,
   useGetByField,
   useList,
   useInfiniteList,
   useGet,
-  useSuspenseGetById,
+  useSuspenseGetByDocumentId,
   useSuspenseGet,
   useSuspenseGetByField,
   useSuspenseGetBySlug,

package/assets/content-templates/types-template.eta

@@ -32,11 +32,15 @@ export interface <%= model.pascal %>FimoMeta {
 }
 
 export interface <%= model.pascal %> extends WithReferences<<%= model.pascal %>References> {
-  id: string;
+<% if (model.isSingleton) { -%>
+  id?: string;
+<% } -%>
   documentId: string;
   slug: FimoString;
-<% if (model.localized) { -%>
+<% if (!model.isSingleton || model.localized) { -%>
   locale: string;
+<% } else { -%>
+  locale?: string;
 <% } -%>
   createdAt: string;
   updatedAt: string;

package/assets/skills/fimo/references/content.md

@@ -191,10 +191,9 @@ Import from the public schema module, e.g. `import BlogPost from '@/schemas/Blog
 
 ```ts
 interface BlogPost {
-  id: string;
   documentId: string;
   slug: FimoString;
-  locale: string; // localized schemas only; omitted when i18n.enabled is false
+  locale: string;
   createdAt: string;
   updatedAt: string;
   __fimo: {
@@ -219,7 +218,7 @@ When a project has multiple configured locales, create and update each localized
 
 For shared content, set `i18n: { "enabled": false }` on the schema and create each entry once. Shared entries:
 
-- have no public `locale` property;
+- expose the effective request locale in collection v2 responses;
 - are returned in every locale context without duplication;
 - ignore locale on owner reads and writes;
 - still use the active/requested locale when a populated reference targets a localized schema.
@@ -247,17 +246,17 @@ Filtering on polymorphic fields is not supported yet.
 
 ```ts
 // low-level fetch helpers
-getById<TPopulate extends BlogPostPopulate | undefined>(id: string, options?: { populate?: TPopulate }): Promise<BlogPostResult<undefined, TPopulate>>
+getByDocumentId<TPopulate extends BlogPostPopulate | undefined>(documentId: string, options?: { locale?: string; populate?: TPopulate }): Promise<BlogPostResult<undefined, TPopulate>>
 getBySlug<TPopulate extends BlogPostPopulate | undefined>(slug: string, options?: { populate?: TPopulate }): Promise<BlogPostResult<undefined, TPopulate> | null>
 getByField<TPopulate extends BlogPostPopulate | undefined>(fieldName: string, value: string, options?: { populate?: TPopulate }): Promise<BlogPostResult<undefined, TPopulate> | null>
 list<TFields extends BlogPostFields | undefined, TPopulate extends BlogPostPopulate | undefined>(params?: BlogPostQuery<TFields, TPopulate>): Promise<CollectionPage<BlogPostResult<TFields, TPopulate>>>
 get<TFields extends BlogPostFields | undefined, TPopulate extends BlogPostPopulate | undefined>(params?: BlogPostQuery<TFields, TPopulate>): Promise<BlogPostResult<TFields, TPopulate>[]>
 create(payload: BlogPostInput): Promise<BlogPost>
-update(id: string, payload: Partial<BlogPostInput>): Promise<BlogPost>
-remove(id: string): Promise<void>
+update(documentId: string, payload: Partial<BlogPostInput>): Promise<BlogPost>
+remove(documentId: string, options?: { locale?: string }): Promise<void>
 
 // react-query hooks
-useGetById(id, { populate? })     // → { data: BlogPostResult<undefined, TPopulate> | undefined, isLoading, ... }
+useGetByDocumentId(documentId, { locale?, populate? }) // → { data: BlogPostResult<undefined, TPopulate> | undefined, isLoading, ... }
 useGetBySlug(slug, { populate? }) // → { data: BlogPostResult<undefined, TPopulate> | null | undefined, ... } — ideal for /:slug detail routes
 useGetByField(fieldName, value, { populate? })
 useList<TFields, TPopulate>(params?)         // → { data: CollectionPage<BlogPostResult<TFields, TPopulate>> | undefined, ... }
@@ -266,7 +265,7 @@ useGet<TFields, TPopulate>(params?)          // → legacy array-shaped { data:
 useCreate() / useUpdate() / useRemove()
 
 // Suspense variants (same signatures, throw to a <Suspense> boundary instead of returning isLoading)
-useSuspenseGetById(id) / useSuspenseGetBySlug(slug) / useSuspenseGetByField(fieldName, value) / useSuspenseGet(params?)
+useSuspenseGetByDocumentId(documentId) / useSuspenseGetBySlug(slug) / useSuspenseGetByField(fieldName, value) / useSuspenseGet(params?)
 ```
 
 Write inputs contain plain JSON values. Read models contain Fimo wrapper values for source tracking, so use `BlogPostInput` rather than sending a `BlogPost` back to `create` or `update`.
@@ -279,7 +278,7 @@ update(payload: Partial<SettingsInput>): Promise<Settings>
 useGet(options?) / useSuspenseGet(options?) / useUpdate()
 ```
 
-Singleton clients do not expose `create`, `remove`, `getById`, or list queries. Localized singletons have one variant per locale; non-localized singletons have one locale-free row.
+Singleton clients do not expose `create`, `remove`, `getByDocumentId`, or list queries. Localized singletons have one variant per locale; non-localized singletons have one locale-free row.
 
 Choose the collection interface from the UI behavior. Use `useList` when the UI controls a page, and read pagination state from `pageInfo`:
 
@@ -338,7 +337,7 @@ Operators: scalar equality, `$eq`, `$ne`, `$gt`, `$gte`, `$lt`, `$lte`, `$in`, `
 Reference field values are reference objects, but reference filters use the target `documentId` string, for example `where: { author: "750e..." }`; for to-many references that means "contains this target document".
 For to-many references, `$eq` and `$contains` mean membership, `$in` means any listed document is present, `$ne` and `$nin` mean none are present, and `$null: true` means empty or missing. Reference fields cannot be sorted.
 
-Use `fields` to keep list payloads small. The API always keeps `id`, and returns only the requested fields beyond that:
+Use `fields` to keep list payloads small. The v2 API always keeps `documentId` and `locale`, and returns only the requested fields beyond that:
 
 ```tsx
 const { data: summaries = [] } = BlogPost.useGet({
@@ -346,7 +345,7 @@ const { data: summaries = [] } = BlogPost.useGet({
   sort: '-publishedAt',
   limit: 12,
 });
-// summaries: Array<Pick<BlogPost, 'id' | 'slug' | 'title' | 'excerpt' | 'coverImage'>>
+// summaries: Array<Pick<BlogPost, 'documentId' | 'locale' | 'slug' | 'title' | 'excerpt' | 'coverImage'>>
 ```
 
 Use `populate` to embed reference targets in read results:
@@ -434,7 +433,7 @@ export function BlogList() {
   return (
     <ul>
       {page.items.map((post) => (
-        <li key={post.id}>
+        <li key={`${post.documentId}:${post.locale}`}>
           <Text value={post.title} as="h2" />
           <Image value={post.coverImage} width={800} height={400} fit="cover" />
           <RichText value={post.body} className="prose" />
@@ -451,9 +450,9 @@ For the `<Text>` / `<RichText>` / `<Image>` / `<Date>` components and the rules
 ## Read path (published app, no auth)
 
 ```ts
-const res = await fetch(`${import.meta.env.VITE_API_URL}/entries/<typeName>?fields=slug,title&limit=12`);
+const res = await fetch(`${import.meta.env.VITE_API_URL}/v2/entries/<typeName>?locale=en&fields=slug,title&limit=12`);
 const { data, meta } = await res.json();
-// data: Entry[] — fields flattened at top level (id, slug, title, ...)
+// data: Entry[] — fields flattened at top level (documentId, locale, slug, title, ...)
 // meta: { limit, offset, total, hasMore }
 ```
 

package/assets/skills/fimo/references/setup-react-router.md

@@ -6,7 +6,7 @@ existing RR project.
 
 ## Prerequisites
 
-- Node 20+
+- Node 22.22+
 - A Fimo project created via `fimo init` (gives you `projectId`,
   `organizationId`, and an `apiUrl`).
 

package/assets/skills/fimo-cli/references/content.md

@@ -43,9 +43,9 @@ fimo entries create <TypeName> --body '<json>'
 fimo entries create <TypeName> --locale es --document-id <documentId> --body '<json>'
 fimo entries list <TypeName> [--limit N] [--offset N] [--search Q] [--where JSON] [--sort F] [--fields FIELDS] [--populate FIELDS]
 fimo entries list <TypeName> --locale es
-fimo entries get <TypeName> <id>
-fimo entries update <TypeName> <id> --locale es --body '<json>'
-fimo entries delete <TypeName> <id>
+fimo entries get <TypeName> <documentId> --locale es
+fimo entries update <TypeName> <documentId> --locale es --body '<json>'
+fimo entries delete <TypeName> <documentId> --locale es
 ```
 
 `--body` is a **required** option on `create` and `update`. Its JSON shape (where `slug` goes, how `media` fields look, Tiptap richtext format) lives in `fimo/references/content.md`. **Always read that first before constructing an entry payload — slug must be inside `data`, media has a specific shape, richtext must be Tiptap JSONContent.**
@@ -66,7 +66,7 @@ Use the canonical read query flags: `--search`, `--sort`, `--where`, `--limit`,
 `--where` is a JSON object keyed by schema field name. Simple values mean equality and stay typed inside the JSON (`{"featured":true}`, `{"category":"react"}`, `{"rank":{"$gte":3}}`); operator objects support `$eq`, `$ne`, `$gt`, `$gte`, `$lt`, `$lte`, `$in`, `$nin`, `$contains`, `$startsWith`, and `$null`, subject to the field type. Public Fimo-owned metadata lives under `__fimo`; currently `__fimo.contentType` is filterable.
 
 Reference filters take the target `documentId` string even though stored values are objects (`{"author":"750e..."}`). On a to-many field, `$eq` and `$contains` mean membership, `$in` means any listed document is present, `$ne` and `$nin` mean none are present, and `$null: true` means empty or missing. Reference fields cannot be sorted; use `--sort field` / `--sort -field` on scalar fields.
-`--fields` is a comma-separated projection for list payloads. The API always keeps `id`; pass only the fields your view needs, such as `slug,title,excerpt,coverImage`.
+`--fields` is a comma-separated projection for list payloads. The v2 API always keeps `documentId` and `locale`; pass only the other fields your view needs, such as `slug,title,excerpt,coverImage`.
 
 `--populate` is a comma-separated list of reference fields to embed. Without it, reference fields return reference objects like `{ "documentId": "..." }`; with `--populate author,contributors`, those fields return the target entry objects for the requested locale. Only reference fields can be populated (scalar fields 400), and populate never selects which target fields come back. A populated target missing in the requested locale resolves to null unless you pass `localeFallbacks=true`, which falls back to the best available locale variant, marked by its `locale` field. Limits: 200 references per to-many write, 500 distinct populated documents per field per request (400 past either).
 
@@ -95,11 +95,11 @@ Do not add `localized` or field-level `i18n` to reference fields. The reference
 
 ## Localized and shared content
 
-Schemas are localized by default. Omit `--locale` for default-locale entries. Pass `--locale <locale>` when creating, listing, reading, or updating a specific non-default locale.
+Schemas are localized by default. Omit `--locale` for default-locale creates and lists. `entries get`, `entries update`, and `entries delete` require `--locale` because collection entry identity is always `documentId + locale`.
 
 When creating a localized variant of an existing entry, pass the source entry's `documentId` with `--document-id`. Keep projects single-locale unless the user asks for multilingual or localized output; when multiple locales are configured, create and update every locale explicitly.
 
-For content shared across locales, define `"i18n": { "enabled": false }` at the schema root and create each entry once. Do not pass `--document-id` to manufacture locale variants. Shared entry responses omit `locale`; a read locale is only used to resolve populated references that target localized schemas. No other `i18n` options and no field-level localization settings are supported.
+For content shared across locales, define `"i18n": { "enabled": false }` at the schema root and create each entry once. Do not pass `--document-id` to manufacture locale variants. V2 shared entry responses expose the effective request locale even though storage still has one locale-free row. No other `i18n` options and no field-level localization settings are supported.
 
 Use `"isSingleton": true` for a type with exactly one logical document. Generated singleton clients expose `get`/`update` and their React Query hooks, not collection create/remove APIs.
 

package/dist/cli/bundle.json

@@ -1,7 +1,7 @@
 {
   "bundled": true,
   "bundler": "esbuild",
-  "bundledAt": "2026-07-14T13:44:49.449Z",
+  "bundledAt": "2026-07-14T21:53:17.245Z",
   "cliVersion": "0.5.0",
   "external": [
     "oxc-parser",

package/dist/cli/index.js

@@ -20634,33 +20634,39 @@ var init_api = __esm({
       // ── Tenant API: Entries ──
       async listEntries(projectId, typeName, params) {
         const query = params ? `?${new URLSearchParams(params).toString()}` : "";
-        return this.request(this.tenantPath(projectId, `/entries/${typeName}${query}`));
+        return this.request(this.tenantPath(projectId, `/v2/entries/${typeName}${query}`));
       }
-      async getEntry(projectId, typeName, id, params) {
-        const query = params ? `?${new URLSearchParams(params).toString()}` : "";
+      async getEntry(projectId, typeName, documentId, locale) {
+        const query = new URLSearchParams({ locale }).toString();
         const body = await this.request(
-          this.tenantPath(projectId, `/entries/${typeName}/${id}${query}`)
+          this.tenantPath(projectId, `/v2/entries/${typeName}/${documentId}?${query}`)
         );
         return body.data;
       }
       async createEntry(projectId, typeName, data2) {
-        const body = await this.request(this.tenantPath(projectId, `/entries/${typeName}`), {
+        const body = await this.request(this.tenantPath(projectId, `/v2/entries/${typeName}`), {
           method: "POST",
           body: JSON.stringify(data2)
         });
         return body.data;
       }
-      async updateEntry(projectId, typeName, id, data2) {
-        const body = await this.request(this.tenantPath(projectId, `/entries/${typeName}/${id}`), {
-          method: "PUT",
-          body: JSON.stringify(data2)
-        });
+      async updateEntry(projectId, typeName, documentId, locale, data2) {
+        const query = new URLSearchParams({ locale }).toString();
+        const body = await this.request(
+          this.tenantPath(projectId, `/v2/entries/${typeName}/${documentId}?${query}`),
+          {
+            method: "PUT",
+            body: JSON.stringify(data2)
+          }
+        );
         return body.data;
       }
-      async deleteEntry(projectId, typeName, id) {
-        const body = await this.request(this.tenantPath(projectId, `/entries/${typeName}/${id}`), {
-          method: "DELETE"
-        });
+      async deleteEntry(projectId, typeName, documentId, locale) {
+        const query = new URLSearchParams({ locale }).toString();
+        const body = await this.request(
+          this.tenantPath(projectId, `/v2/entries/${typeName}/${documentId}?${query}`),
+          { method: "DELETE" }
+        );
         return body.data;
       }
       // ── Tenant API: Assets ──
@@ -44407,7 +44413,7 @@ var init_payment_method_dto = __esm({
 });
 
 // ../../packages/api-contracts/dist/esm/dtos/content.dto.js
-var FieldDefinitionSchema, ContentTypeI18nSchema, ContentTypeDTOSchema, ContentTypeDTO, SchemaDTOSchema, SchemaDTO, EntryDTOSchema, EntryDTO, PaginatedEntriesDTOSchema, PaginatedEntriesDTO, EntryCountDTOSchema, EntryCountDTO, EntryCountsDTOSchema, EntryCountsDTO, ContentTypeResponseSchema, ContentTypeListResponseSchema, SchemaResponseSchema, EntryResponseSchema, EntryListResponseSchema;
+var FieldDefinitionSchema, ContentTypeI18nSchema, ContentTypeDTOSchema, ContentTypeDTO, SchemaDTOSchema, SchemaDTO, EntryDTOSchema, EntryDTO, EntryV2DTOSchema, EntryV2DTO, PaginatedEntriesDTOSchema, PaginatedEntriesDTO, PaginatedEntriesV2DTOSchema, PaginatedEntriesV2DTO, EntryCountDTOSchema, EntryCountDTO, EntryCountsDTOSchema, EntryCountsDTO, ContentTypeResponseSchema, ContentTypeListResponseSchema, SchemaResponseSchema, EntryResponseSchema, EntryV2ResponseSchema, EntryListResponseSchema, EntryV2ListResponseSchema;
 var init_content_dto = __esm({
   "../../packages/api-contracts/dist/esm/dtos/content.dto.js"() {
     "use strict";
@@ -44449,6 +44455,18 @@ var init_content_dto = __esm({
       })
     }).passthrough();
     EntryDTO = createDTO(EntryDTOSchema);
+    EntryV2DTOSchema = external_exports.object({
+      id: external_exports.never().optional(),
+      documentId: external_exports.string(),
+      slug: external_exports.string(),
+      locale: external_exports.string(),
+      createdAt: external_exports.string(),
+      updatedAt: external_exports.string(),
+      __fimo: external_exports.object({
+        contentType: external_exports.string()
+      })
+    }).passthrough();
+    EntryV2DTO = createDTO(EntryV2DTOSchema);
     PaginatedEntriesDTOSchema = external_exports.object({
       data: external_exports.array(EntryDTOSchema),
       meta: external_exports.object({
@@ -44459,6 +44477,10 @@ var init_content_dto = __esm({
       })
     });
     PaginatedEntriesDTO = createDTO(PaginatedEntriesDTOSchema);
+    PaginatedEntriesV2DTOSchema = PaginatedEntriesDTOSchema.extend({
+      data: external_exports.array(EntryV2DTOSchema)
+    });
+    PaginatedEntriesV2DTO = createDTO(PaginatedEntriesV2DTOSchema);
     EntryCountDTOSchema = external_exports.object({
       contentType: external_exports.string(),
       count: external_exports.number()
@@ -44472,7 +44494,9 @@ var init_content_dto = __esm({
     ContentTypeListResponseSchema = createResponseSchema(external_exports.array(ContentTypeDTOSchema));
     SchemaResponseSchema = createResponseSchema(SchemaDTOSchema);
     EntryResponseSchema = createResponseSchema(EntryDTOSchema);
+    EntryV2ResponseSchema = createResponseSchema(EntryV2DTOSchema);
     EntryListResponseSchema = createResponseSchema(external_exports.array(EntryDTOSchema));
+    EntryV2ListResponseSchema = createResponseSchema(external_exports.array(EntryV2DTOSchema));
   }
 });
 
@@ -48789,13 +48813,15 @@ function isCommandAvailable(command) {
   const result = spawnSync(probe, [command], { stdio: "ignore" });
   return result.status === 0;
 }
-async function resolveOrganization(api, explicit) {
+async function resolveOrganization(api, explicit, options = {}) {
   if (explicit) {
     return explicit;
   }
   const creds = readCredentials();
-  if (creds?.activeOrganization?.id) {
-    return creds.activeOrganization.id;
+  const activeOrganizationId = creds?.activeOrganization?.id;
+  const nonInteractive2 = options.nonInteractive ?? (currentMode().format === "json" || !isInteractive());
+  if (nonInteractive2 && activeOrganizationId) {
+    return activeOrganizationId;
   }
   let orgs2;
   try {
@@ -48810,7 +48836,30 @@ async function resolveOrganization(api, explicit) {
   if (orgs2.length === 0) {
     throw new ScaffoldError("NO_ORGANIZATIONS", "No organization found for this account.");
   }
-  return orgs2[0].id;
+  if (orgs2.length === 1) {
+    return orgs2[0].id;
+  }
+  if (nonInteractive2) {
+    throw new ScaffoldError(
+      "ORGANIZATION_REQUIRED",
+      "Several organizations are available and no active organization is configured.",
+      "Pass --org <organizationId>, or run `fimo orgs switch --org <id-or-slug>` first."
+    );
+  }
+  const currentId = orgs2.some((organization) => organization.id === activeOrganizationId) ? activeOrganizationId : void 0;
+  const selected = await _t({
+    message: "Select an organization for this project",
+    initialValue: currentId,
+    options: orgs2.map((organization) => ({
+      value: organization.id,
+      label: organization.name,
+      hint: organization.id === currentId ? "current" : organization.slug
+    }))
+  });
+  if (q(selected)) {
+    throw new ScaffoldError("ORGANIZATION_SELECTION_CANCELLED", "Organization selection cancelled.");
+  }
+  return selected;
 }
 var execFileAsync7, MAIN_BRANCH, ScaffoldError;
 var init_scaffold_project = __esm({
@@ -48824,6 +48873,7 @@ var init_scaffold_project = __esm({
     init_auth_errors();
     init_git_credential_setup();
     init_git();
+    init_interactive();
     init_local_project_files();
     init_scaffold();
     init_skills();
@@ -49048,6 +49098,7 @@ async function planInit(args) {
   let projectId;
   let targetDir;
   let displayName;
+  const derived = { ...options };
   if (useExisting) {
     projectId = options.projectId ?? await selectProjectId({
       api,
@@ -49075,8 +49126,27 @@ async function planInit(args) {
       });
       return null;
     }
+    try {
+      derived.org = await resolveOrganization(api, options.org, {
+        nonInteractive: nonInteractive(options)
+      });
+    } catch (error45) {
+      if (error45 instanceof ScaffoldError && error45.code === "ORGANIZATION_SELECTION_CANCELLED") {
+        ui.info({ command: "init", message: "Cancelled." });
+        return null;
+      }
+      if (error45 instanceof ScaffoldError) {
+        ui.error({
+          command: "init",
+          code: error45.code,
+          message: error45.message,
+          hint: error45.hint
+        });
+        return null;
+      }
+      throw error45;
+    }
   }
-  const derived = { ...options };
   const gatherAgents = !nonInteractive(options) && (!useExisting || options.skills !== false);
   if (gatherAgents) {
     let agents;
@@ -106306,11 +106376,10 @@ async function entriesListCommand(typeName, options, cmd) {
   ui.result({ command: "entries list", data: result, render: /* @__PURE__ */ __name(() => renderPrettyJson5(result), "render") });
 }
 __name(entriesListCommand, "entriesListCommand");
-async function entriesGetCommand(typeName, id, options, cmd) {
+async function entriesGetCommand(typeName, documentId, options, cmd) {
   const { ctx, api } = await bootstrapProjectCommand(options, cmd);
   await requireOperation("cms.get", { projectId: ctx.projectId, env: ctx.env });
-  const params = options.locale ? { locale: options.locale } : void 0;
-  const result = await api.getEntry(ctx.projectId, typeName, id, params);
+  const result = await api.getEntry(ctx.projectId, typeName, documentId, options.locale);
   ui.result({ command: "entries get", data: result, render: /* @__PURE__ */ __name(() => renderPrettyJson5(result), "render") });
 }
 __name(entriesGetCommand, "entriesGetCommand");
@@ -106325,21 +106394,18 @@ async function entriesCreateCommand(typeName, options, cmd) {
   ui.result({ command: "entries create", data: result, render: /* @__PURE__ */ __name(() => renderPrettyJson5(result), "render") });
 }
 __name(entriesCreateCommand, "entriesCreateCommand");
-async function entriesUpdateCommand(typeName, id, options, cmd) {
+async function entriesUpdateCommand(typeName, documentId, options, cmd) {
   const { ctx, api } = await bootstrapProjectCommand(options, cmd, { refuseReadOnly: true });
   await requireOperation("cms.update", { projectId: ctx.projectId, env: ctx.env });
-  const data2 = addDefinedMetadata(parseJsonObject(options.body), {
-    locale: options.locale,
-    documentId: options.documentId
-  });
-  const result = await api.updateEntry(ctx.projectId, typeName, id, data2);
+  const data2 = parseJsonObject(options.body);
+  const result = await api.updateEntry(ctx.projectId, typeName, documentId, options.locale, data2);
   ui.result({ command: "entries update", data: result, render: /* @__PURE__ */ __name(() => renderPrettyJson5(result), "render") });
 }
 __name(entriesUpdateCommand, "entriesUpdateCommand");
-async function entriesDeleteCommand(typeName, id, options, cmd) {
+async function entriesDeleteCommand(typeName, documentId, options, cmd) {
   const { ctx, api } = await bootstrapProjectCommand(options, cmd, { refuseReadOnly: true });
   await requireOperation("cms.delete", { projectId: ctx.projectId, env: ctx.env });
-  const result = await api.deleteEntry(ctx.projectId, typeName, id);
+  const result = await api.deleteEntry(ctx.projectId, typeName, documentId, options.locale);
   ui.result({ command: "entries delete", data: result, render: /* @__PURE__ */ __name(() => renderPrettyJson5(result), "render") });
 }
 __name(entriesDeleteCommand, "entriesDeleteCommand");
@@ -110175,7 +110241,7 @@ registerChannelsCommands(program);
 registerSchedulesCommands(program);
 program.command("invite").description("Invite a user to an organization or project").option("--target <target>", "Invite target: organization or project").option("--org <organizationId>", "Organization ID (defaults to active when needed)").option("--project <projectId>", "Project ID (defaults to the current project when available)").option("--email <email>", "Email address of the user to invite").option("--role <role>", "Role or access level to grant").option("-C, --cwd <dir>", "Project directory used to resolve the current project").option("-y, --yes", "Skip the confirmation prompt").option("--resend", "Resend an existing pending organization invite").action(inviteCommand);
 program.command("clone").description("Clone an existing Fimo project locally").argument("[projectId]", "Project ID to clone").argument("[dir]", "Target directory (defaults to the project name)").option("--env <name>", "Env to clone (defaults to main)").action(cloneCommand);
-program.command("init").description("Set up a Fimo project locally: sign in, create or link a project, install deps and skills").argument("[dir]", "Target directory").option("--project-id <id>", "Link an existing project instead of creating a new one").option("--org <organizationId>", "Target organization ID when creating (auto if you belong to one)").option("--env <name>", "Env to check out when linking an existing project (defaults to main)").option("--template-root <path>", "Override template directory when creating").option("--package-manager <pm>", "Install dependencies with: npm | pnpm | yarn | bun").option("--install", "Install dependencies after checkout").option("--no-install", "Skip dependency installation after checkout").option("--skills", "Set up Fimo skills for your AI coding agents").option("--no-skills", "Skip setting up Fimo skills").option(
+program.command("init").description("Set up a Fimo project locally: sign in, create or link a project, install deps and skills").argument("[dir]", "Target directory").option("--project-id <id>", "Link an existing project instead of creating a new one").option("--org <organizationId>", "Target organization ID when creating (recommended for agents and CI)").option("--env <name>", "Env to check out when linking an existing project (defaults to main)").option("--template-root <path>", "Override template directory when creating").option("--package-manager <pm>", "Install dependencies with: npm | pnpm | yarn | bun").option("--install", "Install dependencies after checkout").option("--no-install", "Skip dependency installation after checkout").option("--skills", "Set up Fimo skills for your AI coding agents").option("--no-skills", "Skip setting up Fimo skills").option(
   "--agents <list>",
   'Comma-separated list of AI agents to set up project rules for (e.g. claude-code,cursor). Pass "none" to skip per-agent variants.'
 ).option(
@@ -110292,10 +110358,10 @@ schemas2.command("push").description("Push schema JSON files to the API (create
 schemas2.command("delete").description("Delete a schema by type name").argument("<typeName>", "Content type name").option("-C, --cwd <dir>", "Project directory").action(schemaDeleteCommand);
 var entries = program.command("entries").description("Manage content entries");
 entries.command("list").description("List entries of a content type").argument("<typeName>", "Content type name").option("-C, --cwd <dir>", "Project directory").option("--limit <n>", "Max entries to return").option("--offset <n>", "Offset for pagination").option("--search <query>", "Search query").option("--where <json>", `JSON filter object, e.g. '{"featured":true}'`).option("--sort <field>", "Sort field, prefix with - for descending").option("--fields <fields>", "Comma-separated fields to return, e.g. slug,title,excerpt").option("--populate <fields>", "Comma-separated reference fields to populate, e.g. author,contributors").option("--locale <locale>", "Locale to list (default en)").option("--sort-by <field>", "Sort field").option("--sort-direction <dir>", "Sort direction (asc|desc)").action(entriesListCommand);
-entries.command("get").description("Get a single entry").argument("<typeName>", "Content type name").argument("<id>", "Entry ID").option("-C, --cwd <dir>", "Project directory").option("--locale <locale>", "Locale to read (default en)").action(entriesGetCommand);
+entries.command("get").description("Get a single entry").argument("<typeName>", "Content type name").argument("<documentId>", "Document ID").option("-C, --cwd <dir>", "Project directory").requiredOption("--locale <locale>", "Entry locale").action(entriesGetCommand);
 entries.command("create").description("Create a new entry").argument("<typeName>", "Content type name").option("-C, --cwd <dir>", "Project directory").requiredOption("--body <json>", "Entry JSON body (slug + data)").option("--locale <locale>", "Entry locale (default en)").option("--document-id <id>", "Document ID shared by localized variants").action(entriesCreateCommand);
-entries.command("update").description("Update an existing entry").argument("<typeName>", "Content type name").argument("<id>", "Entry ID").option("-C, --cwd <dir>", "Project directory").requiredOption("--body <json>", "Updated entry JSON body").option("--locale <locale>", "Entry locale").option("--document-id <id>", "Document ID shared by localized variants").action(entriesUpdateCommand);
-entries.command("delete").description("Delete an entry").argument("<typeName>", "Content type name").argument("<id>", "Entry ID").option("-C, --cwd <dir>", "Project directory").action(entriesDeleteCommand);
+entries.command("update").description("Update an existing entry").argument("<typeName>", "Content type name").argument("<documentId>", "Document ID").option("-C, --cwd <dir>", "Project directory").requiredOption("--body <json>", "Updated entry JSON body").requiredOption("--locale <locale>", "Entry locale").action(entriesUpdateCommand);
+entries.command("delete").description("Delete an entry").argument("<typeName>", "Content type name").argument("<documentId>", "Document ID").option("-C, --cwd <dir>", "Project directory").requiredOption("--locale <locale>", "Entry locale").action(entriesDeleteCommand);
 var assets2 = program.command("assets").description("Manage media assets");
 assets2.command("list").description("List assets").option("-C, --cwd <dir>", "Project directory").option("--parent-id <id>", "Filter by parent folder").option(
   "--search <query>",

package/dist/runtime/app/prefetch.js

@@ -71,7 +71,7 @@ export async function resolveMetaEntries(url) {
             return;
         }
         const { schema, queryField } = paramInfo;
-        const entryUrl = new URL(`${base}/entries/${schema}/field/${encodeURIComponent(queryField)}/${encodeURIComponent(value)}`);
+        const entryUrl = new URL(`${base}/v2/entries/${schema}/field/${encodeURIComponent(queryField)}/${encodeURIComponent(value)}`);
         entryUrl.searchParams.set('locale', localeResolution.locale);
         const res = await fetch(entryUrl);
         if (res.ok) {

package/dist/runtime/content/utils/retrieve-data-sources.d.ts

@@ -1,6 +1,7 @@
 type FieldData = Record<string, string>;
 interface RecordData {
     id: string;
+    locale?: string;
     data: FieldData;
     visible: boolean;
 }

package/dist/runtime/content/utils/retrieve-data-sources.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"retrieve-data-sources.d.ts","sourceRoot":"","sources":["../../../../src/runtime/content/utils/retrieve-data-sources.ts"],"names":[],"mappings":"AACA,KAAK,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAExC,UAAU,UAAU;IAClB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,SAAS,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAC,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;AA8B9D;;;;GAIG;AACH,wBAAgB,0BAA0B,IAAI,kBAAkB,CAiD/D"}
+{"version":3,"file":"retrieve-data-sources.d.ts","sourceRoot":"","sources":["../../../../src/runtime/content/utils/retrieve-data-sources.ts"],"names":[],"mappings":"AACA,KAAK,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAExC,UAAU,UAAU;IAClB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,SAAS,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAC,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;AAgD9D;;;;GAIG;AACH,wBAAgB,0BAA0B,IAAI,kBAAkB,CAwD/D"}

package/dist/runtime/content/utils/retrieve-data-sources.js

@@ -1,3 +1,19 @@
+function parseRecordIdentity(token) {
+    if (!token.startsWith('v2:')) {
+        return { id: token };
+    }
+    const [version, documentId, encodedLocale, ...rest] = token.split(':');
+    if (version !== 'v2' || !documentId || !encodedLocale || rest.length > 0) {
+        return null;
+    }
+    try {
+        const locale = decodeURIComponent(encodedLocale);
+        return locale ? { id: documentId, locale } : null;
+    }
+    catch {
+        return null;
+    }
+}
 /**
  * Checks if an element is genuinely visible to the user within the viewport.
  * @param el The element to check.
@@ -38,7 +54,13 @@ export function retrieveVisibleDataSources() {
         const parts = source.split('.');
         // Expects the format "SchemaName.id.fieldName"
         if (parts.length === 3) {
-            const [schemaName, id, fieldName] = parts;
+            const [schemaName, identityToken, fieldName] = parts;
+            const identity = parseRecordIdentity(identityToken);
+            if (!identity) {
+                return;
+            }
+            const { id, locale } = identity;
+            const recordKey = JSON.stringify([id, locale ?? null]);
             // Skip __translations
             if (schemaName === '__translations') {
                 return;
@@ -48,16 +70,17 @@ export function retrieveVisibleDataSources() {
                 tempGroupedData[schemaName] = {};
             }
             // Ensure the record (by ID) exists for  this schema
-            if (!tempGroupedData[schemaName][id]) {
-                tempGroupedData[schemaName][id] = {
+            if (!tempGroupedData[schemaName][recordKey]) {
+                tempGroupedData[schemaName][recordKey] = {
                     id: id,
+                    ...(locale ? { locale } : {}),
                     data: {},
                     visible: isElementVisible(el),
                 };
             }
             // Add the field and its text content to the record
             if (el.textContent) {
-                tempGroupedData[schemaName][id].data[fieldName] = el.textContent.trim();
+                tempGroupedData[schemaName][recordKey].data[fieldName] = el.textContent.trim();
             }
         }
     });

package/dist/runtime/paths/get-fimo-paths.js

@@ -35,7 +35,7 @@ function resolveApiBaseUrl(rootDir) {
     return readEnvValue(rootDir, 'VITE_API_URL') ?? readEnvValue(rootDir, 'VITE_API_URL_DEV');
 }
 async function fetchEntries(baseUrl, schema, rootDir, locale) {
-    const url = new URL(`${baseUrl.replace(/\/$/, '')}/entries/${schema}`);
+    const url = new URL(`${baseUrl.replace(/\/$/, '')}/v2/entries/${schema}`);
     url.searchParams.set('locale', locale);
     if (isValidationBuild) {
         url.searchParams.set('limit', '1');

package/dist/runtime/primitives/lib/query.d.ts

@@ -42,7 +42,6 @@ export type ManyReferenceOps = {
 };
 export type FilterFor<T> = [T] extends [FimoString | string] ? string | StringOps : [T] extends [FimoBoolean | boolean] ? boolean | BoolOps : [T] extends [FimoDate | Date] ? string | DateOps : [T] extends [number] ? number | NumberOps : [T] extends [FimoPolymorphicReference | null] ? never : [T] extends [FimoPolymorphicReference[]] ? never : [T] extends [FimoReference | null] ? string | null | ReferenceOps : [T] extends [FimoReference[]] ? string | ManyReferenceOps : [T] extends [FimoMedia | FimoMedia[]] ? NullOnlyOps : [T] extends [FimoRichText] ? string | StringOps : NullOnlyOps;
 type BaseTopLevelWhere = {
-    id?: string | StringOps;
     documentId?: string | StringOps;
     slug?: string | StringOps;
     createdAt?: string | DateOps;
@@ -66,9 +65,12 @@ export type Fields<T> = Field<T> | readonly Field<T>[];
 type SelectedField<TField> = TField extends `__fimo.${string}` ? '__fimo' : TField;
 type SelectedFields<TFields> = TFields extends readonly (infer K)[] ? SelectedField<K> : SelectedField<TFields>;
 type ListItem<TValue> = TValue extends readonly (infer K)[] ? K : TValue;
+type EntryIdentityField<T> = Extract<'documentId' | 'locale', keyof T>;
 export type Projected<T extends {
-    id: string;
-}, TFields extends Fields<T> | undefined> = [TFields] extends [undefined] ? T : Pick<T, Extract<'id' | SelectedFields<TFields>, keyof T>>;
+    documentId: string;
+}, TFields extends Fields<T> | undefined> = [TFields] extends [
+    undefined
+] ? T : Pick<T, EntryIdentityField<T> | Extract<SelectedFields<TFields>, keyof T>>;
 export declare const FIMO_REFERENCES: unique symbol;
 export interface WithReferences<TReferences> {
     readonly [FIMO_REFERENCES]?: TReferences;
@@ -78,20 +80,20 @@ export type ReferenceField<TEntry> = Extract<keyof ReferenceMap<TEntry>, string>
 export type Populate<TEntry> = ReferenceField<TEntry> | readonly ReferenceField<TEntry>[];
 type PopulatedKeys<TEntry, TPopulate> = Extract<ListItem<TPopulate>, keyof ReferenceMap<TEntry> & keyof TEntry>;
 export type Populated<TEntry extends {
-    id: string;
-}, TPopulate extends Populate<TEntry>> = Pick<TEntry, 'id'> & Omit<TEntry, PopulatedKeys<TEntry, TPopulate>> & {
+    documentId: string;
+}, TPopulate extends Populate<TEntry>> = Pick<TEntry, EntryIdentityField<TEntry>> & Omit<TEntry, PopulatedKeys<TEntry, TPopulate>> & {
     [K in PopulatedKeys<TEntry, TPopulate>]: ReferenceMap<TEntry>[K];
 };
 export type PopulatedResult<TEntry extends {
-    id: string;
+    documentId: string;
 }, TPopulate extends Populate<TEntry> | undefined> = [
     TPopulate
 ] extends [undefined] ? TEntry : Populated<TEntry, NonNullable<TPopulate>>;
 export type ProjectedWithPopulate<T extends {
-    id: string;
-}, TFields extends string | readonly string[] | undefined, TPopulate extends string | readonly string[] | undefined> = [TFields] extends [undefined] ? T : Pick<T, Extract<'id' | SelectedFields<TFields> | ListItem<NonNullable<TPopulate>>, keyof T>>;
+    documentId: string;
+}, TFields extends string | readonly string[] | undefined, TPopulate extends string | readonly string[] | undefined> = [TFields] extends [undefined] ? T : Pick<T, EntryIdentityField<T> | Extract<SelectedFields<TFields> | ListItem<NonNullable<TPopulate>>, keyof T>>;
 export type Query<T extends {
-    id: string;
+    documentId: string;
 }, TFields extends Fields<T> | undefined = Fields<T> | undefined, TPopulate extends string | readonly string[] | undefined = string | readonly string[] | undefined> = {
     where?: Where<T>;
     locale?: string;

package/dist/runtime/primitives/lib/query.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../../src/runtime/primitives/lib/query.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../../src/runtime/primitives/lib/query.ts"],"names":[],"mappings":"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"}

package/dist/runtime/primitives/public-surface.test.js

@@ -12,9 +12,9 @@ describe('fimo/ui public type surface', () => {
         expectTypeOf().toEqualTypeOf();
         const localizedWhere = { locale: 'en' };
         expectTypeOf(localizedWhere).toEqualTypeOf();
-        // @ts-expect-error locale is not a filter on non-localized generated entry types.
-        const sharedWhere = { locale: 'en' };
-        expectTypeOf(sharedWhere).toEqualTypeOf();
+        // @ts-expect-error row IDs are not part of the v2 public entry contract.
+        const rowIdWhere = { id: '550e8400-e29b-41d4-a716-446655440000' };
+        expectTypeOf(rowIdWhere).toEqualTypeOf();
     });
     it('supports the reference populate pattern emitted into generated schemas', () => {
         const query = {

package/dist/scripts/sync-schemas.test.js

@@ -37,6 +37,8 @@ describe('syncSchemas', () => {
         const post = readFileSync(join(scratch, 'src/schemas/Post.ts'), 'utf-8');
         const postTypes = readFileSync(join(scratch, 'src/schemas/Post.types.ts'), 'utf-8');
         expect(post).toContain('import { wrapWithSource as wrapAuthorWithSource } from "./Author";');
+        expect(post).toContain('isPopulatedEntry(value) ? wrapAuthorWithSource(value) : value');
+        expect(post).toContain('function isPopulatedEntry(value: unknown): value is PopulatedEntryRecord');
         expect(post).toContain('import type { Post, PostInput, PostPopulate, PostResult, PostFields, PostQuery } from "./Post.types";');
         expect(post).toContain('from "./Post.types";');
         expect(post).not.toContain('import type { Author } from "./Author";');
@@ -47,9 +49,14 @@ describe('syncSchemas', () => {
         expect(post).toContain('wrapAuthorWithSource(value)');
         expect(post).toContain('wrapWithSource(value)');
         expect(post).toContain('export async function create(payload: PostInput): Promise<Post>');
+        expect(post).toContain('export async function getByDocumentId');
+        expect(post).toContain('/v2/entries/Post/');
         expect(post).toContain('return wrapWithSource(data.data);');
         expect(postTypes).toContain('import type { Author } from "./Author.types";');
         expect(postTypes).toContain('export interface Post extends WithReferences<PostReferences>');
+        expect(postTypes).not.toContain('  id: string;');
+        expect(postTypes).toContain('  documentId: string;');
+        expect(postTypes).toContain('  locale: string;');
         expect(postTypes).toContain('type FimoReference');
         expect(postTypes).toContain('author: FimoReference | null;');
         expect(postTypes).toContain('contributors: FimoReference[];');
@@ -88,15 +95,15 @@ describe('syncSchemas', () => {
         const settings = readFileSync(join(scratch, 'src/schemas/Settings.ts'), 'utf-8');
         const settingsTypes = readFileSync(join(scratch, 'src/schemas/Settings.types.ts'), 'utf-8');
         const homepageTypes = readFileSync(join(scratch, 'src/schemas/Homepage.types.ts'), 'utf-8');
-        expect(settingsTypes).not.toContain('locale: string;');
+        expect(settingsTypes).toContain('locale: string;');
         expect(settingsTypes).not.toContain('locale?: string;');
         expect(homepageTypes).toContain('locale: string;');
         expect(settings).toContain('const LOCALIZED_CONTENT = false;');
         expect(settings).toContain('const LOCALIZED_REFERENCE_FIELDS = new Set<string>(["homepage"]);');
-        expect(settings).not.toContain('    locale: entry.locale,');
+        expect(settings).toContain('    locale,');
         expect(settings).toContain('readLocale(params, LOCALIZED_CONTENT, useQueryLocale(params.locale))');
         expect(settings.match(/readLocale\(params, LOCALIZED_CONTENT, useQueryLocale\(params\.locale\)\)/g)?.length).toBe(4);
-        expect(settings.match(/readLocale\(options, false, useQueryLocale\(options\.locale\)\)/g)?.length).toBe(2);
+        expect(settings.match(/const locale = useQueryLocale\(options\.locale\);/g)?.length).toBe(2);
     });
     it('generates singleton document APIs without collection mutations', () => {
         writeSchema('Settings', {
@@ -110,6 +117,10 @@ describe('syncSchemas', () => {
         const settings = readFileSync(join(scratch, 'src/schemas/Settings.ts'), 'utf-8');
         const settingsTypes = readFileSync(join(scratch, 'src/schemas/Settings.types.ts'), 'utf-8');
         expect(settings).toContain('fetch(`${base}${withReadOptions(`/documents/Settings`, options)}`');
+        expect(settings).toContain('const usesV2Identity = typeof id !== "string";');
+        expect(settings).toContain('`Settings.v2:${documentId}:${encodeURIComponent(locale)}`');
+        expect(settingsTypes).toContain('id?: string;');
+        expect(settingsTypes).toContain('locale?: string;');
         expect(settings).toContain('export async function update(payload: Partial<SettingsInput>)');
         expect(settings).toContain('export function useSuspenseGet');
         expect(settings).not.toContain('export async function create(');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fimo",
-  "version": "0.6.0-experimental.1",
+  "version": "0.6.0-experimental.2",
   "description": "Fimo CLI - create, deploy, and manage Fimo projects",
   "bin": {
     "fimo": "dist/cli/index.js"

package/templates/react-router/package.json

@@ -21,7 +21,7 @@
     "cmdk": "^1.1.1",
     "date-fns": "^4.1.0",
     "embla-carousel-react": "^8.6.0",
-    "fimo": "0.6.0-experimental.1",
+    "fimo": "0.6.0-experimental.2",
     "input-otp": "^1.4.2",
     "isbot": "^5",
     "lucide-react": "^0.577.0",