cloudflare-next-intl 0.8.12 → 0.8.13

package/README.md

@@ -760,7 +760,7 @@ npx cfni-db-codegen --check
 | `--out-file=` | `CFNI_DB_OUT_FILE` | `schema.ts` |
 | `--db-url=` | `CODEGEN_DATABASE_URL` | `postgresql://postgres:postgres@127.0.0.1:54322/postgres` |
 | `--drizzle-config=` | `CFNI_DB_DRIZZLE_CONFIG` | none |
-| `--rpc-dir=` | `CFNI_DB_RPC_DIR` | sibling of `--ddl-dir`, e.g. `supabase/rpc` |
+| `--rpc-dir=` | `CFNI_DB_RPC_DIR` | inside `--ddl-dir`, e.g. `supabase/data-base/rpcs` |
 | `--rpc-file-name=` | `CFNI_DB_RPC_FILE_NAME` | `cfni_exec.sql` |
 | `--tests-dir=` | `CFNI_DB_TESTS_DIR` | sibling of `--ddl-dir`, e.g. `supabase/tests` |
 | `--tests-file-name=` | `CFNI_DB_TESTS_FILE_NAME` | `cfni_exec.sql` |
@@ -792,9 +792,9 @@ fallback entirely and fails loudly if that target is unreachable.
 After a successful (non-`--check`) run, `cfni-db-codegen` also copies
 `supabase/cfni_exec.sql` and its pgTAP test file (see
 [Testing `cfni_exec.sql` itself](#testing-cfni_execsql-itself) below) into
-your project — `--rpc-dir`/`--tests-dir` (defaulting to sibling folders of
-`--ddl-dir`, so `rpc`/`tests` next to `data-base`), each named `cfni_exec.sql`
-by default. This keeps a project that enables Supabase mode's raw-SQL path
+your project — `--rpc-dir` (defaulting inside `--ddl-dir`, so `rpcs` under
+`data-base`) and `--tests-dir` (defaulting to a sibling of `--ddl-dir`, so
+`tests` next to `data-base`), each named `cfni_exec.sql` by default. This keeps a project that enables Supabase mode's raw-SQL path
 always holding the current version of the function, without a manual
 copy-paste step. Since the file now ships both `cfni_exec` and
 `cfni_exec_batch` (see
@@ -808,7 +808,7 @@ This step is gated on `db.supabase.rawSql` (see
 codegen reads your `next.config.*`'s `@intl-config` alias, opens the intl
 config file it points at, and looks for a literal `rawSql: true`/`rawSql:
 false`. If it's explicitly `false`, the copy is skipped entirely — no
-`supabase/rpc`/`supabase/tests` folders are created. If it can't be
+`supabase/data-base/rpcs`/`supabase/tests` folders are created. If it can't be
 determined (no `next.config.*` found, no alias, or `rawSql` isn't a plain
 `true`/`false` literal in the source), a warning is printed and codegen
 assumes `true`, matching `withPublicDb`/`withUserDb`'s own default.

package/bin/db_codegen.mjs

@@ -33,14 +33,14 @@
 import { createHash } from 'node:crypto';
 import { execFileSync } from 'node:child_process';
 import { existsSync, mkdirSync, readdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
-import { join, relative } from 'node:path';
+import { createRequire } from 'node:module';
+import { dirname, join, relative } from 'node:path';
 import { Client } from 'pg';
 import resolveCodegenPaths from '../dist/src/db/codegen_paths.js';
 import { runInstallExecStep } from './install_exec_step.mjs';
 import { startEphemeralPostgres } from './ephemeral_pg.mjs';
 import { orderedSqlFiles } from './ddl_order.mjs';
 
-const PACKAGE_ROOT = new URL('..', import.meta.url).pathname;
 const paths = resolveCodegenPaths(process.argv.slice(2), process.env, process.cwd());
 
 async function isReachable(url) {
@@ -128,13 +128,21 @@ try {
     // drizzle-kit itself requires `drizzle-orm` at runtime. This package
     // depends on drizzle-orm, but npm doesn't guarantee that dependency gets
     // hoisted to the consuming project's own node_modules (it commonly stays
-    // nested under node_modules/cloudflare-next-intl/node_modules) — so
-    // running from *this* package's own directory, where it's guaranteed
-    // resolvable, avoids "please install required packages: drizzle-orm"
-    // when a consumer doesn't happen to have it hoisted.
-    execFileSync('npx', ['drizzle-kit', 'pull', `--config=${configPath}`], {
+    // nested under node_modules/cloudflare-next-intl/node_modules). `npx
+    // drizzle-kit` resolves the binary through its own lookup rather than
+    // Node's normal upward node_modules walk from this file, which — even
+    // pinned to this package's own directory as cwd — resolved drizzle-orm
+    // inconsistently across runs. Resolving and invoking drizzle-kit's own
+    // installed binary directly sidesteps npx's resolution entirely: Node's
+    // ordinary require() from that file's real location always finds
+    // drizzle-orm right next to it in this package's own node_modules.
+    // `drizzle-kit/bin.cjs` isn't in the package's `exports` map, so it can't
+    // be require.resolve()'d directly — but its main entry point can, and
+    // `bin.cjs` always sits next to it (declared via `bin` in package.json).
+    const drizzleKitEntry = createRequire(import.meta.url).resolve('drizzle-kit');
+    const drizzleKitBin = join(dirname(drizzleKitEntry), 'bin.cjs');
+    execFileSync(process.execPath, [drizzleKitBin, 'pull', `--config=${configPath}`], {
         stdio: 'inherit',
-        cwd: PACKAGE_ROOT,
         env: { ...process.env, CODEGEN_DATABASE_URL: effectiveDbUrl },
     });
 } finally {

package/dist/src/db/codegen_paths.js

@@ -33,10 +33,13 @@ export default function resolveCodegenPaths(argv, env, cwd) {
     const outDir = outDirs[0];
     const outFileName = flag(argv, 'out-file') ?? env.CFNI_DB_OUT_FILE ?? DEFAULT_OUT_FILE;
     const drizzleConfig = flag(argv, 'drizzle-config') ?? env.CFNI_DB_DRIZZLE_CONFIG ?? null;
-    // Sibling of ddlDir (default `supabase/data-base` → `supabase`), matching
-    // where `cfni_exec.sql` ships in this package's own `supabase/` folder.
+    // rpcDir defaults inside ddlDir itself (default `supabase/data-base` →
+    // `supabase/data-base/rpcs`), matching where a project's DDL walk (and
+    // this package's own `supabase/data-base/rpcs/`) actually keeps RPC
+    // definitions. testsDir stays a sibling of ddlDir (`supabase/tests`) —
+    // pgTAP tests aren't part of the DDL a project applies to its database.
     const supabaseRoot = dirname(ddlDir);
-    const rpcDir = abs(cwd, flag(argv, 'rpc-dir') ?? env.CFNI_DB_RPC_DIR ?? join(supabaseRoot, 'rpc'));
+    const rpcDir = abs(cwd, flag(argv, 'rpc-dir') ?? env.CFNI_DB_RPC_DIR ?? join(ddlDir, 'rpcs'));
     const testsDir = abs(cwd, flag(argv, 'tests-dir') ?? env.CFNI_DB_TESTS_DIR ?? join(supabaseRoot, 'tests'));
     const rpcFileName = flag(argv, 'rpc-file-name') ?? env.CFNI_DB_RPC_FILE_NAME ?? DEFAULT_RPC_FILE_NAME;
     const testsFileName = flag(argv, 'tests-file-name') ?? env.CFNI_DB_TESTS_FILE_NAME ?? DEFAULT_TESTS_FILE_NAME;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cloudflare-next-intl",
-	"version": "0.8.12",
+	"version": "0.8.13",
 	"description": "Optimized Next Intl Package Special for App Router and Cloudflare",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -242,6 +242,7 @@
 	"dependencies": {
 		"@microsoft/clarity": "^1.0.2",
 		"@supabase/supabase-js": "^2.112.3",
+		"drizzle-kit": "^0.31.10",
 		"drizzle-orm": "^0.45.2",
 		"embedded-postgres": "^18.4.0-beta.17",
 		"firebase": "^12.17.0",
@@ -269,7 +270,6 @@
 		"@types/react": "^19.0.0",
 		"@types/react-dom": "^19.0.0",
 		"@vitest/coverage-v8": "^3.2.7",
-		"drizzle-kit": "^0.31.10",
 		"eslint": "^9.28.0",
 		"eslint-config-next": "15.3.3",
 		"eslint-config-prettier": "^10.1.2",