rimecms 0.30.1 → 0.30.3

package/README.md

@@ -245,7 +245,7 @@ npx rime build
 npx rime build -d # to copy the database directory
 ```
 
-It's doing bascically `vite build` under the hood and create the polka server file inside an app directory, plus giving some info on how to run it.
+It's doing bascically `vite build` under the hood and create the server file inside an app directory, plus giving some info on how to run it.
 
 ## ROADMAP
 

package/dist/adapter-sqlite/generate-schema/column.server.js

@@ -66,10 +66,7 @@ export function toSchemaColumn(field, parentPath) {
     // reading it off the generic FormField base needs a narrow cast, same as
     // each field's own toSchema did today by typing against its concrete field.
     const { unique, required } = field.get;
-    // `dataType` is implemented by every leaf field builder but isn't declared
-    // on the FormFieldBuilder base (see the comment there) — narrow cast here.
-    const dataType = field.dataType;
-    const columnExpr = COLUMN_EXPR[dataType](snake);
+    const columnExpr = COLUMN_EXPR[field.dataType](snake);
     const referencesStr = field._references ? templateReferences(field._references) : '';
     const defaultValue = RESOLVE_DEFAULT[field.type]?.(field);
     const suffix = templateUniqueRequired({ unique, required }, defaultValue);

package/dist/adapter-sqlite/generate-schema/write.server.js

@@ -31,19 +31,17 @@ const write = (schema) => {
     };
     const command = commandMap[pm];
     logger.info('[✓] Schema: generated at src/lib/server/schema.ts');
-    console.log('============================================================');
     console.log(`\n ⚡︎ ${command} drizzle-kit generate \n`);
     const generateResult = spawnSync(command, ['drizzle-kit', 'generate'], { stdio: 'inherit' });
     if (generateResult.error || generateResult.status !== 0) {
         throw new Error('drizzle-kit generate failed');
     }
-    console.log('\n============================================================');
     console.log(`\n ⚡︎ ${command} drizzle-kit migrate \n`);
     const migrateResult = spawnSync(command, ['drizzle-kit', 'migrate'], { stdio: 'inherit' });
     if (migrateResult.error || migrateResult.status !== 0) {
         throw new Error('drizzle-kit migrate failed');
     }
-    console.log('\n============================================================');
+    console.log('\n');
     // Only mark the schema as in sync once generate + migrate both actually
     // succeeded — otherwise a future run with an unchanged schema string would
     // skip re-running drizzle-kit and the DB would stay silently out of sync.

package/dist/core/config/auth/better-auth-hooks.server.js

@@ -74,7 +74,7 @@ const handleUserCreation = async (ctx) => {
     /**
      * Create the collection document
      */
-    const [error] = await trycatch(() => event.locals.rime
+    const [error, userData] = await trycatch(() => event.locals.rime
         .collection(ctx.body.type)
         .system(event.locals.isInit)
         .create({
@@ -89,7 +89,7 @@ const handleUserCreation = async (ctx) => {
         }
     }));
     // If error clean up session/account/user created
-    // Would be great to do it with the admin plugin,
+    // note: would be cleaner to do it with the admin plugin, not possible at the moment
     if (error) {
         console.log(error);
         logger.error(error.message);
@@ -105,6 +105,8 @@ const handleUserCreation = async (ctx) => {
         await rime.adapter.db.delete(authUsersTable).where(eq(authUsersTable.id, user.id));
         throw new APIError('BAD_REQUEST');
     }
+    // Return rime user data
+    return userData;
 };
 /****************************************************/
 /* Before Hooks
@@ -131,6 +133,7 @@ export const betterAuthAfterHook = createAuthMiddleware(async (ctx) => {
     }
     // Handle sign-up
     if (ctx.path.startsWith('/sign-up')) {
-        return await handleUserCreation(ctx);
+        await handleUserCreation(ctx);
+        return await getUserAttributes(ctx);
     }
 });

package/dist/core/dev/cli/build/index.d.ts

@@ -2,4 +2,5 @@
 export declare const build: (args: {
     withDatabase?: boolean;
     withEnv?: boolean;
+    withStatic?: boolean;
 }) => void;

package/dist/core/dev/cli/build/index.js

@@ -4,15 +4,15 @@ import chalk from 'chalk';
 import { spawnSync } from 'child_process';
 import { copyFileSync, cpSync, existsSync, mkdirSync, renameSync, rmSync, writeFileSync } from 'fs';
 import { getInvokingPackageManager } from '../util/package-manager.server.js';
-import { envProduction, polkaServer } from './templates.js';
+import { envProduction, nodeServer } from './templates.js';
 const installCommands = {
     pnpm: {
-        addDeps: 'pnpm install polka sharp serve-static',
+        addDeps: 'pnpm install sharp serve-static',
         prodInstall: 'pnpm install --prod',
         runEnv: 'pnpm rime env'
     },
     npm: {
-        addDeps: 'npm install polka sharp serve-static',
+        addDeps: 'npm install sharp serve-static',
         prodInstall: 'npm install --omit=dev',
         runEnv: 'npx rime env'
     }
@@ -38,9 +38,14 @@ export const build = (args) => {
         cpSync('./db', './app/db', { recursive: true });
         logger.info('[✓] database copied');
     }
+    // Copy static folder if flag is set
+    if (args.withStatic) {
+        cpSync('./static', './app/static', { recursive: true });
+        logger.info('[✓] static directory copied');
+    }
     // Create main entry server file
-    writeFileSync('./app/index.js', polkaServer);
-    logger.info('[✓] polka server created at app/index.js');
+    writeFileSync('./app/index.js', nodeServer);
+    logger.info('[✓] server created at app/index.js');
     // Create .env file if flag is set
     const envContent = envProduction();
     if (args.withEnv) {

package/dist/core/dev/cli/build/templates.d.ts

@@ -1,2 +1,2 @@
 export declare const envProduction: () => string;
-export declare const polkaServer = "import polka from 'polka';\nimport serveStatic from 'serve-static';\nimport { handler } from './build/handler.js';\n\nconst serve = serveStatic('./static');\n\nconst port = process.env.PORT || 3000;\nconst host = process.env.HOST || '127.0.0.1';\n\npolka()\n\t.use(serve)\n\t.use(handler)\n\t.listen(port, host, () => {\n\t\tconsole.log(`server running on ${host}:${port}`);\n\t});\n";
+export declare const nodeServer = "import { createServer } from 'node:http';\nimport serveStatic from 'serve-static';\nimport { handler } from './build/handler.js';\n\nconst serve = serveStatic('./static');\n\nconst port = process.env.PORT || 3000;\nconst host = process.env.HOST || '127.0.0.1';\nconst protocol = process.env.ORIGIN?.startsWith('https') ? 'https' : 'http';\n\ncreateServer((req, res) => {\n\tserve(req, res, () => handler(req, res, () => {\n\t\tres.statusCode = 404;\n\t\tres.end();\n\t}));\n}).listen(port, host, () => {\n\tconsole.log(`server running on ${protocol}://${host}:${port}`);\n});\n";

