rimecms 0.28.2 → 0.28.4

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

@@ -19,7 +19,7 @@ const write = (schema) => {
         fs.writeFileSync(outputFile, schema);
     }
     catch (err) {
-        logger.error('Error writing schema', err.message);
+        throw new Error(`Error writing schema: ${err.message}`);
     }
     const pm = getPackageManager();
     const commandMap = {
@@ -33,11 +33,20 @@ const write = (schema) => {
     logger.info('[✓] Schema: generated at src/lib/server/schema.ts');
     console.log('============================================================');
     console.log(`\n ⚡︎ ${command} drizzle-kit generate \n`);
-    spawnSync(command, ['drizzle-kit', 'generate'], { stdio: 'inherit' });
+    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`);
-    spawnSync(command, ['drizzle-kit', 'migrate'], { stdio: 'inherit' });
+    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============================================================');
+    // 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.
     cache.set('schema', schema);
 };
 export default write;

package/dist/core/rime.server.js

@@ -29,27 +29,27 @@ export async function createRime(config) {
     // Generate schema, types, routes
     if (dev) {
         // A `rime generate` CLI run may be regenerating the same .rime cache
-        // concurrently (e.g. a running dev server picking up its file writes).
-        // Defer to it instead of racing on the shared config memo.
-        if (process.env.RIME_CLI !== 'true') {
-            let waited = 0;
-            while (devCache.get('.cli') && waited < 30_000) {
-                await new Promise((resolve) => setTimeout(resolve, 200));
-                waited += 200;
-            }
-        }
-        const changed = writeMemo(config);
-        const valid = validate(config);
-        if (!valid) {
-            throw new RimeError('Config not valid');
-        }
-        if (changed) {
-            generateRoutes(config);
-            await generateSchema(config);
-            await generateTypes(config);
+        // concurrently (e.g. a running dev server reloading off the CLI's file
+        // writes). Skip our own generation this cycle instead of racing it or
+        // blocking this request on it — the next natural reload will pick up
+        // what the CLI produced.
+        if (process.env.RIME_CLI !== 'true' && devCache.get('.cli')) {
+            logger.debug('Skipping generation, `rime generate` is already running');
         }
         else {
-            logger.debug('Nothing to generate');
+            const changed = writeMemo(config);
+            const valid = validate(config);
+            if (!valid) {
+                throw new RimeError('Config not valid');
+            }
+            if (changed) {
+                generateRoutes(config);
+                await generateSchema(config);
+                await generateTypes(config);
+            }
+            else {
+                logger.debug('Nothing to generate');
+            }
         }
     }
     // Create adapter, consume the generated schema

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rimecms",
-  "version": "0.28.2",
+  "version": "0.28.4",
   "homepage": "https://github.com/bienbiendev/rime",
   "scripts": {
     "dev": "vite dev",