fimo 0.20.0 → 0.21.0-experimental.1

package/dist/runtime/content/client/internal.js

@@ -250,7 +250,7 @@ function wrapField(field, value, source, resolve) {
         // instead of `{"value":7}`, but it does NOT fix JSX rendering, and
         // `typeof`/`===`/`Number.isInteger` stay broken either way (boxed
         // primitives never satisfy those). Revisiting this needs a `<Number>`
-        // component in `fimo/ui` (none exists yet — every other wrapped type has
+        // component in `fimo-react` (none exists yet — every other wrapped type has
         // one) plus a migration path for sites already rendering numbers raw.
         default:
             return value;

package/dist/runtime/content/index.d.ts

@@ -6,10 +6,15 @@ export declare function createContentCore<T extends {
 export declare function createSingletonCore<T extends {
     id: string;
 }, TInput extends object>(config: ContentClientConfig, runtime: ContentRuntime): import("./index.js").SingletonContentCore<T, TInput>;
+export { createServerContentClient, createServerSingletonClient } from './client/server-content-client.js';
+export { createCollectionContentCore } from './client/collection-core.js';
+export { createSingletonContentCore } from './client/singleton-core.js';
+export { readCollectionLocale, splitWritePayload, withMutationLocale } from './client/internal.js';
 export type { CollectionContentCore } from './client/collection-core.js';
-export type { ContentRuntime } from './client/runtime.js';
+export { requireContentApiUrl, type ContentRuntime } from './client/runtime.js';
 export type { SingletonContentCore } from './client/singleton-core.js';
 export { serializeContent, type SerializedContent, type SerializedMedia } from './serialization.js';
+export { parseCollectionResponse, type CollectionResponse } from './parseCollectionResponse.js';
 export type { CollectionPage, CollectionPageInfo, ContentClientConfig, ContentClientHandle, ContentModuleMeta, ContentModuleRef, ContentReadOptions, ContentResult, ContentSchema, ContentSchemaField, } from './client/core-types.js';
 export { FIMO_PARTS, FIMO_SOURCE, FimoBoolean, FimoDate, FimoMedia, FimoRichText, FimoString, getFimoParts, getFimoSource, hasFimoSource, isFimoDate, isFimoString, type FimoPart, type FimoPolymorphicReference, type FimoReference, type FimoRichTextContent, type FimoSource, } from '../primitives/lib/primitives.js';
 export type { BoolOps, DateOps, Field, Fields, FilterFor, NullOnlyOps, NumberOps, Populate, Populated, PopulatedResult, Projected, ProjectedWithPopulate, Query, ReferenceField, ReferenceMap, ScalarOps, Sort, SortField, StringOps, Where, WithReferences, } from '../primitives/lib/query.js';

package/dist/runtime/content/index.js

@@ -6,5 +6,11 @@ export function createContentCore(config, runtime) {
 export function createSingletonCore(config, runtime) {
     return createSingletonContentCore(config, runtime).client;
 }
+export { createServerContentClient, createServerSingletonClient } from './client/server-content-client.js';
+export { createCollectionContentCore } from './client/collection-core.js';
+export { createSingletonContentCore } from './client/singleton-core.js';
+export { readCollectionLocale, splitWritePayload, withMutationLocale } from './client/internal.js';
+export { requireContentApiUrl } from './client/runtime.js';
 export { serializeContent } from './serialization.js';
+export { parseCollectionResponse } from './parseCollectionResponse.js';
 export { FIMO_PARTS, FIMO_SOURCE, FimoBoolean, FimoDate, FimoMedia, FimoRichText, FimoString, getFimoParts, getFimoSource, hasFimoSource, isFimoDate, isFimoString, } from '../primitives/lib/primitives.js';

package/dist/runtime/i18n/index.d.ts

@@ -0,0 +1,2 @@
+export { getFimoDefaultLocale, getFimoLocales, resolveFimoLocale, type FimoLocaleRequestLike, type FimoLocaleResolution, } from './locale.js';
+//# sourceMappingURL=index.d.ts.map

package/dist/runtime/i18n/index.js

@@ -0,0 +1 @@
+export { getFimoDefaultLocale, getFimoLocales, resolveFimoLocale, } from './locale.js';

package/dist/runtime/labels/index.d.ts

@@ -0,0 +1,3 @@
+export { createLabels, type Labels, type LabelsSnapshot } from './core.js';
+export { fetchLabels, type GetLabelsOptions } from './fetch.js';
+//# sourceMappingURL=index.d.ts.map

package/dist/runtime/labels/index.js

@@ -0,0 +1,2 @@
+export { createLabels } from './core.js';
+export { fetchLabels } from './fetch.js';

package/dist/runtime/preview/index.d.ts

@@ -0,0 +1,5 @@
+export { getSafePreviewNavigationPath, isPreviewRuntimeEnabled } from './bridge.js';
+export { getPreviewLocationChange, getPreviewLocationPath, getPreviewParentOrigin, getDocumentLocale, resolvePreviewParentOrigin, type PreviewBrowserContext, type PreviewLocationChange, type PreviewLocationLike, } from './location.js';
+export { ensurePreviewScript } from './script.js';
+export { getConfigPreviewRoutes, type PreviewRoute } from './routes.js';
+//# sourceMappingURL=index.d.ts.map

package/dist/runtime/preview/index.js

@@ -0,0 +1,4 @@
+export { getSafePreviewNavigationPath, isPreviewRuntimeEnabled } from './bridge.js';
+export { getPreviewLocationChange, getPreviewLocationPath, getPreviewParentOrigin, getDocumentLocale, resolvePreviewParentOrigin, } from './location.js';
+export { ensurePreviewScript } from './script.js';
+export { getConfigPreviewRoutes } from './routes.js';

package/dist/runtime/preview/script.d.ts

@@ -0,0 +1,3 @@
+/** Load the platform preview script once. Empty configuration keeps preview disabled. */
+export declare function ensurePreviewScript(src: string | undefined, target?: Document): boolean;
+//# sourceMappingURL=script.d.ts.map

package/dist/runtime/preview/script.js

@@ -0,0 +1,14 @@
+/** Load the platform preview script once. Empty configuration keeps preview disabled. */
+export function ensurePreviewScript(src, target = document) {
+    if (!src) {
+        return false;
+    }
+    const exists = Array.from(target.scripts).some((script) => script.getAttribute('src') === src);
+    if (!exists) {
+        const script = target.createElement('script');
+        script.src = src;
+        script.defer = true;
+        target.head.appendChild(script);
+    }
+    return true;
+}

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

@@ -1,4 +1,6 @@
 export { FimoString, FimoDate, FimoMedia, FimoBoolean, FimoRichText, type FimoPolymorphicReference, type FimoReference, type FimoSource, type FimoPart, type FimoRichTextContent, FIMO_SOURCE, FIMO_PARTS, isFimoString, isFimoDate, hasFimoSource, getFimoSource, getFimoParts, } from './primitives.js';
 export { fimo } from './template.js';
+export { renderRichTextHtml, renderRichTextHtml as renderRichText } from './render-rich-text.js';
+export { parseImageHostSuffixes, resolveImagePresentation, type ImageFit, type ImageObjectFit, type ImagePresentation, type ImagePresentationOptions, } from './image-optimization.js';
 export type { BoolOps, DateOps, Field, Fields, FilterFor, NullOnlyOps, NumberOps, Populate, Populated, PopulatedResult, ProjectedWithPopulate, Projected, Query, ReferenceField, ReferenceMap, ScalarOps, Sort, SortField, StringOps, Where, WithReferences, } from './query.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/runtime/primitives/lib/index.js

@@ -1,3 +1,5 @@
 // Fimo - Source tracking for inline editing
 export { FimoString, FimoDate, FimoMedia, FimoBoolean, FimoRichText, FIMO_SOURCE, FIMO_PARTS, isFimoString, isFimoDate, hasFimoSource, getFimoSource, getFimoParts, } from './primitives.js';
 export { fimo } from './template.js';
+export { renderRichTextHtml, renderRichTextHtml as renderRichText } from './render-rich-text.js';
+export { parseImageHostSuffixes, resolveImagePresentation, } from './image-optimization.js';

package/dist/runtime/seo/index.d.ts

@@ -1,10 +1,2 @@
-export * from './buildSeoForPath.js';
-export * from './htmlProps.js';
 export * from './resolver.js';
-export declare function loadFimoMetaData({ request }: {
-    request: Request;
-}): Promise<{
-    fimoMetaData: Record<string, unknown> | undefined;
-    fimoLocale: import("../index.js").FimoLocaleResolution;
-}>;
 //# sourceMappingURL=index.d.ts.map

package/dist/runtime/seo/index.js

@@ -1,9 +1 @@
-import { resolveFimoLocaleForUrl, resolveMetaEntries } from '../app/prefetch.js';
-export * from './buildSeoForPath.js';
-export * from './htmlProps.js';
 export * from './resolver.js';
-export async function loadFimoMetaData({ request }) {
-    const fimoMetaData = await resolveMetaEntries(request.url);
-    const fimoLocale = resolveFimoLocaleForUrl(request.url);
-    return { fimoMetaData, fimoLocale };
-}

package/dist/runtime/shared/config.d.ts

@@ -0,0 +1,6 @@
+export { getConfigServer, getConfigVersion } from './fimo-config.server.js';
+export { resolveFimoConfigPath } from './fimo-config.server.js';
+export type { FimoConfig, FimoFramework, FimoHostingConfig, FimoI18nConfig, FimoRouteConfig, FimoRuntimeConfig, FimoSEO, RouteSEO, } from './fimo-config.types.js';
+export { getFimoDefaultLocale, getFimoLocales, getFimoTextDirection, normalizeFimoLocale, localizeFimoPath, resolveFimoLocale, toHtmlLang, type FimoLocaleRequestLike, type FimoLocaleResolution, } from '../i18n/locale.js';
+export { findStaleFimoOverride, resolveLocalRuntimeEnv, staleOverrideMessage, type LocalProjectLink, type LocalRuntimeEnv, type LocalRuntimeEnvSource, } from './local-runtime-env.js';
+//# sourceMappingURL=config.d.ts.map

package/dist/runtime/shared/config.js

@@ -0,0 +1,4 @@
+export { getConfigServer, getConfigVersion } from './fimo-config.server.js';
+export { resolveFimoConfigPath } from './fimo-config.server.js';
+export { getFimoDefaultLocale, getFimoLocales, getFimoTextDirection, normalizeFimoLocale, localizeFimoPath, resolveFimoLocale, toHtmlLang, } from '../i18n/locale.js';
+export { findStaleFimoOverride, resolveLocalRuntimeEnv, staleOverrideMessage, } from './local-runtime-env.js';

package/dist/runtime/shared/local-runtime-env.d.ts

@@ -12,8 +12,8 @@
  * job and is the same everywhere: a variable the user (or the sandbox) already
  * set is left alone; derivation fills the rest, one variable at a time.
  *
- * Shared by the CLI, `fimo/vite`, and `fimo/next/config` so the three can
- * never disagree about which env the app is calling.
+ * Shared by the CLI, framework build connectors, and the `fimo-next` server
+ * runtime so they cannot disagree about which env the app is calling.
  */
 export type LocalRuntimeEnvSource = 'branch' | 'fallback';
 export interface LocalRuntimeEnv {

package/dist/runtime/shared/local-runtime-env.js

@@ -12,8 +12,8 @@
  * job and is the same everywhere: a variable the user (or the sandbox) already
  * set is left alone; derivation fills the rest, one variable at a time.
  *
- * Shared by the CLI, `fimo/vite`, and `fimo/next/config` so the three can
- * never disagree about which env the app is calling.
+ * Shared by the CLI, framework build connectors, and the `fimo-next` server
+ * runtime so they cannot disagree about which env the app is calling.
  */
 import { execFileSync } from 'node:child_process';
 import fs from 'node:fs';
@@ -87,11 +87,13 @@ export function readLocalEnvFiles(cwd) {
     const root = findProjectRoot(cwd) ?? cwd;
     const values = {};
     for (const file of ['.env', '.env.local']) {
-        const filePath = path.join(root, file);
-        if (!fs.existsSync(filePath)) {
+        // The checkout's env files are read at runtime, never bundled: without
+        // the opt-out Turbopack traces the whole project into the server output.
+        const filePath = path.join(/* turbopackIgnore: true */ root, file);
+        if (!fs.existsSync(/* turbopackIgnore: true */ filePath)) {
             continue;
         }
-        for (const line of fs.readFileSync(filePath, 'utf-8').split(/\r?\n/)) {
+        for (const line of fs.readFileSync(/* turbopackIgnore: true */ filePath, 'utf-8').split(/\r?\n/)) {
             const trimmed = line.trim();
             if (!trimmed || trimmed.startsWith('#')) {
                 continue;

package/dist/runtime/templates.d.ts

@@ -82,10 +82,26 @@ interface PkgWithScripts {
  */
 export declare function rewriteFimoValidateCommand(pkg: PkgWithScripts, pin?: string | null): boolean;
 /**
- * Rewrite `fimo` (in dependencies + devDependencies) to the current pin. Only
- * touches entries that look like a value we own: the template's dist-tag, an old
- * tarball URL, an exact/ranged semver, or a local `file:` dependency. Bespoke
- * values are left alone.
+ * Packages released together with `fimo` at the same version. A project pins
+ * only the ones it uses; every pin is derived from the `fimo` pin so the
+ * platform keeps a single version selector (FIMO-1635).
+ */
+export declare const FIMO_PACKAGES: readonly ['fimo', 'fimo-sveltekit', 'fimo-astro', 'fimo-vite', 'fimo-react', 'fimo-react-router', 'fimo-next'];
+export type FimoPackage = (typeof FIMO_PACKAGES)[number];
+/**
+ * Pin for a companion package given the `fimo` pin. Semver and dist-tags carry
+ * over unchanged (fixed-version group). Source checkouts map
+ * `file:<checkout>/apps/cli` to `file:<checkout>/packages/<name>`, and R2 dev
+ * tarballs `…/cli/fimo-<id>.tgz` to `…/cli/<name>-<id>.tgz`, both of which the
+ * publish scripts guarantee to exist side by side. Returns null when the pin
+ * has a shape this convention cannot follow.
+ */
+export declare function deriveFimoPackagePin(name: FimoPackage, fimoPin: string): string | null;
+/**
+ * Rewrite `fimo` and any companion packages present (in dependencies +
+ * devDependencies) to the current pin. Only touches entries that look like a
+ * value we own: the template's dist-tag, an old tarball URL, an exact/ranged
+ * semver, or a local `file:` dependency. Bespoke values are left alone.
  *
  * Returns true if anything changed.
  */

package/dist/runtime/templates.js

@@ -198,10 +198,46 @@ export function rewriteFimoValidateCommand(pkg, pin = resolveFimoPin()) {
     return true;
 }
 /**
- * Rewrite `fimo` (in dependencies + devDependencies) to the current pin. Only
- * touches entries that look like a value we own: the template's dist-tag, an old
- * tarball URL, an exact/ranged semver, or a local `file:` dependency. Bespoke
- * values are left alone.
+ * Packages released together with `fimo` at the same version. A project pins
+ * only the ones it uses; every pin is derived from the `fimo` pin so the
+ * platform keeps a single version selector (FIMO-1635).
+ */
+export const FIMO_PACKAGES = [
+    'fimo',
+    'fimo-sveltekit',
+    'fimo-astro',
+    'fimo-vite',
+    'fimo-react',
+    'fimo-react-router',
+    'fimo-next',
+];
+/**
+ * Pin for a companion package given the `fimo` pin. Semver and dist-tags carry
+ * over unchanged (fixed-version group). Source checkouts map
+ * `file:<checkout>/apps/cli` to `file:<checkout>/packages/<name>`, and R2 dev
+ * tarballs `…/cli/fimo-<id>.tgz` to `…/cli/<name>-<id>.tgz`, both of which the
+ * publish scripts guarantee to exist side by side. Returns null when the pin
+ * has a shape this convention cannot follow.
+ */
+export function deriveFimoPackagePin(name, fimoPin) {
+    if (name === 'fimo') {
+        return fimoPin;
+    }
+    if (fimoPin.startsWith('file:')) {
+        const match = fimoPin.slice('file:'.length).match(/^(.*?)([\\/])apps\2cli\2?$/);
+        return match ? `file:${match[1]}${match[2]}packages${match[2]}${name}` : null;
+    }
+    if (/^https?:\/\//.test(fimoPin)) {
+        const match = fimoPin.match(/^(.*\/cli\/)fimo-([^/]+\.tgz)$/);
+        return match ? `${match[1]}${name}-${match[2]}` : null;
+    }
+    return fimoPin;
+}
+/**
+ * Rewrite `fimo` and any companion packages present (in dependencies +
+ * devDependencies) to the current pin. Only touches entries that look like a
+ * value we own: the template's dist-tag, an old tarball URL, an exact/ranged
+ * semver, or a local `file:` dependency. Bespoke values are left alone.
  *
  * Returns true if anything changed.
  */
@@ -215,20 +251,26 @@ export function rewriteFimoDep(pkg, pin = resolveFimoPin()) {
         if (!deps) {
             continue;
         }
-        const current = deps['fimo'];
-        if (typeof current !== 'string') {
-            continue;
-        }
-        // Migrate projects still pinned to the retired R2 tarball, repin a semver,
-        // rewrite the committed template's dist-tag, or (dev flow) swap a local
-        // `file:` build for a published version on deploy.
-        const looksLikeLegacyR2 = current.includes('r2.dev/cli/fimo-');
-        const looksLikeLocalFile = current.startsWith('file:');
-        const looksLikeSemver = /^[\^~]?\d+\.\d+\.\d+/.test(current);
-        const looksLikeOwnedDistTag = current === 'latest' || current === 'staging' || current === 'experimental';
-        if ((looksLikeLegacyR2 || looksLikeLocalFile || looksLikeSemver || looksLikeOwnedDistTag) && current !== pin) {
-            deps['fimo'] = pin;
-            changed = true;
+        for (const name of FIMO_PACKAGES) {
+            const current = deps[name];
+            if (typeof current !== 'string') {
+                continue;
+            }
+            const target = deriveFimoPackagePin(name, pin);
+            if (!target) {
+                continue;
+            }
+            // Migrate projects still pinned to the retired R2 tarball, repin a semver,
+            // rewrite the committed template's dist-tag, or (dev flow) swap a local
+            // `file:` build for a published version on deploy.
+            const looksLikeLegacyR2 = current.includes(`r2.dev/cli/${name}-`);
+            const looksLikeLocalFile = current.startsWith('file:');
+            const looksLikeSemver = /^[\^~]?\d+\.\d+\.\d+/.test(current);
+            const looksLikeOwnedDistTag = current === 'latest' || current === 'staging' || current === 'experimental';
+            if ((looksLikeLegacyR2 || looksLikeLocalFile || looksLikeSemver || looksLikeOwnedDistTag) && current !== target) {
+                deps[name] = target;
+                changed = true;
+            }
         }
     }
     return changed;

package/dist/scripts/extract-translations.js

@@ -48,7 +48,10 @@ function extractFromModule(filePath, code, parsePath = filePath) {
     const declarations = [];
     const result = parseSync(parsePath, code);
     const ast = result.program;
-    const fimoLabelNames = importedNames(ast.body, 'fimo/ui', 'Label');
+    const fimoLabelNames = new Set([
+        ...importedNames(ast.body, 'fimo-react', 'Label'),
+        ...importedNames(ast.body, 'fimo/ui', 'Label'),
+    ]);
     function visit(node) {
         if (!node || typeof node !== 'object') {
             return;
@@ -107,8 +110,10 @@ function extractFromSvelte(filePath, code) {
     const markup = code
         .replace(SVELTE_SCRIPT, (_script, contents) => {
         const ast = parseSync(`${filePath}.ts`, contents).program;
-        for (const name of importedNames(ast.body, 'fimo/sveltekit/components', 'Label')) {
-            labelNames.add(name);
+        for (const moduleName of ['fimo-sveltekit/components', 'fimo/sveltekit/components']) {
+            for (const name of importedNames(ast.body, moduleName, 'Label')) {
+                labelNames.add(name);
+            }
         }
         declarations.push(...extractFromModule(filePath, contents, `${filePath}.ts`));
         return '';

package/dist/scripts/index.d.ts

@@ -0,0 +1,3 @@
+export { syncSchemas, type SyncSchemasOptions } from './sync-schemas.js';
+export { syncForms, type SyncFormsOptions } from './sync-forms.js';
+export type { SyncResult } from './sync-schemas.js';

package/dist/scripts/index.js

@@ -0,0 +1,2 @@
+export { syncSchemas } from './sync-schemas.js';
+export { syncForms } from './sync-forms.js';

package/dist/scripts/sync-forms.js

@@ -45,8 +45,12 @@ function frameworkFormsTarget(framework) {
         return 'sveltekit';
     return null;
 }
-function hasPackageExport(cwd, subpath) {
-    const packagePath = join(cwd, 'node_modules', 'fimo', 'package.json');
+/** `<package>` or `<package>/<subpath>`, as it would be written in an import. */
+function hasPackageExport(cwd, entry) {
+    const slash = entry.indexOf('/');
+    const name = slash === -1 ? entry : entry.slice(0, slash);
+    const subpath = slash === -1 ? '.' : `.${entry.slice(slash)}`;
+    const packagePath = join(cwd, 'node_modules', name, 'package.json');
     if (!existsSync(packagePath))
         return false;
     try {
@@ -57,25 +61,33 @@ function hasPackageExport(cwd, subpath) {
         return false;
     }
 }
+function requiredFormEntries(target) {
+    if (target === 'next')
+        return ['fimo/forms', 'fimo-next', 'fimo-next/client'];
+    // SvelteKit's runtime ships as its own package (FIMO-1635); `fimo/forms`
+    // still types the client the generated module accepts.
+    if (target === 'sveltekit')
+        return ['fimo/forms', 'fimo-sveltekit'];
+    return ['fimo/forms', `fimo/${target}`];
+}
 function assertFrameworkRuntime(cwd, target) {
-    const requiredExports = target === 'next' ? ['./forms', './next', './next/client'] : ['./forms', `./${target}`];
-    const missing = requiredExports.filter((subpath) => !hasPackageExport(cwd, subpath));
+    const missing = requiredFormEntries(target).filter((entry) => !hasPackageExport(cwd, entry));
     if (missing.length === 0)
         return;
-    throw new Error(`Cannot generate ${target} form clients because the project-local fimo package is missing ${missing.join(', ')}. ` +
-        'Install the current fimo package, then run `fimo validate` again. No generated files were changed.');
+    throw new Error(`Cannot generate ${target} form clients because the project cannot resolve ${missing.join(', ')}. ` +
+        'Install the current Fimo packages, then run `fimo validate` again. No generated files were changed.');
 }
 function generatedFormFiles(target) {
     if (target === 'next') {
         return [
-            { suffix: '.ts', runtimeImport: 'fimo/next' },
-            { suffix: '.client.ts', runtimeImport: 'fimo/next/client', clientDirective: "'use client';" },
+            { suffix: '.ts', runtimeImport: 'fimo-next' },
+            { suffix: '.client.ts', runtimeImport: 'fimo-next/client', clientDirective: "'use client';" },
         ];
     }
     if (target === 'astro')
         return [{ suffix: '.ts', runtimeImport: 'fimo/astro' }];
     if (target === 'sveltekit')
-        return [{ suffix: '.ts', runtimeImport: 'fimo/sveltekit' }];
+        return [{ suffix: '.ts', runtimeImport: 'fimo-sveltekit' }];
     return [];
 }
 export function syncForms(options = {}) {