package/dist/core/dev/cli/build/templates.js

@@ -22,7 +22,7 @@ HOST=localhost
 # MISC
 BODY_SIZE_LIMIT=10485760 # 10(MB) * 1024 * 1024 = 10485760 bytes
 `;
-export const polkaServer = `import polka from 'polka';
+export const nodeServer = `import { createServer } from 'node:http';
 import serveStatic from 'serve-static';
 import { handler } from './build/handler.js';
 
@@ -30,11 +30,14 @@ const serve = serveStatic('./static');
 
 const port = process.env.PORT || 3000;
 const host = process.env.HOST || '127.0.0.1';
+const protocol = process.env.ORIGIN?.startsWith('https') ? 'https' : 'http';
 
-polka()
-	.use(serve)
-	.use(handler)
-	.listen(port, host, () => {
-		console.log(\`server running on \${host}:\${port}\`);
-	});
+createServer((req, res) => {
+	serve(req, res, () => handler(req, res, () => {
+		res.statusCode = 404;
+		res.end();
+	}));
+}).listen(port, host, () => {
+	console.log(\`server running on \${protocol}://\${host}:\${port}\`);
+});
 `;

package/dist/core/dev/cli/index.js

@@ -18,6 +18,7 @@ program
     .command('build')
     .option('-d, --with-database', 'Include database', false)
     .option('-e, --with-env', 'Create the /app/.env file from the production template', false)
