fimo 0.11.0 → 0.12.0-staging.1

package/dist/runtime/next/client.d.ts

@@ -0,0 +1,16 @@
+import type { CollectionContentClient, ContentClientConfig, SingletonContentClient } from '../content/client/types.js';
+export declare function createContentClient<T extends {
+    id: string;
+}, TInput extends object>(config: ContentClientConfig): CollectionContentClient<T, TInput>;
+export declare function createSingletonClient<T extends {
+    id: string;
+}, TInput extends object>(config: ContentClientConfig): SingletonContentClient<T, TInput>;
+export type { CollectionContentClient, InfiniteListResult, SingletonContentClient } from '../content/client/types.js';
+export { createContentCore, createSingletonCore } from '../content/index.js';
+export type { CollectionContentCore, CollectionPage, CollectionPageInfo, ContentClientConfig, ContentClientHandle, ContentModuleMeta, ContentModuleRef, ContentReadOptions, ContentResult, ContentRuntime, ContentSchema, ContentSchemaField, SingletonContentCore, } from '../content/index.js';
+export { FIMO_PARTS, FIMO_SOURCE, FimoBoolean, FimoDate, FimoMedia, FimoRichText, FimoString, getFimoParts, getFimoSource, hasFimoSource, isFimoDate, isFimoString, } from '../content/index.js';
+export { Text } from '../primitives/components/Text.js';
+export type { BoolOps, DateOps, Field, Fields, FilterFor, FimoPart, FimoPolymorphicReference, FimoReference, FimoRichTextComponents, FimoRichTextContent, FimoRichTextMarkProps, FimoRichTextNodeProps, FimoSource, NullOnlyOps, NumberOps, Populate, Populated, PopulatedResult, Projected, ProjectedWithPopulate, Query, ReferenceField, ReferenceMap, ScalarOps, Sort, SortField, StringOps, Where, WithReferences, } from '../content/index.js';
+export { FimoNextProvider } from './provider.js';
+export type { FimoNextProviderProps } from './provider.js';
+//# sourceMappingURL=client.d.ts.map

package/dist/runtime/next/client.js

@@ -0,0 +1,15 @@
+'use client';
+import { createReactContentClient } from '../content/client/react-content-client.js';
+import { createReactSingletonClient } from '../content/client/react-singleton-client.js';
+import { nextClientContentRuntime } from './client-runtime.js';
+import { useNextContentLocale } from './provider.js';
+export function createContentClient(config) {
+    return createReactContentClient(config, nextClientContentRuntime, useNextContentLocale);
+}
+export function createSingletonClient(config) {
+    return createReactSingletonClient(config, nextClientContentRuntime, useNextContentLocale);
+}
+export { createContentCore, createSingletonCore } from '../content/index.js';
+export { FIMO_PARTS, FIMO_SOURCE, FimoBoolean, FimoDate, FimoMedia, FimoRichText, FimoString, getFimoParts, getFimoSource, hasFimoSource, isFimoDate, isFimoString, } from '../content/index.js';
+export { Text } from '../primitives/components/Text.js';
+export { FimoNextProvider } from './provider.js';

package/dist/runtime/next/provider.d.ts

@@ -0,0 +1,10 @@
+import { QueryClient } from '@tanstack/react-query';
+import { type ReactNode } from 'react';
+export interface FimoNextProviderProps {
+    children: ReactNode;
+    locale?: string;
+    queryClient?: QueryClient;
+}
+export declare function FimoNextProvider({ children, locale, queryClient }: FimoNextProviderProps): import("react/jsx-runtime").JSX.Element;
+export declare function useNextContentLocale(requestedLocale: string | undefined, defaultLocale: string): string;
+//# sourceMappingURL=provider.d.ts.map

package/dist/runtime/next/provider.js

@@ -0,0 +1,12 @@
+'use client';
+import { jsx as _jsx } from "react/jsx-runtime";
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import { createContext, useContext, useState } from 'react';
+const FimoNextLocaleContext = createContext(undefined);
+export function FimoNextProvider({ children, locale, queryClient }) {
+    const [client] = useState(() => queryClient ?? new QueryClient());
+    return (_jsx(FimoNextLocaleContext.Provider, { value: locale, children: _jsx(QueryClientProvider, { client: client, children: children }) }));
+}
+export function useNextContentLocale(requestedLocale, defaultLocale) {
+    return requestedLocale ?? useContext(FimoNextLocaleContext) ?? defaultLocale;
+}

package/dist/runtime/next/server-runtime.d.ts

