playcademy 0.16.7 → 0.16.8

package/dist/cli.js

@@ -2965,7 +2965,7 @@ import { join as join13 } from "path";
 // package.json with { type: 'json' }
 var package_default2 = {
   name: "playcademy",
-  version: "0.16.6",
+  version: "0.16.7",
   type: "module",
   exports: {
     ".": {

package/dist/index.js

@@ -3996,7 +3996,7 @@ import { join as join12 } from "path";
 // package.json with { type: 'json' }
 var package_default2 = {
   name: "playcademy",
-  version: "0.16.6",
+  version: "0.16.7",
   type: "module",
   exports: {
     ".": {
@@ -4841,9 +4841,10 @@ async function saveDeploymentState(game, backendMetadata, context2) {
     deploymentState.backendDeployedAt = backendMetadata.deployedAt;
     if (backendMetadata.schemaSnapshot !== void 0) {
       deploymentState.schemaSnapshot = backendMetadata.schemaSnapshot;
-    }
-    if (backendMetadata.lastAppliedMigrationTag !== void 0) {
+      deploymentState.lastAppliedMigrationTag = void 0;
+    } else if (backendMetadata.lastAppliedMigrationTag !== void 0) {
       deploymentState.lastAppliedMigrationTag = backendMetadata.lastAppliedMigrationTag;
+      deploymentState.schemaSnapshot = void 0;
     }
   } else if (context2.deployedGameInfo) {
     deploymentState.backendBundleHash = context2.deployedGameInfo.backendBundleHash;
@@ -7412,11 +7413,8 @@ import { join as join30 } from "path";
 import { existsSync as existsSync21 } from "fs";
 import { readFile as readFile4 } from "fs/promises";
 import { join as join29 } from "path";
-var DB_RELATIVE_CANDIDATES = ["migrations", join29("..", "migrations"), "drizzle"];
-var ROOT_RELATIVE_CANDIDATES = [join29("db", "migrations"), "drizzle"];
-var META_DIR = "meta";
-var JOURNAL_FILE = "_journal.json";
-var STATEMENT_BREAKPOINT_RE = /--> statement-breakpoint/g;
+
+// src/lib/deploy/utils.ts
 async function getDatabaseDirectory() {
   try {
     const config = await loadConfig();
@@ -7429,6 +7427,17 @@ async function getDatabaseDirectory() {
     return DEFAULT_DATABASE_DIRECTORY;
   }
 }
+function getDeploymentId(gameSlug) {
+  const environment = getEnvironment();
+  return environment === "production" ? gameSlug : `${WORKER_NAMING.STAGING_PREFIX}${gameSlug}`;
+}
+
+// src/lib/deploy/migrations.ts
+var DB_RELATIVE_CANDIDATES = ["migrations", join29("..", "migrations"), "drizzle"];
+var ROOT_RELATIVE_CANDIDATES = [join29("db", "migrations"), "drizzle"];
+var META_DIR = "meta";
+var JOURNAL_FILE = "_journal.json";
+var STATEMENT_BREAKPOINT_RE = /--> statement-breakpoint/g;
 async function getMigrationsDirectory() {
   const workspace = getWorkspace();
   const dbDirectory = await getDatabaseDirectory();
@@ -7492,7 +7501,10 @@ async function getUnappliedMigrations(lastAppliedTag) {
     return null;
   }
   const journal = await readMigrationJournal();
-  if (!journal || journal.entries.length === 0) {
+  if (!journal) {
+    throw new Error("Failed to read migration journal. Check that _journal.json is valid JSON.");
+  }
+  if (journal.entries.length === 0) {
     return [];
   }
   const sorted = [...journal.entries].sort((a, b) => a.idx - b.idx);
@@ -7517,8 +7529,10 @@ async function getUnappliedMigrations(lastAppliedTag) {
   for (const entry of unapplied) {
     const sqlPath = join29(migrationsDir, `${entry.tag}.sql`);
     if (!existsSync21(sqlPath)) {
-      logger.warn(`Migration file not found: ${sqlPath}`);
-      return null;
+      throw new Error(
+        `Migration file not found: ${sqlPath}
+The journal references migration "${entry.tag}" but the .sql file is missing.`
+      );
     }
     const raw = await readFile4(sqlPath, "utf-8");
     const sql2 = raw.replace(STATEMENT_BREAKPOINT_RE, "").trim();
@@ -7549,18 +7563,6 @@ async function buildMigrationSchemaInfo(lastAppliedTag) {
 }
 
 // src/lib/deploy/schema.ts
-async function getDatabaseDirectory2() {
-  try {
-    const config = await loadConfig();
-    const dbIntegration = config.integrations?.database;
-    if (!dbIntegration || dbIntegration === true) {
-      return DEFAULT_DATABASE_DIRECTORY;
-    }
-    return dbIntegration.directory ?? DEFAULT_DATABASE_DIRECTORY;
-  } catch {
-    return DEFAULT_DATABASE_DIRECTORY;
-  }
-}
 function getDrizzleKitApiExports() {
   const require2 = createRequire(import.meta.url);
   const drizzleKitApi = require2("drizzle-kit/api");
@@ -7572,7 +7574,7 @@ function getDrizzleKitApiExports() {
 }
 async function getPushSchemaInfo(previousSchemaSnapshot) {
   const workspace = getWorkspace();
-  const dbDirectory = await getDatabaseDirectory2();
+  const dbDirectory = await getDatabaseDirectory();
   const schemaPath = join30(workspace, dbDirectory, SCHEMA_SUBDIRECTORY, DB_FILES.SCHEMA_INDEX);
   if (!existsSync22(schemaPath)) {
     return null;
@@ -7598,20 +7600,22 @@ async function getPushSchemaInfo(previousSchemaSnapshot) {
     return null;
   }
 }
-function extractLastAppliedTag(previousSchemaSnapshot) {
-  if (typeof previousSchemaSnapshot === "string") {
-    return previousSchemaSnapshot;
-  }
-  return void 0;
-}
 async function getSchemaInfo(previousSchemaSnapshot, lastAppliedMigrationTag) {
   if (!hasDatabaseSetup()) {
     return null;
   }
   const strategy = await resolveSchemaStrategy();
   if (strategy === "migrate") {
-    const tag = lastAppliedMigrationTag ?? extractLastAppliedTag(previousSchemaSnapshot);
-    return buildMigrationSchemaInfo(tag);
+    if (previousSchemaSnapshot && !lastAppliedMigrationTag) {
+      logger.error(
+        "Your project was previously deployed with push-mode but migration files were detected."
+      );
+      logger.remark(
+        "Run `playcademy db migrate-from-push` to mark the baseline migration as applied before deploying."
+      );
+      return null;
+    }
+    return buildMigrationSchemaInfo(lastAppliedMigrationTag);
   }
   return getPushSchemaInfo(previousSchemaSnapshot);
 }
@@ -7619,10 +7623,13 @@ async function hasSchemaChanged(previousSchemaSnapshot, lastAppliedMigrationTag)
   const schemaInfo = await getSchemaInfo(previousSchemaSnapshot, lastAppliedMigrationTag);
   return schemaInfo !== null;
 }
+function countSqlStatements(sql2) {
+  return sql2.split(";").filter((stmt) => stmt.trim()).length;
+}
 async function getSchemaStatementCount(previousSchemaSnapshot, lastAppliedMigrationTag) {
   const schemaInfo = await getSchemaInfo(previousSchemaSnapshot, lastAppliedMigrationTag);
   if (!schemaInfo) return 0;
-  return schemaInfo.sql.split(";").filter((stmt) => stmt.trim()).length;
+  return countSqlStatements(schemaInfo.sql);
 }
 
 // src/lib/deploy/validate.ts
@@ -8792,12 +8799,6 @@ async function bundleStubWorker() {
   return result.outputFiles[0].text;
 }
 
-// src/lib/deploy/utils.ts
-function getDeploymentId(gameSlug) {
-  const environment = getEnvironment();
-  return environment === "production" ? gameSlug : `${WORKER_NAMING.STAGING_PREFIX}${gameSlug}`;
-}
-
 // src/lib/deploy/steps.ts
 function prepareGameMetadata(config) {
   return {
@@ -11183,7 +11184,7 @@ var getStatusCommand = new Command13("status").description("Check your developer
 });
 
 // package.json
-var version2 = "0.16.6";
+var version2 = "0.16.7";
 
 // src/commands/dev/server.ts
 function setupCleanupHandlers(workspace, getServer) {
@@ -11602,7 +11603,7 @@ async function runDbDiff() {
       logger.bold(line, 1);
     });
     logger.newLine();
-    const statementCount = await getSchemaStatementCount(previousSnapshot, lastMigrationTag);
+    const statementCount = countSqlStatements(schemaInfo.sql);
     logger.data("SQL Statements", String(statementCount), 1);
     logger.newLine();
   } catch (error) {
@@ -12006,15 +12007,17 @@ async function runDbSchema(options = {}) {
         logger.bold(line, 1);
       });
       logger.newLine();
-      const statementCount = await getSchemaStatementCount();
+      const statementCount = countSqlStatements(schemaInfo.sql);
       logger.data("SQL Statements", String(statementCount), 1);
       if (options.full) {
-        logger.highlight("Schema Hash");
-        logger.newLine();
         if (strategy === "migrate" && schemaInfo.migrationTag) {
-          logger.data("Migration Tag", schemaInfo.migrationTag, 1);
+          logger.highlight("Migration Tag", 1);
+          logger.newLine();
+          logger.data("Tag", schemaInfo.migrationTag, 2);
         } else {
-          logger.json(JSON.parse(schemaInfo.hash), 1);
+          logger.highlight("Schema Hash", 1);
+          logger.newLine();
+          logger.json(JSON.parse(schemaInfo.hash), 2);
         }
       }
       logger.newLine();
@@ -15594,6 +15597,7 @@ export {
   computeSecretsHashes,
   confirmDeploymentPlan,
   connectToLogStream,
+  countSqlStatements,
   createClient,
   createProjectDirectory,
   createSeedWorkerEntry,
@@ -15650,6 +15654,7 @@ export {
   getContentType,
   getCurrentProfile,
   getCustomRoutesDirectory,
+  getDatabaseDirectory,
   getDeployedGame,
   getDeploymentId,
   getDirectorySize,

package/dist/utils.js

@@ -2358,7 +2358,7 @@ import { join as join12 } from "path";
 // package.json with { type: 'json' }
 var package_default2 = {
   name: "playcademy",
-  version: "0.16.6",
+  version: "0.16.7",
   type: "module",
   exports: {
     ".": {

package/dist/version.js

@@ -1,7 +1,7 @@
 // package.json with { type: 'json' }
 var package_default = {
   name: "playcademy",
-  version: "0.16.6",
+  version: "0.16.7",
   type: "module",
   exports: {
     ".": {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "playcademy",
-    "version": "0.16.7",
+    "version": "0.16.8",
     "type": "module",
     "exports": {
         ".": {