fimo 0.6.0 → 0.7.0-experimental.1

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

@@ -37,6 +37,8 @@ describe('syncSchemas', () => {
         const post = readFileSync(join(scratch, 'src/schemas/Post.ts'), 'utf-8');
         const postTypes = readFileSync(join(scratch, 'src/schemas/Post.types.ts'), 'utf-8');
         expect(post).toContain('import { wrapWithSource as wrapAuthorWithSource } from "./Author";');
+        expect(post).toContain('isPopulatedEntry(value) ? wrapAuthorWithSource(value) : value');
+        expect(post).toContain('function isPopulatedEntry(value: unknown): value is PopulatedEntryRecord');
         expect(post).toContain('import type { Post, PostInput, PostPopulate, PostResult, PostFields, PostQuery } from "./Post.types";');
         expect(post).toContain('from "./Post.types";');
         expect(post).not.toContain('import type { Author } from "./Author";');
@@ -47,9 +49,22 @@ describe('syncSchemas', () => {
         expect(post).toContain('wrapAuthorWithSource(value)');
         expect(post).toContain('wrapWithSource(value)');
         expect(post).toContain('export async function create(payload: PostInput): Promise<Post>');
+        expect(post).toContain('export async function getById');
+        expect(post).toContain('string | { id: string; locale?: string }');
+        expect(post).toContain('typeof value === "string"');
+        expect(post).toContain('/entries/Post/');
+        expect(post).not.toContain('/v2/entries');
         expect(post).toContain('return wrapWithSource(data.data);');
+        expect(post).toContain('mutationFn   : (payload) => create(withMutationLocale(payload, activeLocale))');
+        expect(post).toContain('mutationFn   : ({ id, ...patch }) => update(id, withMutationLocale(patch, activeLocale))');
+        expect(post).toContain('qk.byId(vars.id, { locale: vars.locale ?? activeLocale })');
+        expect(post).toContain('{ ...value, locale: value.locale ?? activeLocale }');
         expect(postTypes).toContain('import type { Author } from "./Author.types";');
         expect(postTypes).toContain('export interface Post extends WithReferences<PostReferences>');
+        expect(postTypes).toContain('  id: string;');
+        expect(postTypes).toContain('  entryId: string;');
+        expect(postTypes).toContain('  documentId: string;');
+        expect(postTypes).toContain('  locale: string;');
         expect(postTypes).toContain('type FimoReference');
         expect(postTypes).toContain('author: FimoReference | null;');
         expect(postTypes).toContain('contributors: FimoReference[];');
@@ -63,7 +78,7 @@ describe('syncSchemas', () => {
         expect(postTypes).toContain('export type PostResult<');
         expect(postTypes).not.toContain('PostPopulated');
     });
-    it('generates locale-free shared types and locale-sensitive populated target keys', () => {
+    it('generates effective-locale shared types and locale-sensitive populated target keys', () => {
         writeSchema('Homepage', {
             uid: 'Homepage',
             name: 'Homepages',
@@ -88,15 +103,15 @@ describe('syncSchemas', () => {
         const settings = readFileSync(join(scratch, 'src/schemas/Settings.ts'), 'utf-8');
         const settingsTypes = readFileSync(join(scratch, 'src/schemas/Settings.types.ts'), 'utf-8');
         const homepageTypes = readFileSync(join(scratch, 'src/schemas/Homepage.types.ts'), 'utf-8');
-        expect(settingsTypes).not.toContain('locale: string;');
+        expect(settingsTypes).toContain('locale: string;');
         expect(settingsTypes).not.toContain('locale?: string;');
         expect(homepageTypes).toContain('locale: string;');
         expect(settings).toContain('const LOCALIZED_CONTENT = false;');
         expect(settings).toContain('const LOCALIZED_REFERENCE_FIELDS = new Set<string>(["homepage"]);');
-        expect(settings).not.toContain('    locale: entry.locale,');
+        expect(settings).toContain('    locale,');
         expect(settings).toContain('readLocale(params, LOCALIZED_CONTENT, useQueryLocale(params.locale))');
         expect(settings.match(/readLocale\(params, LOCALIZED_CONTENT, useQueryLocale\(params\.locale\)\)/g)?.length).toBe(4);
-        expect(settings.match(/readLocale\(options, false, useQueryLocale\(options\.locale\)\)/g)?.length).toBe(2);
+        expect(settings.match(/const locale = useQueryLocale\(options\.locale\);/g)?.length).toBe(2);
     });
     it('generates singleton document APIs without collection mutations', () => {
         writeSchema('Settings', {
@@ -110,7 +125,12 @@ describe('syncSchemas', () => {
         const settings = readFileSync(join(scratch, 'src/schemas/Settings.ts'), 'utf-8');
         const settingsTypes = readFileSync(join(scratch, 'src/schemas/Settings.types.ts'), 'utf-8');
         expect(settings).toContain('fetch(`${base}${withReadOptions(`/documents/Settings`, options)}`');
+        expect(settings).toContain('`Settings.id:${id}:${encodeURIComponent(locale)}`');
+        expect(settingsTypes).toContain('id: string;');
+        expect(settingsTypes).toContain('entryId: string;');
+        expect(settingsTypes).toContain('locale?: string;');
         expect(settings).toContain('export async function update(payload: Partial<SettingsInput>)');
+        expect(settings).toContain('mutationFn: (payload) => update(withMutationLocale(payload, activeLocale))');
         expect(settings).toContain('export function useSuspenseGet');
         expect(settings).not.toContain('export async function create(');
         expect(settings).not.toContain('export async function remove(');

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

@@ -117,14 +117,14 @@ describe('validateSchemas', () => {
             'Bad.json': {
                 uid: 'Bad',
                 name: 'Bad',
-                fields: Object.fromEntries(['id', 'documentId', 'slug', 'locale', 'createdAt', 'updatedAt', '__fimo'].map((name) => [
+                fields: Object.fromEntries(['id', 'entryId', 'documentId', 'slug', 'locale', 'createdAt', 'updatedAt', '__fimo'].map((name) => [
                     name,
                     { type: 'string' },
                 ])),
             },
         });
         const { errors } = validateSchemas({ cwd });
-        expect(errors).toHaveLength(7);
+        expect(errors).toHaveLength(8);
         expect(errors.every((err) => err.rule === 'schemas/reserved-field')).toBe(true);
     });
     it('rejects unsupported field types', () => {

package/package.json

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

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.6.0",
+    "fimo": "0.7.0-experimental.1",
     "input-otp": "^1.4.2",
     "isbot": "^5",
     "lucide-react": "^0.577.0",