@@ -0,0 +1,3 @@
+import { type ContentRuntime } from '../content/client/runtime.js';
+export declare const nextServerContentRuntime: ContentRuntime;
+//# sourceMappingURL=server-runtime.d.ts.map

package/dist/runtime/next/server-runtime.js

@@ -0,0 +1,20 @@
+import { requireContentApiUrl } from '../content/client/runtime.js';
+export const nextServerContentRuntime = {
+    apiBase() {
+        return requireContentApiUrl(process.env.FIMO_API_URL ?? process.env.NEXT_PUBLIC_FIMO_API_URL, 'FIMO_API_URL or NEXT_PUBLIC_FIMO_API_URL');
+    },
+    defaultLocale() {
+        return process.env.FIMO_DEFAULT_LOCALE?.trim() || process.env.NEXT_PUBLIC_FIMO_DEFAULT_LOCALE?.trim() || 'en';
+    },
+    headers(extra) {
+        const headers = { ...extra };
+        const env = process.env.FIMO_ENV?.trim() || process.env.NEXT_PUBLIC_FIMO_ENV?.trim();
+        if (env) {
+            headers['X-Fimo-Env'] = env;
+        }
+        return headers;
+    },
+    fetch(input, init) {
+        return globalThis.fetch(input, init);
+    },
+};

package/dist/runtime/next/server.d.ts

@@ -0,0 +1,11 @@
+import type { CollectionContentClient, ContentClientConfig, SingletonContentClient } from '../content/client/types.js';
+export { Text } from './Text.js';
+export declare function createContentClient<T extends {
+    id: string;
+}, TInput extends object>(config: ContentClientConfig): CollectionContentClient<T, TInput>;
+export declare function createSingletonClient<T extends {
+    id: string;
+}, TInput extends object>(config: ContentClientConfig): SingletonContentClient<T, TInput>;
+export type { CollectionContentClient, InfiniteListResult, SingletonContentClient } from '../content/client/types.js';
+export * from '../content/index.js';
+//# sourceMappingURL=server.d.ts.map

package/dist/runtime/next/server.js

@@ -0,0 +1,10 @@
+import { createServerContentClient, createServerSingletonClient } from '../content/client/server-content-client.js';
+import { nextServerContentRuntime } from './server-runtime.js';
+export { Text } from './Text.js';
+export function createContentClient(config) {
+    return createServerContentClient(config, nextServerContentRuntime);
+}
+export function createSingletonClient(config) {
+    return createServerSingletonClient(config, nextServerContentRuntime);
+}
+export * from '../content/index.js';

package/dist/runtime/primitives/components/Text.d.ts

@@ -1,5 +1,5 @@
 import { type ComponentPropsWithoutRef, type ElementType, type ReactNode } from 'react';
