fimo 0.5.0 → 0.6.0-experimental.2

package/dist/cli/index.js

@@ -20618,6 +20618,13 @@ var init_api = __esm({
         });
         return body.data;
       }
+      async upsertSchemas(projectId, contentTypes) {
+        const body = await this.request(this.tenantPath(projectId, "/schema/batch"), {
+          method: "POST",
+          body: JSON.stringify({ contentTypes })
+        });
+        return body.data;
+      }
       async deleteSchema(projectId, typeName) {
         const body = await this.request(this.tenantPath(projectId, `/schema/types/${typeName}`), {
           method: "DELETE"
@@ -20627,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 ──
@@ -44400,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";
@@ -44442,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({
@@ -44452,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()
@@ -44465,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));
   }
 });
 
@@ -48782,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 {
@@ -48803,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({
@@ -48817,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();
@@ -49041,6 +49098,7 @@ async function planInit(args) {
   let projectId;
   let targetDir;
   let displayName;
+  const derived = { ...options };
   if (useExisting) {
     projectId = options.projectId ?? await selectProjectId({
       api,
@@ -49068,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;
@@ -106299,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");
@@ -106318,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");
@@ -109785,7 +109858,6 @@ init_dist();
 init_sync_schemas();
 import fs42 from "node:fs";
 import path46 from "node:path";
-init_api();
 init_project_context();
 init_project();
 function toApiShape(schema) {
@@ -109802,10 +109874,6 @@ function renderPrettyJson8(data2) {
   return JSON.stringify(data2, null, 2);
 }
 __name(renderPrettyJson8, "renderPrettyJson");
-function isAlreadyExistsError(error45) {
-  return error45 instanceof ApiRequestError && error45.status === 400 && /already exists/i.test(error45.detail);
-}
-__name(isAlreadyExistsError, "isAlreadyExistsError");
 async function schemaListCommand(options, cmd) {
   const { ctx, api } = await bootstrapProjectCommand(options, cmd);
   await requireOperation("cms.schema.list", { projectId: ctx.projectId, env: ctx.env });
@@ -109849,21 +109917,10 @@ async function schemaPushCommand(typeName, options, cmd) {
     return JSON.parse(fs42.readFileSync(filePath, "utf-8"));
   });
   syncSchemas({ cwd, verbose: false });
-  const results = [];
-  for (const schema of schemas3) {
-    const contentType = toApiShape(schema);
-    try {
-      const result = await api.createSchema(ctx.projectId, contentType);
-      results.push(result);
-    } catch (error45) {
-      if (isAlreadyExistsError(error45)) {
-        const result = await api.updateSchema(ctx.projectId, contentType.name, contentType);
-        results.push(result);
-      } else {
-        throw error45;
-      }
-    }
-  }
+  const results = await api.upsertSchemas(
+    ctx.projectId,
+    schemas3.map((schema) => toApiShape(schema))
+  );
   const payload = results.length === 1 ? results[0] : results;
   ui.result({ command: "schemas push", data: payload, render: /* @__PURE__ */ __name(() => renderPrettyJson8(payload), "render") });
 }
@@ -110184,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(
@@ -110301,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.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-fimo-paths.d.ts","sourceRoot":"","sources":["../../../src/runtime/paths/get-fimo-paths.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,QAAQ,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAoEhE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,wBAAsB,YAAY,CAAC,IAAI,GAAE,mBAAwB,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAoGtF"}
+{"version":3,"file":"get-fimo-paths.d.ts","sourceRoot":"","sources":["../../../src/runtime/paths/get-fimo-paths.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,QAAQ,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAkFhE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,wBAAsB,YAAY,CAAC,IAAI,GAAE,mBAAwB,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAoGtF"}

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

@@ -7,6 +7,9 @@ import { getFimoLocales, localizeFimoPath } from '../i18n/locale.js';
 import { resolveSeoForPath } from '../seo/resolver.js';
 import { getConfigServer } from '../shared/fimo-config.server.js';
 const isValidationBuild = !!process.env.FIMO_VALIDATION_BUILD;
+const MAX_FETCH_ATTEMPTS = 3;
+const RETRYABLE_FETCH_STATUSES = new Set([502, 503, 504]);
+const RETRY_BASE_DELAY_MS = 250;
 function readEnvValue(rootDir, key) {
     if (process.env[key]) {
         return process.env[key];
@@ -32,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');
@@ -42,12 +45,19 @@ async function fetchEntries(baseUrl, schema, rootDir, locale) {
     if (branch) {
         headers['X-Fimo-Branch'] = branch;
     }
-    const res = await fetch(url, { headers });
-    if (!res.ok) {
-        throw new Error(`Failed to fetch ${schema}: ${res.status}`);
+    for (let attempt = 1; attempt <= MAX_FETCH_ATTEMPTS; attempt += 1) {
+        const res = await fetch(url, { headers });
+        if (res.ok) {
+            const payload = (await res.json());
+            return Array.isArray(payload?.data) ? payload.data : [];
+        }
+        if (!RETRYABLE_FETCH_STATUSES.has(res.status) || attempt === MAX_FETCH_ATTEMPTS) {
+            const attemptDetail = attempt > 1 ? ` after ${attempt} attempts` : '';
+            throw new Error(`Failed to fetch ${schema}: ${res.status}${attemptDetail}`);
+        }
+        await new Promise((resolveDelay) => setTimeout(resolveDelay, RETRY_BASE_DELAY_MS * attempt));
     }
-    const payload = (await res.json());
-    return Array.isArray(payload?.data) ? payload.data : [];
+    throw new Error(`Failed to fetch ${schema}`);
 }
 // Glob-ish matcher for route keys: '*' matches one segment, '**' matches any.
 function compilePattern(pattern) {

package/dist/runtime/paths/get-fimo-paths.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=get-fimo-paths.test.d.ts.map

package/dist/runtime/paths/get-fimo-paths.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-fimo-paths.test.d.ts","sourceRoot":"","sources":["../../../src/runtime/paths/get-fimo-paths.test.ts"],"names":[],"mappings":""}

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

@@ -0,0 +1,69 @@
+import { mkdtempSync, rmSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { afterEach, describe, expect, it, vi } from 'vitest';
+import { getFimoPaths } from './get-fimo-paths.js';
+const roots = [];
+function createDynamicProject() {
+    const root = mkdtempSync(join(tmpdir(), 'fimo-paths-'));
+    roots.push(root);
+    writeFileSync(join(root, '.env'), 'VITE_API_URL=https://tenant.example.test\n');
+    writeFileSync(join(root, 'fimo-config.json'), JSON.stringify({
+        routes: {
+            'blog/post': {
+                path: '/blog/:slug',
+                params: {
+                    slug: {
+                        schema: 'BlogPost',
+                        queryField: 'slug',
+                        displayField: 'title',
+                    },
+                },
+            },
+        },
+    }));
+    return root;
+}
+function response(status, data = []) {
+    return new Response(JSON.stringify({ data }), {
+        status,
+        headers: { 'Content-Type': 'application/json' },
+    });
+}
+afterEach(() => {
+    vi.useRealTimers();
+    vi.unstubAllGlobals();
+    for (const root of roots.splice(0)) {
+        rmSync(root, { recursive: true, force: true });
+    }
+});
+describe('getFimoPaths content fetches', () => {
+    it.each([502, 503, 504])('recovers from a transient %s response', async (status) => {
+        vi.useFakeTimers();
+        const fetchMock = vi
+            .fn()
+            .mockResolvedValueOnce(response(status))
+            .mockResolvedValueOnce(response(200, [{ slug: 'hello-world' }]));
+        vi.stubGlobal('fetch', fetchMock);
+        const resultPromise = getFimoPaths({ cwd: createDynamicProject() });
+        await vi.runAllTimersAsync();
+        await expect(resultPromise).resolves.toContainEqual(expect.objectContaining({ routeKey: 'blog/post', path: '/blog/hello-world' }));
+        expect(fetchMock).toHaveBeenCalledTimes(2);
+    });
+    it('fails clearly after exhausting the transient retry budget', async () => {
+        vi.useFakeTimers();
+        const fetchMock = vi.fn().mockResolvedValue(response(503));
+        vi.stubGlobal('fetch', fetchMock);
+        const resultPromise = getFimoPaths({ cwd: createDynamicProject() });
+        const rejection = expect(resultPromise).rejects.toThrow('Failed to fetch BlogPost: 503 after 3 attempts');
+        await vi.runAllTimersAsync();
+        await rejection;
+        expect(fetchMock).toHaveBeenCalledTimes(3);
+    });
+    it('does not retry an author response', async () => {
+        const fetchMock = vi.fn().mockResolvedValue(response(400));
+        vi.stubGlobal('fetch', fetchMock);
+        await expect(getFimoPaths({ cwd: createDynamicProject() })).rejects.toThrow('Failed to fetch BlogPost: 400');
+        expect(fetchMock).toHaveBeenCalledTimes(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":"AAAA,OAAO,KAAK,EACV,WAAW,EACX,QAAQ,EACR,SAAS,EACT,wBAAwB,EACxB,aAAa,EACb,YAAY,EACZ,UAAU,EACX,MAAM,iBAAiB,CAAC;AAEzB,MAAM,MAAM,SAAS,CAAC,CAAC,IAAI;IACzB,GAAG,CAAC,EAAE,CAAC,CAAC;IACR,GAAG,CAAC,EAAE,CAAC,CAAC;IACR,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;IACV,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;IACX,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC,GAAG;IAC1C,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC,GAAG;IAC1C,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG,SAAS,CAAC;AAEhC,MAAM,MAAM,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;AAEzC,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,UAAU,GAAG,MAAM,CAAC,GACxD,MAAM,GAAG,SAAS,GAClB,CAAC,CAAC,CAAC,SAAS,CAAC,WAAW,GAAG,OAAO,CAAC,GACjC,OAAO,GAAG,OAAO,GACjB,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,GAAG,IAAI,CAAC,GAC3B,MAAM,GAAG,OAAO,GAChB,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,GAClB,MAAM,GAAG,SAAS,GAClB,CAAC,CAAC,CAAC,SAAS,CAAC,wBAAwB,GAAG,IAAI,CAAC,GAC3C,KAAK,GACL,CAAC,CAAC,CAAC,SAAS,CAAC,wBAAwB,EAAE,CAAC,GACtC,KAAK,GACL,CAAC,CAAC,CAAC,SAAS,CAAC,aAAa,GAAG,IAAI,CAAC,GAChC,MAAM,GAAG,IAAI,GAAG,YAAY,GAC5B,CAAC,CAAC,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC,GAC3B,MAAM,GAAG,gBAAgB,GACzB,CAAC,CAAC,CAAC,SAAS,CAAC,SAAS,GAAG,SAAS,EAAE,CAAC,GACnC,WAAW,GACX,CAAC,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,GACxB,MAAM,GAAG,SAAS,GAClB,WAAW,CAAC;AAElC,KAAK,iBAAiB,GAAG;IACvB,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAC7B,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAC7B,MAAM,CAAC,EAAE;QACP,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;KAClC,CAAC;CACH,CAAC;AAEF,KAAK,aAAa,CAAC,CAAC,IAAI,iBAAiB,GAAG,CAAC,QAAQ,SAAS,MAAM,CAAC,GAAG;IAAE,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,GAAG,EAAE,CAAC,CAAC;AAE9G,MAAM,MAAM,KAAK,CAAC,CAAC,IAAI,aAAa,CAAC,CAAC,CAAC,GAAG;KACvC,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,iBAAiB,GAAG,QAAQ,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAC9E,CAAC;AAEF,KAAK,iBAAiB,GAAG,aAAa,CAAC;AACvC,KAAK,SAAS,GAAG,QAAQ,GAAG,UAAU,iBAAiB,EAAE,CAAC;AAE1D,MAAM,MAAM,SAAS,CAAC,CAAC,IACnB,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,EAAE,QAAQ,CAAC,GAC3C,WAAW,GACX,WAAW,GACX,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;AAEjC,MAAM,MAAM,IAAI,CAAC,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;AAExD,MAAM,MAAM,KAAK,CAAC,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,GAAG,WAAW,GAAG,WAAW,GAAG,SAAS,CAAC;AAExF,MAAM,MAAM,MAAM,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,GAAG,SAAS,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;AAEvD,KAAK,aAAa,CAAC,MAAM,IAAI,MAAM,SAAS,UAAU,MAAM,EAAE,GAAG,QAAQ,GAAG,MAAM,CAAC;AAEnF,KAAK,cAAc,CAAC,OAAO,IAAI,OAAO,SAAS,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,aAAa,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;AAEhH,KAAK,QAAQ,CAAC,MAAM,IAAI,MAAM,SAAS,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC;AAEzE,KAAK,kBAAkB,CAAC,CAAC,IAAI,OAAO,CAAC,YAAY,GAAG,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;AAEvE,MAAM,MAAM,SAAS,CAAC,CAAC,SAAS;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,EAAE,OAAO,SAAS,MAAM,CAAC,CAAC,CAAC,GAAG,SAAS,IAAI,CAAC,OAAO,CAAC,SAAS;IACjH,SAAS;CACV,GACG,CAAC,GACD,IAAI,CAAC,CAAC,EAAE,kBAAkB,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;AAE/E,MAAM,CAAC,OAAO,CAAC,MAAM,eAAe,EAAE,OAAO,MAAM,CAAC;AAEpD,MAAM,WAAW,cAAc,CAAC,WAAW;IACzC,QAAQ,CAAC,CAAC,eAAe,CAAC,CAAC,EAAE,WAAW,CAAC;CAC1C;AAED,MAAM,MAAM,YAAY,CAAC,MAAM,IAAI,MAAM,SAAS,cAAc,CAAC,MAAM,WAAW,CAAC,GAAG,WAAW,GAAG,KAAK,CAAC;AAE1G,MAAM,MAAM,cAAc,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,YAAY,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC;AAEjF,MAAM,MAAM,QAAQ,CAAC,MAAM,IAAI,cAAc,CAAC,MAAM,CAAC,GAAG,SAAS,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC;AAE1F,KAAK,aAAa,CAAC,MAAM,EAAE,SAAS,IAAI,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,YAAY,CAAC,MAAM,CAAC,GAAG,MAAM,MAAM,CAAC,CAAC;AAEhH,MAAM,MAAM,SAAS,CAAC,MAAM,SAAS;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,EAAE,SAAS,SAAS,QAAQ,CAAC,MAAM,CAAC,IAAI,IAAI,CACrG,MAAM,EACN,kBAAkB,CAAC,MAAM,CAAC,CAC3B,GACC,IAAI,CAAC,MAAM,EAAE,aAAa,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,GAAG;KAC9C,CAAC,IAAI,aAAa,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;CACjE,CAAC;AAEJ,MAAM,MAAM,eAAe,CAAC,MAAM,SAAS;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,EAAE,SAAS,SAAS,QAAQ,CAAC,MAAM,CAAC,GAAG,SAAS,IAAI;IACnH,SAAS;CACV,SAAS,CAAC,SAAS,CAAC,GACjB,MAAM,GACN,SAAS,CAAC,MAAM,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC;AAE9C,MAAM,MAAM,qBAAqB,CAC/B,CAAC,SAAS;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,EAChC,OAAO,SAAS,MAAM,GAAG,SAAS,MAAM,EAAE,GAAG,SAAS,EACtD,SAAS,SAAS,MAAM,GAAG,SAAS,MAAM,EAAE,GAAG,SAAS,IACtD,CAAC,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC,GAC7B,CAAC,GACD,IAAI,CAAC,CAAC,EAAE,kBAAkB,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,GAAG,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;AAElH,MAAM,MAAM,KAAK,CACf,CAAC,SAAS;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,EAChC,OAAO,SAAS,MAAM,CAAC,CAAC,CAAC,GAAG,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,SAAS,EAC7D,SAAS,SAAS,MAAM,GAAG,SAAS,MAAM,EAAE,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,MAAM,EAAE,GAAG,SAAS,IAC/F;IACF,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,SAAS,CAAC;CACtB,CAAC"}

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 = {