fimo 0.6.0 → 0.7.0-experimental.1

package/dist/cli/index.js

@@ -19657,7 +19657,8 @@ async function throwPermissionDenied(cfg, response) {
 }
 async function fimoFetch(url2, init) {
   const headers = new Headers(init.headers);
-  if (!headers.has(CLI_VERSION_HEADER)) {
+  const skipsVersionCheck = process.env.FIMO_SKIP_VERSION_CHECK === "1" || process.argv[2] === "git-credential";
+  if (!headers.has(CLI_VERSION_HEADER) && !skipsVersionCheck) {
     headers.set(CLI_VERSION_HEADER, getCliVersion());
   }
   const response = await fetch(url2, { ...init, headers });
@@ -20636,8 +20637,8 @@ var init_api = __esm({
         const query = params ? `?${new URLSearchParams(params).toString()}` : "";
         return this.request(this.tenantPath(projectId, `/entries/${typeName}${query}`));
       }
-      async getEntry(projectId, typeName, id, params) {
-        const query = params ? `?${new URLSearchParams(params).toString()}` : "";
+      async getEntry(projectId, typeName, id, locale) {
+        const query = locale ? `?${new URLSearchParams({ locale }).toString()}` : "";
         const body = await this.request(
           this.tenantPath(projectId, `/entries/${typeName}/${id}${query}`)
         );
@@ -20650,17 +20651,23 @@ var init_api = __esm({
         });
         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, id, locale, data2) {
+        const query = locale ? `?${new URLSearchParams({ locale }).toString()}` : "";
+        const body = await this.request(
+          this.tenantPath(projectId, `/entries/${typeName}/${id}${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, id, locale) {
+        const query = locale ? `?${new URLSearchParams({ locale }).toString()}` : "";
+        const body = await this.request(
+          this.tenantPath(projectId, `/entries/${typeName}/${id}${query}`),
+          { method: "DELETE" }
+        );
         return body.data;
       }
       // ── Tenant API: Assets ──
@@ -42019,6 +42026,7 @@ var init_common = __esm({
     ]);
     RESERVED_CONTENT_FIELD_NAMES = [
       "id",
+      "entryId",
       "documentId",
       "slug",
       "locale",
@@ -42164,9 +42172,24 @@ function referenceDocumentId(value) {
   if (typeof value === "string") {
     return value;
   }
-  if (value && typeof value === "object" && "documentId" in value) {
-    const documentId = value.documentId;
-    return typeof documentId === "string" ? documentId : null;
+  if (value && typeof value === "object") {
+    const reference = value;
+    const hasId = Object.prototype.hasOwnProperty.call(reference, "id");
+    const hasDocumentId = Object.prototype.hasOwnProperty.call(reference, "documentId");
+    const id = reference.id;
+    const documentId = reference.documentId;
+    if (hasId && typeof id !== "string" || hasDocumentId && typeof documentId !== "string") {
+      return null;
+    }
+    if (typeof id === "string" && typeof documentId === "string" && id !== documentId) {
+      return null;
+    }
+    if (typeof id === "string") {
+      return id;
+    }
+    if (typeof documentId === "string") {
+      return documentId;
+    }
   }
   return null;
 }
@@ -42198,12 +42221,30 @@ var init_references = __esm({
     init_zod();
     __name(referenceDocumentId, "referenceDocumentId");
     __name(toReferenceValue, "toReferenceValue");
-    ReferenceValueSchema = external_exports.preprocess((value) => toReferenceValue(value) ?? value, external_exports.object({
+    ReferenceValueSchema = external_exports.preprocess((value) => {
+      const reference = toReferenceValue(value);
+      if (reference) {
+        return reference;
+      }
+      if (value && typeof value === "object" && ("id" in value || "documentId" in value)) {
+        return null;
+      }
+      return value;
+    }, external_exports.object({
       documentId: external_exports.uuid()
     }));
     __name(referenceContentType, "referenceContentType");
     __name(toPolymorphicReferenceValue, "toPolymorphicReferenceValue");
-    PolymorphicReferenceValueSchema = external_exports.preprocess((value) => toPolymorphicReferenceValue(value) ?? value, external_exports.object({
+    PolymorphicReferenceValueSchema = external_exports.preprocess((value) => {
+      const reference = toPolymorphicReferenceValue(value);
+      if (reference) {
+        return reference;
+      }
+      if (value && typeof value === "object" && ("id" in value || "documentId" in value)) {
+        return null;
+      }
+      return value;
+    }, external_exports.object({
       contentType: external_exports.string().min(1),
       documentId: external_exports.uuid()
     }));
@@ -42241,7 +42282,19 @@ var init_audit_log = __esm({
       // Cutover (M06)
       "cutover_step",
       // Composition (M18)
-      "agent_delegate"
+      "agent_delegate",
+      // Staff operations
+      "ops_access_change",
+      "ops_service_token_change",
+      "ops_project_inspect",
+      "ops_project_snapshot",
+      "ops_customer_registry_change",
+      "ops_investigation_change",
+      "ops_known_issue_change",
+      "ops_validation_record",
+      "ops_notification_preview",
+      "ops_notification_approve",
+      "ops_notification_send"
     ];
     AuditActionSchema = external_exports.enum(AUDIT_ACTIONS);
     AUDIT_OUTCOMES = [
@@ -42259,6 +42312,174 @@ var init_audit_log = __esm({
   }
 });
 
+// ../../packages/api-contracts/dist/esm/types/ops.js
+var OPS_BACKEND_PROFILES, OpsBackendProfileSchema, OPS_PERMISSIONS, OpsPermissionSchema, OPS_PERMISSION_PRESETS, OPS_SERVICE_PERMISSION_PRESETS, OpsAccessGrantInputSchema, OpsServiceTokenInputSchema, OpsCustomerProjectInputSchema, OPS_INVESTIGATION_STATUSES, OpsInvestigationStatusSchema, OpsInvestigationCreateInputSchema, OpsInvestigationUpdateInputSchema, OPS_KNOWN_ISSUE_STATUSES, OpsKnownIssueStatusSchema, OpsKnownIssueCreateInputSchema, OpsKnownIssueUpdateInputSchema, OPS_VALIDATION_OUTCOMES, OpsValidationOutcomeSchema, OpsValidationRunInputSchema, OpsNotificationPreviewInputSchema;
+var init_ops = __esm({
+  "../../packages/api-contracts/dist/esm/types/ops.js"() {
+    "use strict";
+    init_zod();
+    OPS_BACKEND_PROFILES = [
+      "local",
+      "staging",
+      "prod"
+    ];
+    OpsBackendProfileSchema = external_exports.enum(OPS_BACKEND_PROFILES);
+    OPS_PERMISSIONS = [
+      "ops:project:read",
+      "ops:project:snapshot",
+      "ops:sentry:read",
+      "ops:logs:read",
+      "ops:support:read",
+      "ops:customers:read",
+      "ops:customers:write",
+      "ops:investigations:read",
+      "ops:investigations:write",
+      "ops:known-issues:read",
+      "ops:known-issues:write",
+      "ops:validations:read",
+      "ops:validations:write",
+      "ops:audit:read",
+      "ops:notification:preview",
+      "ops:notification:approve",
+      "ops:notification:send"
+    ];
+    OpsPermissionSchema = external_exports.enum(OPS_PERMISSIONS);
+    OPS_PERMISSION_PRESETS = {
+      support: [
+        "ops:project:read",
+        "ops:support:read",
+        "ops:customers:read",
+        "ops:investigations:read",
+        "ops:investigations:write",
+        "ops:known-issues:read",
+        "ops:validations:read",
+        "ops:notification:preview"
+      ],
+      engineer: [
+        "ops:project:read",
+        "ops:project:snapshot",
+        "ops:sentry:read",
+        "ops:logs:read",
+        "ops:support:read",
+        "ops:customers:read",
+        "ops:customers:write",
+        "ops:investigations:read",
+        "ops:investigations:write",
+        "ops:known-issues:read",
+        "ops:known-issues:write",
+        "ops:validations:read",
+        "ops:validations:write",
+        "ops:audit:read",
+        "ops:notification:preview"
+      ],
+      full: [
+        ...OPS_PERMISSIONS
+      ]
+    };
+    OPS_SERVICE_PERMISSION_PRESETS = {
+      support: OPS_PERMISSION_PRESETS.support,
+      engineer: OPS_PERMISSION_PRESETS.engineer,
+      full: OPS_PERMISSION_PRESETS.full.filter((permission) => permission !== "ops:notification:approve")
+    };
+    OpsAccessGrantInputSchema = external_exports.object({
+      permissions: external_exports.array(OpsPermissionSchema).min(1),
+      backendProfiles: external_exports.array(OpsBackendProfileSchema).min(1),
+      enabled: external_exports.boolean().default(true)
+    });
+    OpsServiceTokenInputSchema = external_exports.object({
+      name: external_exports.string().trim().min(1).max(120),
+      permissions: external_exports.array(OpsPermissionSchema).min(1),
+      backendProfiles: external_exports.array(OpsBackendProfileSchema).min(1),
+      expiresAt: external_exports.coerce.date()
+    }).refine((input) => !input.permissions.includes("ops:notification:approve"), {
+      path: [
+        "permissions"
+      ],
+      message: "Service credentials cannot approve customer notifications"
+    }).refine((input) => input.expiresAt.getTime() > Date.now(), {
+      path: [
+        "expiresAt"
+      ],
+      message: "Service credential expiry must be in the future"
+    });
+    OpsCustomerProjectInputSchema = external_exports.object({
+      importanceReason: external_exports.string().trim().min(1).max(1e3),
+      ownerUserId: external_exports.string().trim().min(1).nullable().optional(),
+      framework: external_exports.string().trim().max(120).nullable().optional(),
+      packageManager: external_exports.enum([
+        "npm",
+        "pnpm",
+        "yarn",
+        "bun"
+      ]).nullable().optional(),
+      notes: external_exports.string().trim().max(5e3).nullable().optional()
+    });
+    OPS_INVESTIGATION_STATUSES = [
+      "open",
+      "investigating",
+      "awaiting_approval",
+      "resolved",
+      "monitoring",
+      "closed"
+    ];
+    OpsInvestigationStatusSchema = external_exports.enum(OPS_INVESTIGATION_STATUSES);
+    OpsInvestigationCreateInputSchema = external_exports.object({
+      projectId: external_exports.uuid(),
+      title: external_exports.string().trim().min(1).max(240),
+      userReport: external_exports.string().trim().max(1e4).nullable().optional()
+    });
+    OpsInvestigationUpdateInputSchema = external_exports.object({
+      status: OpsInvestigationStatusSchema.optional(),
+      hypothesis: external_exports.string().trim().max(1e4).nullable().optional(),
+      outcome: external_exports.string().trim().max(1e4).nullable().optional(),
+      evidence: external_exports.array(external_exports.record(external_exports.string(), external_exports.unknown())).max(100).optional()
+    }).refine((input) => Object.keys(input).length > 0, "At least one field is required");
+    OPS_KNOWN_ISSUE_STATUSES = [
+      "open",
+      "monitoring",
+      "resolved"
+    ];
+    OpsKnownIssueStatusSchema = external_exports.enum(OPS_KNOWN_ISSUE_STATUSES);
+    OpsKnownIssueCreateInputSchema = external_exports.object({
+      fingerprint: external_exports.string().trim().min(1).max(240),
+      title: external_exports.string().trim().min(1).max(240),
+      description: external_exports.string().trim().min(1).max(1e4),
+      affectedVersions: external_exports.array(external_exports.string().trim().min(1).max(120)).max(100).default([]),
+      detectionQueries: external_exports.array(external_exports.string().trim().min(1).max(2e3)).max(50).default([]),
+      fixedVersion: external_exports.string().trim().min(1).max(64).nullable().optional(),
+      workaround: external_exports.string().trim().min(1).max(1e4).nullable().optional(),
+      status: OpsKnownIssueStatusSchema.default("open")
+    });
+    OpsKnownIssueUpdateInputSchema = OpsKnownIssueCreateInputSchema.omit({
+      fingerprint: true
+    }).extend({
+      affectedVersions: external_exports.array(external_exports.string().trim().min(1).max(120)).max(100),
+      detectionQueries: external_exports.array(external_exports.string().trim().min(1).max(2e3)).max(50),
+      status: OpsKnownIssueStatusSchema
+    }).partial().refine((input) => Object.keys(input).length > 0, "At least one field is required");
+    OPS_VALIDATION_OUTCOMES = [
+      "passed",
+      "failed",
+      "inconclusive"
+    ];
+    OpsValidationOutcomeSchema = external_exports.enum(OPS_VALIDATION_OUTCOMES);
+    OpsValidationRunInputSchema = external_exports.object({
+      changeReference: external_exports.string().trim().min(1).max(500),
+      outcome: OpsValidationOutcomeSchema,
+      summary: external_exports.string().trim().min(1).max(1e4),
+      evidence: external_exports.array(external_exports.record(external_exports.string(), external_exports.unknown())).max(100).default([])
+    });
+    OpsNotificationPreviewInputSchema = external_exports.object({
+      recipientEmail: external_exports.email().optional(),
+      subject: external_exports.string().trim().min(1).max(200).default("An update from Fimo"),
+      message: external_exports.string().trim().min(1).max(5e3),
+      locale: external_exports.string().trim().min(2).max(20),
+      reason: external_exports.string().trim().min(1).max(1e3),
+      acknowledgePolicy: external_exports.literal(true)
+    });
+  }
+});
+
 // ../../packages/api-contracts/dist/esm/dtos/project.dto.js
 var ProjectDTOSchema, ProjectDTO, ProjectWithPlanDTOSchema, ProjectWithPlanDTO, ProjectSummaryDTOSchema, ProjectSummaryDTO, ProjectUserDTOSchema, ProjectUserDTO, ProjectFileDTOSchema, ProjectFileDTO, ProjectChatMessageRole, ProjectMessageBaseSchema, MessageUserMetadataSchema, QuestionAnswerMetadataSchema, ProjectMessagePublicDTOSchema, ProjectMessagePublicDTO, ProjectMessageDTOSchema, ProjectVersionDTOSchema, ProjectVersionDTO, ProjectDocumentContentDTOSchema, ProjectDocumentContentDTO, ProjectListResponseSchema, ProjectVersionListResponseSchema, ProjectVersionResponseSchema, VersionMutationResponseSchema, ProjectPublicationStateDTOSchema, ProjectPublicationStateDTO, PublicationMutationDTOSchema, PublicationMutationDTO, ProjectPublicationStateResponseSchema, PublicationMutationResponseSchema, ProjectResponseSchema, ProjectWithPlanResponseSchema;
 var init_project_dto = __esm({
@@ -44439,6 +44660,7 @@ var init_content_dto = __esm({
     SchemaDTO = createDTO(SchemaDTOSchema);
     EntryDTOSchema = external_exports.object({
       id: external_exports.string(),
+      entryId: external_exports.string(),
       documentId: external_exports.string(),
       slug: external_exports.string(),
       locale: external_exports.string().optional(),
@@ -45514,6 +45736,7 @@ var init_sandbox_command_dto = __esm({
   "../../packages/api-contracts/dist/esm/dtos/admin/sandbox-command.dto.js"() {
     "use strict";
     init_zod();
+    init_env2();
     init_create_dto();
     init_response();
     SandboxProcessStatusSchema = external_exports.enum([
@@ -45533,6 +45756,7 @@ var init_sandbox_command_dto = __esm({
     ExecuteSandboxCommandRequestDTOSchema = external_exports.object({
       command: external_exports.string().min(1).max(1e4),
       cwd: external_exports.string().optional(),
+      projectEnv: EnvSchema.optional(),
       env: external_exports.record(external_exports.string(), external_exports.string()).optional(),
       name: external_exports.string().optional(),
       waitForCompletion: external_exports.boolean().optional().default(false)
@@ -45579,6 +45803,7 @@ var init_esm = __esm({
     init_realtime();
     init_references();
     init_audit_log();
+    init_ops();
     init_project_dto();
     init_project_env_dto();
     init_project_import_export_dto();
@@ -106355,8 +106580,7 @@ __name(entriesListCommand, "entriesListCommand");
 async function entriesGetCommand(typeName, id, 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, id, options.locale);
   ui.result({ command: "entries get", data: result, render: /* @__PURE__ */ __name(() => renderPrettyJson5(result), "render") });
 }
 __name(entriesGetCommand, "entriesGetCommand");
@@ -106374,18 +106598,15 @@ __name(entriesCreateCommand, "entriesCreateCommand");
 async function entriesUpdateCommand(typeName, id, 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, id, 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) {
   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, id, options.locale);
   ui.result({ command: "entries delete", data: result, render: /* @__PURE__ */ __name(() => renderPrettyJson5(result), "render") });
 }
 __name(entriesDeleteCommand, "entriesDeleteCommand");
@@ -110338,10 +110559,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("<id>", "Entry ID").option("-C, --cwd <dir>", "Project directory").option("--locale <locale>", "Entry locale (defaults to the project 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("<id>", "Entry ID").option("-C, --cwd <dir>", "Project directory").requiredOption("--body <json>", "Updated entry JSON body").option("--locale <locale>", "Entry locale (defaults to the project locale)").action(entriesUpdateCommand);
+entries.command("delete").description("Delete an entry").argument("<typeName>", "Content type name").argument("<id>", "Entry ID").option("-C, --cwd <dir>", "Project directory").option("--locale <locale>", "Entry locale (defaults to the project 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/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('id:')) {
+        return token.includes(':') ? null : { id: token };
+    }
+    const [format, id, encodedLocale, ...rest] = token.split(':');
+    if (format !== 'id' || !id || !encodedLocale || rest.length > 0) {
+        return null;
+    }
+    try {
+        const locale = decodeURIComponent(encodedLocale);
+        return locale ? { id, 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/primitives/lib/primitives.d.ts

@@ -9,12 +9,12 @@ export interface FimoSource {
     source: string;
 }
 export interface FimoReference {
-    documentId: string;
+    id: string;
 }
 /** Polymorphic reference value: the schema names a target set, so every value carries its own type. */
 export interface FimoPolymorphicReference {
     contentType: string;
-    documentId: string;
+    id: string;
 }
 export declare const FIMO_SOURCE: unique symbol;
 export declare const FIMO_PARTS: unique symbol;

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

@@ -1 +1 @@
-{"version":3,"file":"primitives.d.ts","sourceRoot":"","sources":["../../../../src/runtime/primitives/lib/primitives.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"primitives.d.ts","sourceRoot":"","sources":["../../../../src/runtime/primitives/lib/primitives.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B;;;;;GAKG;AAGH,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,uGAAuG;AACvG,MAAM,WAAW,wBAAwB;IACvC,WAAW,EAAE,MAAM,CAAC;IACpB,EAAE,EAAE,MAAM,CAAC;CACZ;AAGD,eAAO,MAAM,WAAW,eAA4B,CAAC;AACrD,eAAO,MAAM,UAAU,eAA2B,CAAC;AAEnD;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF;;;;;GAKG;AACH,qBAAa,UAAW,SAAQ,MAAM;IACpC,QAAQ,CAAC,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,QAAQ,CAAC,CAAC,UAAU,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC;gBAEvB,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAKhD;;;;OAIG;IACH,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,QAAQ,EAAE,GAAG,UAAU;IAc7C;;OAEG;IACH,IAAI,MAAM,IAAI,UAAU,CAEvB;CACF;AAED;;GAEG;AACH,qBAAa,QAAS,SAAQ,IAAI;IAChC,QAAQ,CAAC,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;gBAEnB,KAAK,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,EAAE,MAAM,EAAE,MAAM;IAKzD,IAAI,MAAM,IAAI,UAAU,CAEvB;CACF;AAED;;GAEG;AACH,qBAAa,SAAS;IACpB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;gBAG7B,IAAI,EAAE;QACJ,GAAG,EAAE,MAAM,CAAC;QACZ,GAAG,EAAE,MAAM,CAAC;QACZ,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,EACD,MAAM,EAAE,MAAM;IAWhB,IAAI,MAAM,IAAI,UAAU,CAEvB;CACF;AAED;;GAEG;AACH,qBAAa,WAAW;IACtB,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;gBAEnB,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM;IAK1C,IAAI,MAAM,IAAI,UAAU,CAEvB;IAED,OAAO,IAAI,OAAO;CAGnB;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,OAAO,CAAC,EAAE,mBAAmB,EAAE,CAAC;IAChC,KAAK,CAAC,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,CAAC,CAAC;IACjE,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,IAAI,EAAE,mBAAmB,CAAC;CAC3B;AAED;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,CAAC;CACzD;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,WAAW,sBAAsB;IAErC,SAAS,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC;IACvD,OAAO,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC;IACrD,UAAU,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC;IACxD,WAAW,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC;IACzD,QAAQ,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC;IACtD,UAAU,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC;IACxD,SAAS,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC;IACvD,cAAc,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC;IAC5D,SAAS,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC;IACvD,KAAK,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC;IACnD,KAAK,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC;IACnD,QAAQ,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC;IACtD,SAAS,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC;IACvD,WAAW,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC;IACzD,MAAM,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC;IAEpD,IAAI,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC;IAClD,MAAM,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC;IACpD,SAAS,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC;IACvD,MAAM,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC;IACpD,IAAI,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC;IAClD,IAAI,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC;CACnD;AAED;;;;GAIG;AACH,qBAAa,YAAY;IACvB,QAAQ,CAAC,OAAO,EAAE,mBAAmB,CAAC;IACtC,QAAQ,CAAC,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;gBAEnB,OAAO,EAAE,mBAAmB,EAAE,MAAM,EAAE,MAAM;IAKxD,IAAI,MAAM,IAAI,UAAU,CAEvB;CACF;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,UAAU,CAEhE;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,QAAQ,CAE5D;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI;IAAE,CAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,CAOhF;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAKhE;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,QAAQ,EAAE,GAAG,SAAS,CAKnE"}

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

@@ -43,6 +43,7 @@ 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;
+    entryId?: string | StringOps;
     documentId?: string | StringOps;
     slug?: string | StringOps;
     createdAt?: string | DateOps;
@@ -66,9 +67,10 @@ 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<'id' | 'entryId' | '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>>;
+}, 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;
@@ -79,7 +81,7 @@ export type Populate<TEntry> = ReferenceField<TEntry> | readonly ReferenceField<
 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>> & {
+}, 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 {
@@ -89,7 +91,7 @@ export type PopulatedResult<TEntry extends {
 ] 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>>;
+}, 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;
 }, TFields extends Fields<T> | undefined = Fields<T> | undefined, TPopulate extends string | readonly string[] | undefined = string | readonly string[] | undefined> = {

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,11 @@ 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();
+        const identityWhere = {
+            id: '650e8400-e29b-41d4-a716-446655440000',
+            entryId: '550e8400-e29b-41d4-a716-446655440000',
+        };
+        expectTypeOf(identityWhere).toEqualTypeOf();
     });
     it('supports the reference populate pattern emitted into generated schemas', () => {
         const query = {
@@ -32,11 +34,13 @@ describe('fimo/ui public type surface', () => {
         expectTypeOf().toEqualTypeOf();
         expectTypeOf().toEqualTypeOf();
         expectTypeOf().toEqualTypeOf();
+        expectTypeOf().toEqualTypeOf();
+        expectTypeOf().toEqualTypeOf();
         // @ts-expect-error generated reference-aware queries only allow reference fields in populate.
         const badQuery = { populate: 'name' };
         expectTypeOf(badQuery).toEqualTypeOf();
-        // @ts-expect-error reference filters use target documentId strings, not raw reference objects.
-        const badWhere = { where: { sponsor: { documentId: '750e8400-e29b-41d4-a716-446655440000' } } };
+        // @ts-expect-error reference filters use target id strings, not raw reference objects.
+        const badWhere = { where: { sponsor: { id: '750e8400-e29b-41d4-a716-446655440000' } } };
         expectTypeOf(badWhere).toEqualTypeOf();
         // @ts-expect-error contains is only valid for to-many reference fields.
         const badToOneContains = { where: { sponsor: { $contains: '750e8400-e29b-41d4-a716-446655440000' } } };

package/dist/scripts/generated-types.test.js

@@ -83,7 +83,7 @@ export function renderFeatured(page: PageResult<undefined, readonly ["featured",
   for (const item of page.featured) {
     switch (item.$type) {
       case "Post":
-        out.push(\`post \${String(item.title)} by \${item.author?.documentId ?? "nobody"}\`);
+        out.push(\`post \${String(item.title)} by \${item.author?.id ?? "nobody"}\`);
         break;
       case "Video":
         out.push(\`video \${String(item.title)} with \${item.clips.length} clip(s)\`);