-type TextProps<T extends ElementType = 'span'> = {
+export type TextProps<T extends ElementType = 'span'> = {
     value: unknown;
     as?: T;
     children?: (value: string) => ReactNode;
@@ -20,5 +20,4 @@ type TextProps<T extends ElementType = 'span'> = {
  * <Text value={product.price}>{(p) => `$${Number(p).toLocaleString()}`}</Text>
  */
 export declare function Text<T extends ElementType = 'span'>({ value, as, children, ...props }: TextProps<T>): import("react/jsx-runtime").JSX.Element;
-export {};
 //# sourceMappingURL=Text.d.ts.map

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

@@ -67,7 +67,7 @@ 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>;
+type EntryIdentityField<T> = Extract<'id' | 'entryId' | 'documentId' | 'locale' | '__fimo', keyof T>;
 export type Projected<T extends {
     id: string;
 }, TFields extends Fields<T> | undefined> = [TFields] extends [undefined] ? T : Pick<T, EntryIdentityField<T> | Extract<SelectedFields<TFields>, keyof T>>;

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

@@ -9,14 +9,12 @@ import { type RefObject } from 'react';
  * preview knows to dispatch events instead of falling back to raw DOM writes,
  * and updates internal state when a mutation arrives.
  *
- * In prod (published app): Vite statically inlines `import.meta.env.DEV`, so
- * `useFimoLiveValueProd` is the only implementation linked and the listener
- * machinery is dead-code-eliminated.
+ * The subscription is framework-neutral: Vite and Next.js render the same
+ * primitives, and environments that never dispatch `fimo:live-edit` simply
+ * keep mirroring the external value.
  */
-declare function useFimoLiveValueDev<T, E extends HTMLElement = HTMLElement>(external: T): {
+export declare function useFimoLiveValue<T, E extends HTMLElement = HTMLElement>(external: T): {
     value: T;
     ref: RefObject<E | null>;
 };
-export declare const useFimoLiveValue: typeof useFimoLiveValueDev;
-export {};
 //# sourceMappingURL=useFimoLiveValue.d.ts.map

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

@@ -1,4 +1,3 @@
-/// <reference types="vite/client" />
 import { useEffect, useRef, useState } from 'react';
 /**
  * useFimoLiveValue — mirror a Fimo value into React state so live edits
@@ -10,11 +9,11 @@ import { useEffect, useRef, useState } from 'react';
  * preview knows to dispatch events instead of falling back to raw DOM writes,
  * and updates internal state when a mutation arrives.
  *
- * In prod (published app): Vite statically inlines `import.meta.env.DEV`, so
- * `useFimoLiveValueProd` is the only implementation linked and the listener
- * machinery is dead-code-eliminated.
+ * The subscription is framework-neutral: Vite and Next.js render the same
+ * primitives, and environments that never dispatch `fimo:live-edit` simply
+ * keep mirroring the external value.
  */
-function useFimoLiveValueDev(external) {
+export function useFimoLiveValue(external) {
     const ref = useRef(null);
     const [value, setValue] = useState(external);
     const externalRef = useRef(external);
@@ -42,8 +41,3 @@ function useFimoLiveValueDev(external) {
     }, []);
     return { value, ref };
 }
-function useFimoLiveValueProd(external) {
-    const ref = useRef(null);
-    return { value: external, ref };
-}
-export const useFimoLiveValue = (import.meta.env.DEV ? useFimoLiveValueDev : useFimoLiveValueProd);

package/dist/scripts/sync-schemas.js

@@ -5,8 +5,8 @@ import { basename, dirname, join, resolve } from 'node:path';
  * hook files generated from the hooks template.
  *
  * - Scans `<cwd>/src/schemas/*.json`.
- * - Renders `assets/content-templates/types-template.eta` and `hooks-template.eta`.
- * - Creates/updates `<cwd>/src/schemas/<Pascal>.types.ts` and `<Pascal>.ts`; deletes orphans.
+ * - Renders the shared types plus either the Vite facade or the split Next server/client facades.
+ * - Creates/updates `<Pascal>.types.ts` and `<Pascal>.ts`, plus `<Pascal>.client.ts` for Next; deletes orphans.
  */
 import { pascalCase } from 'change-case';
 import { Eta } from 'eta';
@@ -81,6 +81,32 @@ function resolveProjectRuntime(cwd) {
     }
     return { packageRoot: dirname(packagePath), version };
 }
+function resolveContentRuntimeImport(cwd) {
+    const packagePath = join(cwd, 'package.json');
+    if (!existsSync(packagePath)) {
+        return 'fimo/ui';
+    }
+    let packageJson;
+    try {
+        packageJson = JSON.parse(readFileSync(packagePath, 'utf-8'));
+    }
+    catch {
+        return 'fimo/ui';
+    }
+    if (!packageJson || typeof packageJson !== 'object' || Array.isArray(packageJson)) {
+        return 'fimo/ui';
+    }
+    const manifest = packageJson;
+    const dependencyGroups = ['dependencies', 'devDependencies', 'peerDependencies'];
+    const usesNext = dependencyGroups.some((group) => {
+        const dependencies = manifest[group];
+        return Boolean(dependencies &&
+            typeof dependencies === 'object' &&
+            !Array.isArray(dependencies) &&
+            typeof dependencies.next === 'string');
+    });
+    return usesNext ? 'fimo/next' : 'fimo/ui';
+}
 function templatePath(runtime, fileName) {
     if (runtime && !isVersionAtLeast(runtime.version, MINIMUM_THIN_CONTENT_CLIENT_RUNTIME_VERSION)) {
         return join(runtime.packageRoot, 'assets', 'content-templates', fileName);
@@ -115,11 +141,11 @@ function loadSchemas(schemaFiles) {
         }
         const candidate = parsed;
         if (typeof candidate.uid !== 'string' || candidate.uid.length === 0) {
-            errors.push(`${basename(path)} is missing \"uid\". Set it to \"${fileUid}\".`);
+            errors.push(`${basename(path)} is missing "uid". Set it to "${fileUid}".`);
             continue;
         }
         if (candidate.uid !== fileUid) {
-            errors.push(`${basename(path)} declares uid \"${candidate.uid}\". It must match the file name \"${fileUid}\".`);
+            errors.push(`${basename(path)} declares uid "${candidate.uid}". It must match the file name "${fileUid}".`);
             continue;
         }
         const validation = SCHEMA_DEFINITION_SCHEMA.safeParse(candidate);
@@ -212,16 +238,41 @@ export function syncSchemas(options = {}) {
     const schemas = loadSchemas(schemaFiles);
     const generatedFilesOnDisk = getGeneratedFiles(schemasDir);
     const runtime = schemas.length > 0 || generatedFilesOnDisk.length > 0 ? resolveProjectRuntime(cwd) : null;
-    const templates = [
-        {
-            suffix: '.types.ts',
-            path: templatePath(runtime, 'types-template.eta'),
-        },
-        {
-            suffix: '.ts',
-            path: templatePath(runtime, 'hooks-template.eta'),
-        },
-    ].map((template) => ({
+    const runtimeImport = resolveContentRuntimeImport(cwd);
+    const usesCurrentNextRuntime = runtimeImport === 'fimo/next' &&
+        runtime !== null &&
+        isVersionAtLeast(runtime.version, MINIMUM_THIN_CONTENT_CLIENT_RUNTIME_VERSION);
+    const templates = usesCurrentNextRuntime
+        ? [
+            {
+                suffix: '.types.ts',
+                path: templatePath(runtime, 'types-template.eta'),
+                runtimeImport: 'fimo/next',
+            },
+            {
+                suffix: '.ts',
+                path: templatePath(runtime, 'next-server-template.eta'),
+                runtimeImport: 'fimo/next',
+            },
+            {
+                suffix: '.client.ts',
+                path: templatePath(runtime, 'next-client-template.eta'),
+                runtimeImport: 'fimo/next/client',
+            },
+        ]
+        : [
+            {
+                suffix: '.types.ts',
+                path: templatePath(runtime, 'types-template.eta'),
+                runtimeImport,
+            },
+            {
+                suffix: '.ts',
+                path: templatePath(runtime, 'hooks-template.eta'),
+                runtimeImport,
+            },
+        ];
+    const loadedTemplates = templates.map((template) => ({
         ...template,
         source: readFileSync(template.path, 'utf-8'),
     }));
@@ -234,10 +285,10 @@ export function syncSchemas(options = {}) {
     let deleted = 0;
     for (const { pascal, schema } of schemas) {
         const model = schemaToModel(schema, localizedByUid);
-        for (const template of templates) {
+        for (const template of loadedTemplates) {
             const tsPath = join(schemasDir, `${pascal}${template.suffix}`);
             expectedTsFiles.add(tsPath);
-            generatedFiles.set(tsPath, eta.renderString(template.source, { model }));
+            generatedFiles.set(tsPath, eta.renderString(template.source, { model, runtimeImport: template.runtimeImport }));
         }
     }
     for (const [tsPath, content] of generatedFiles) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fimo",
-  "version": "0.11.0",
+  "version": "0.12.0-staging.1",
   "description": "Fimo CLI - create, deploy, and manage Fimo projects",
   "bin": {
     "fimo": "dist/cli/index.js"
@@ -22,6 +22,18 @@
       "types": "./dist/runtime/index.d.ts",
       "import": "./dist/runtime/index.js"
     },
+    "./content": {
+      "types": "./dist/runtime/content/index.d.ts",
+      "import": "./dist/runtime/content/index.js"
+    },
+    "./next": {
+      "types": "./dist/runtime/next/server.d.ts",
+      "import": "./dist/runtime/next/server.js"
+    },
+    "./next/client": {
+      "types": "./dist/runtime/next/client.d.ts",
+      "import": "./dist/runtime/next/client.js"
+    },
     "./react-router": {
       "types": "./dist/runtime/react-router/index.d.ts",
       "import": "./dist/runtime/react-router/index.js"
@@ -63,6 +75,7 @@
     "publish:dry-run": "npm publish --dry-run",
     "postinstall": "node scripts/postinstall.mjs",
     "test": "vitest run",
+    "test:integration:next": "vitest run --config vitest.integration.config.ts",
     "test:watch": "vitest",
     "clean": "rm -rf dist *.tsbuildinfo"
   },

package/release.json

@@ -1,5 +1,5 @@
 {
   "source": "npm",
-  "apiUrl": "https://api.fimo.ai",
-  "webUrl": "https://fimo.ai"
+  "apiUrl": "https://api.staging.fimo.team",
+  "webUrl": "https://staging.fimo.team"
 }

package/templates/react-router/package.json

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