+    .option('-s, --with-static', 'Copy the current static directory', false)
     .action(async (args) => {
     const build = await import('./build/index.js').then((m) => m.build);
     build(args);

package/dist/core/dev/cli/init/index.server.js

@@ -3,7 +3,7 @@ import { randomId } from '../../../../util/random.js';
 import { isValidSlug, slugify } from '../../../../util/string.js';
 import { generate as generateCode } from '@babel/generator';
 import * as t from '@babel/types';
-import { babelParse } from 'ast-kit';
+import { babelParse, getLang } from 'ast-kit';
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'fs';
 import { cp, mkdir } from 'fs/promises';
 import fs from 'node:fs';
@@ -60,7 +60,7 @@ export const init = async ({ force, name: incomingName, skipInstall }) => {
                 mkdirSync(configDirPath);
             }
             writeFileSync(configPath, templates.defaultConfig(name.toString()));
-            logger.info('[✓] Config created src/lib/config/rime.config.ts');
+            logger.info(`[✓] Config created at ${configDirPath}/rime.config.ts`);
         }
         else {
             logger.info('[✓] Config already exists (skip)');
@@ -113,7 +113,7 @@ export const init = async ({ force, name: incomingName, skipInstall }) => {
         }
         let content = fs.readFileSync(configPath, 'utf-8');
         content = content.replace("from '@sveltejs/adapter-auto'", "from '@sveltejs/adapter-node'");
-        const program = babelParse(content, configPath); // t.Program
+        const program = babelParse(content, getLang(configPath));
         const programBody = program.body;
         const configObject = findSvelteConfigObject(programBody);
         if (!configObject) {

package/dist/core/dev/cli/init/templates.js

@@ -24,9 +24,16 @@ const Pages = Collection.create('pages', {
 	fields: [text('title').isTitle()]
 });
 
+const Medias = Collection.create('medias', {
+  upload: true,
+	fields: [
+    text('alt').required(),
+  ]
+});
+
 export default rime({
   $adapter: adapterSqlite('${name}.sqlite'),
-  collections: [Pages]
+  collections: [Pages, Medias]
 });
 `;
 export const drizzleConfig = (name) => `

package/dist/core/dev/cli/util/package-manager.server.js

@@ -1,6 +1,6 @@
 import { logger } from '../../../logger/index.server.js';
 import { execSync } from 'child_process';
-import { existsSync, readFileSync, writeFileSync } from 'fs';
+import { existsSync } from 'fs';
 import path from 'path';
 const packageManagersMap = {
     yarn: 'yarn.lock',
@@ -14,17 +14,17 @@ const packageManagerConfigs = {
         command: 'echo "yarn is not supported, please use pnpm or npm" && exit 1'
     },
     pnpm: {
-        command: 'pnpm add -D drizzle-kit && pnpm add -D @sveltejs/adapter-node && pnpm add drizzle-orm @lucide/svelte sharp',
-        preInstall: updatePackageJsonForPnpm,
+        command: 'pnpm add -D drizzle-kit && pnpm add -D @sveltejs/adapter-node && pnpm add drizzle-orm @libsql/client @lucide/svelte sharp',
+        preInstall: configurePnpm,
         postInstall: () => {
             execSync('pnpm rebuild');
         }
     },
     bun: {
-        command: 'bun add -D drizzle-kit && bun add -D @sveltejs/adapter-node && bun add drizzle-orm @lucide/svelte sharp'
+        command: 'bun add -D drizzle-kit && bun add -D @sveltejs/adapter-node && bun add drizzle-orm @libsql/client @lucide/svelte sharp'
     },
     npm: {
-        command: 'npm install -D drizzle-kit && npm install -D @sveltejs/adapter-node && npm install drizzle-orm @lucide/svelte sharp'
+        command: 'npm install -D drizzle-kit && npm install -D @sveltejs/adapter-node && npm install drizzle-orm @libsql/client @lucide/svelte sharp'
     },
     deno: {
         command: 'echo "deno is not supported, please use pnpm or npm" && exit 1'
@@ -55,7 +55,7 @@ export function getInvokingPackageManager() {
     return 'npm';
 }
 export function installDependencies() {
-    const pm = getPackageManager();
+    const pm = getInvokingPackageManager();
     if (pm === 'deno' || pm === 'yarn') {
         throw new Error('Unsupported package manager ' + pm);
     }
@@ -68,28 +68,29 @@ export function installDependencies() {
     // Post installation hooks
     config.postInstall?.();
 }
-function updatePackageJsonForPnpm() {
-    const packageJsonPath = path.resolve(process.cwd(), 'package.json');
-    if (!existsSync(packageJsonPath)) {
-        logger.warn('package.json not found, skipping pnpm configuration');
-        return;
-    }
+/**
+ * pnpm 11 no longer reads the "pnpm" field in package.json (onlyBuiltDependencies
+ * included) - every pnpm-specific setting moved to pnpm-workspace.yaml, and
+ * onlyBuiltDependencies itself was replaced by allowBuilds (a name -> boolean map).
+ * `pnpm config set --location=project` writes there directly (creating the file if
+ * it doesn't exist yet, even for a non-monorepo single package).
+ *
+ * strictDepBuilds is also now on by default: any dependency (however deep) with a
+ * build script that isn't in allowBuilds hard-fails the whole install with
+ * ERR_PNPM_IGNORED_BUILDS instead of just skipping that one script. allowBuilds only
+ * covers esbuild/sharp; the rest of this command's tree (drizzle-kit, adapter-node,
+ * ...) will always have *something* pnpm hasn't seen before, and pinning every one of
+ * them here would just break again on their next update - so strict-dep-builds is
+ * turned off the same way.
+ */
+function configurePnpm() {
+    const allowBuilds = JSON.stringify({ esbuild: false, sharp: true, 'better-sqlite3': false });
     try {
-        const packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf-8'));
-        // Initialize pnpm configuration if it doesn't exist
-        if (!packageJson.pnpm) {
-            packageJson.pnpm = {};
-        }
-        // Update onlyBuiltDependencies
-        const existingBuiltDeps = packageJson.pnpm.onlyBuiltDependencies || [];
-        const newBuiltDeps = ['esbuild', 'sharp'];
-        // Merge and deduplicate
-        const mergedBuiltDeps = [...new Set([...existingBuiltDeps, ...newBuiltDeps])];
-        packageJson.pnpm.onlyBuiltDependencies = mergedBuiltDeps;
-        writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, '\t'), 'utf-8');
-        logger.info('[✓] Updated package.json with pnpm configuration');
+        execSync(`pnpm config set --location=project --json allowBuilds '${allowBuilds}'`);
+        execSync('pnpm config set --location=project strict-dep-builds false');
+        logger.info('[✓] Configured pnpm-workspace.yaml: allowBuilds (sharp) and strict-dep-builds (false)');
     }
     catch (error) {
-        logger.error('Failed to update package.json for pnpm:', error);
+        logger.error('Failed to configure pnpm:', error);
     }
 }

package/dist/core/dev/constants.d.ts

@@ -1,2 +1,11 @@
-export const OUTPUT_DIR: "+rime.generated";
-export const INPUT_DIR: "+rime";
+export declare const OUTPUT_DIR = "+rime.generated";
+export declare const INPUT_DIR = "+rime";
+/**
+ * True when `metaUrl` (pass the caller's own `import.meta.url` — this can't be one shared
+ * value, it depends on which file is asking) is running from inside an installed `rimecms`
+ * package (node_modules/rimecms/...), false when running from rime's own repo. Deliberately
+ * filesystem-based rather than an env var: a shell dotenv plugin auto-loading this repo's own
+ * .env (which used to set IS_RIME_REPO=true) into every child process — including an unrelated
+ * consumer app's dev server — made that value unreliable; this can't leak the same way.
+ */
+export declare function isInstalledDependency(metaUrl: string): boolean;

package/dist/core/dev/constants.js

@@ -1,2 +1,13 @@
 export const OUTPUT_DIR = '+rime.generated';
 export const INPUT_DIR = '+rime';
+/**
+ * True when `metaUrl` (pass the caller's own `import.meta.url` — this can't be one shared
+ * value, it depends on which file is asking) is running from inside an installed `rimecms`
+ * package (node_modules/rimecms/...), false when running from rime's own repo. Deliberately
+ * filesystem-based rather than an env var: a shell dotenv plugin auto-loading this repo's own
+ * .env (which used to set IS_RIME_REPO=true) into every child process — including an unrelated
+ * consumer app's dev server — made that value unreliable; this can't leak the same way.
+ */
+export function isInstalledDependency(metaUrl) {
+    return metaUrl.includes('/node_modules/rimecms/');
+}

package/dist/core/dev/generate/runtime/index.server.d.ts

@@ -0,0 +1,24 @@
+export type RuntimeRegistryEntry = {
+    client: string;
+    server: string;
+};
+export type RuntimeRegistry = Map<string, RuntimeRegistryEntry>;
+/**
+ * Builds the `$rime/<name>` → { browser file, server file } lookup table.
+ *
+ * @example rime's own field, installed as a dependency in some app
+ * // /my-app/node_modules/rimecms/dist/fields/relation/module.ts + module.server.ts
+ * // → registry.get('fields/relation') → { client: '.../module.ts', server: '.../module.server.ts' }
+ * // → import { x } from '$rime/fields/relation'   // resolves
+ *
+ * @example that same app's own custom field
+ * // /my-app/src/lib/fields/geocode/module.ts + module.server.ts
+ * // → registry.get('fields/geocode') → { client: '.../module.ts', server: '.../module.server.ts' }
+ * // → import { x } from '$rime/fields/geocode'    // resolves, same mechanism, zero extra setup
+ *
+ * @example nothing on disk for that name
+ * // no folder anywhere has both typo/module.ts and typo/module.server.ts
+ * // → registry.get('typo') → undefined
+ * // → import { x } from '$rime/typo'               // fails: "cannot resolve module"
+ */
+export declare function buildRuntimeRegistry(): RuntimeRegistry;

package/dist/core/dev/generate/runtime/index.server.js

@@ -0,0 +1,93 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { isInstalledDependency, OUTPUT_DIR } from '../../constants.js';
+/**
+ * Walks up from `startDir` to the nearest ancestor containing a `package.json`, then returns
+ * its `dist/` — self-correcting regardless of how deeply nested this file is (unlike counting
+ * a fixed number of `..` segments, which would silently point at the wrong directory, not
+ * error, the moment this file's own location changes).
+ */
+function findDistRoot(startDir) {
+    let dir = startDir;
+    while (!fs.existsSync(path.join(dir, 'package.json'))) {
+        const parent = path.dirname(dir);
+        if (parent === dir) {
+            throw new Error(`$rime: could not locate rimecms's package root above ${startDir}`);
+        }
+        dir = parent;
+    }
+    return path.join(dir, 'dist');
+}
+/** `module.ts` when scanning TS source, `module.js` when scanning a built `dist/`. */
+function findModuleFile(dir, baseName) {
+    for (const ext of ['.ts', '.js']) {
+        const candidate = path.join(dir, `${baseName}${ext}`);
+        if (fs.existsSync(candidate))
+            return candidate;
+    }
+    return null;
+}
+/**
+ * Recursively finds every `module`/`module.server` pair under `root`, registered under the
+ * containing folder's path relative to `root` — `$rime/<key>` mirrors the real path, e.g.
+ * `fields/relation/module.ts` under a `lib`-rooted scan registers as `fields/relation`.
+ *
+ * Both files are required to register a `$rime/<key>` entry: this pair only exists for a field
+ * whose hook needs different server/client behavior (relation, link) — a field with nothing to
+ * split just overrides `generateType()` on its builder directly and never needs either file.
+ * `+rime.generated/` is skipped since it's sanitize's own output, unrelated to this.
+ */
+function scanModulePairs(root) {
+    const registry = new Map();
+    if (!fs.existsSync(root))
+        return registry;
+    const walk = (dir) => {
+        for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+            if (!entry.isDirectory() || entry.name === OUTPUT_DIR)
+                continue;
+            const fullPath = path.join(dir, entry.name);
+            const client = findModuleFile(fullPath, 'module');
+            const server = findModuleFile(fullPath, 'module.server');
+            if (client && server) {
+                const key = path.relative(root, fullPath).split(path.sep).join('/');
+                registry.set(key, { client, server });
+            }
+            walk(fullPath);
+        }
+    };
+    walk(root);
+    return registry;
+}
+/**
+ * Builds the `$rime/<name>` → { browser file, server file } lookup table.
+ *
+ * @example rime's own field, installed as a dependency in some app
+ * // /my-app/node_modules/rimecms/dist/fields/relation/module.ts + module.server.ts
+ * // → registry.get('fields/relation') → { client: '.../module.ts', server: '.../module.server.ts' }
+ * // → import { x } from '$rime/fields/relation'   // resolves
+ *
+ * @example that same app's own custom field
+ * // /my-app/src/lib/fields/geocode/module.ts + module.server.ts
+ * // → registry.get('fields/geocode') → { client: '.../module.ts', server: '.../module.server.ts' }
+ * // → import { x } from '$rime/fields/geocode'    // resolves, same mechanism, zero extra setup
+ *
+ * @example nothing on disk for that name
+ * // no folder anywhere has both typo/module.ts and typo/module.server.ts
+ * // → registry.get('typo') → undefined
+ * // → import { x } from '$rime/typo'               // fails: "cannot resolve module"
+ */
+export function buildRuntimeRegistry() {
+    const registry = new Map();
+    if (isInstalledDependency(import.meta.url)) {
+        const nativeLibDir = findDistRoot(path.dirname(fileURLToPath(import.meta.url)));
+        for (const [key, entry] of scanModulePairs(nativeLibDir)) {
+            registry.set(key, entry);
+        }
+    }
+    const consumerLibDir = path.resolve(process.cwd(), 'src/lib');
+    for (const [key, entry] of scanModulePairs(consumerLibDir)) {
+        registry.set(key, entry);
+    }
+    return registry;
+}

package/dist/core/dev/generate/types/index.server.js

@@ -6,15 +6,15 @@ import { logger } from '../../../logger/index.server.js';
 import { withVersionsSuffix } from '../../../naming.js';
 import { BlocksBuilder } from '../../../../fields/blocks/index.js';
 import { GroupFieldBuilder } from '../../../../fields/group/index.js';
-import { getFieldPrivateModule } from '../../../../fields/index.server.js';
 import { TabsBuilder } from '../../../../fields/tabs/index.js';
 import { TreeBuilder } from '../../../../fields/tree/index.js';
 import { trycatchSync } from '../../../../util/function.js';
 import { capitalize, toPascalCase } from '../../../../util/string.js';
 import fs from 'node:fs';
 import path from 'node:path';
-import { OUTPUT_DIR } from '../../constants.js';
-const IS_PACKAGE_DEV = process.env.IS_PACKAGE_DEV === 'true';
+import { isInstalledDependency, OUTPUT_DIR } from '../../constants.js';
+import { buildRuntimeRegistry } from '../runtime/index.server.js';
+const IS_RIME_REPO = !isInstalledDependency(import.meta.url);
 // Relation  type
 const relationValueType = `
 export type RelationValue<T> =
@@ -110,13 +110,47 @@ const templateRegister = (config) => {
 };
 const templateDeclareVirtualModule = () => [
     `declare module '$rime/config' {`,
-    ...(IS_PACKAGE_DEV ? ['\t// eslint-disable-next-line no-restricted-imports'] : []),
+    ...(IS_RIME_REPO ? ['\t// eslint-disable-next-line no-restricted-imports'] : []),
     `\texport * from '${PACKAGE_NAME}/config/server';`,
     `}`,
     `declare module '$rime/schema' {`,
     `\texport * from '$lib/+rime.generated/schema.server.js';`,
-    `}`
+    `}`,
+    ...templateDeclareFieldModules()
 ].join('\n');
+/**
+ * One `declare module '$rime/<name>'` per registered field module.ts + module.server.ts pair
+ * (rime-native and consumer-local alike — see buildRuntimeRegistry), sourced from the
+ * `.server.ts` side (the real, server-only implementation of the shared hook; the client
+ * module.ts only has the no-op). Unrelated to type generation itself — that goes through
+ * `field.use.generateType()` on the builder instance directly, not through this registry.
+ * Runtime resolution (the Vite plugin's `load()`) is unaffected either way — it still picks
+ * the real client-vs-server module dynamically based on build context.
+ */
+const templateDeclareFieldModules = () => {
+    const registry = buildRuntimeRegistry();
+    return Array.from(registry.entries()).map(([name, entry]) => {
+        const modulePath = toModuleSpecifier(entry.server);
+        return `declare module '$rime/${name}' {\n\texport * from '${modulePath}';\n}`;
+    });
+};
+/**
+ * `$lib/...` when the file is inside this app's own src/lib (true for a consumer's own custom
+ * field, and for rime's own fields when developing rime itself, since they live inside src/lib
+ * in that case too) — matches the `$rime/schema` declaration above, and stays readable/portable
+ * instead of an absolute path. Falls back to an absolute path only when there's genuinely no
+ * alias for it: rime's own fields when installed as a real dependency, living in
+ * node_modules/rimecms/dist/, outside this app's src/lib entirely.
+ */
+function toModuleSpecifier(serverPath) {
+    const libRoot = path.resolve(process.cwd(), 'src/lib');
+    const jsPath = serverPath.replace(/\.ts$/, '.js');
+    const relative = path.relative(libRoot, jsPath);
+    if (!relative.startsWith('..')) {
+        return `$lib/${relative.split(path.sep).join('/')}`;
+    }
+    return jsPath;
+}
 /**
  * Generates type definitions for image sizes
  * @returns A string containing the type definition for image sizes
@@ -155,17 +189,7 @@ export async function generateTypesString(config) {
      * @returns An array of string containing fields type definitions
      */
     const buildFieldsTypes = async (fields) => {
-        const strFields = [];
-        for (const field of fields) {
-            if (field instanceof FormFieldBuilder || field instanceof TabsBuilder) {
-                const fieldServerMethods = await getFieldPrivateModule(field);
-                if (fieldServerMethods) {
-                    const result = await Promise.resolve(fieldServerMethods.toType(field));
-                    strFields.push(result);
-                }
-            }
-        }
-        return strFields;
+        return fields.map((field) => field.use.generateType()).filter(Boolean);
     };
     const buildblocksTypes = async (fields) => {
         for (const field of fields) {
@@ -314,10 +338,10 @@ export async function generateTypesString(config) {
   }
 }`;
     const content = [
-        ...(IS_PACKAGE_DEV ? ['// eslint-disable-next-line no-restricted-imports'] : []),
+        ...(IS_RIME_REPO ? ['// eslint-disable-next-line no-restricted-imports'] : []),
         `import '${PACKAGE_NAME}';`,
         `import type { Session } from 'better-auth';`,
-        ...(IS_PACKAGE_DEV ? ['// eslint-disable-next-line no-restricted-imports'] : []),
+        ...(IS_RIME_REPO ? ['// eslint-disable-next-line no-restricted-imports'] : []),
         typeImports,
         '',
         relationValueType,