convex 1.42.2-alpha.0 → 1.42.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "convex",
   "description": "Client for the Convex Cloud",
-  "version": "1.42.2-alpha.0",
+  "version": "1.42.2",
   "author": "Convex, Inc. <no-reply@convex.dev>",
   "homepage": "https://convex.dev",
   "repository": {

package/src/cli/codegen_templates/common.test.ts

@@ -0,0 +1,52 @@
+import { describe, test, expect } from "vitest";
+import { compareModulePaths } from "./common.js";
+
+describe("compareModulePaths", () => {
+  test("matches default sort order for forward slash paths", () => {
+    const paths = ["fooBaz.ts", "foo/bar.ts", "foo.ts"];
+    expect([...paths].sort(compareModulePaths)).toEqual([...paths].sort());
+  });
+
+  test("orders Windows paths identically to their POSIX equivalents", () => {
+    const posixPaths = ["fooBaz.ts", "foo/bar.ts", "foo.ts"];
+    const windowsPaths = posixPaths.map((p) => p.replace(/\//g, "\\"));
+
+    const sortedPosix = [...posixPaths].sort(compareModulePaths);
+    const sortedWindows = [...windowsPaths].sort(compareModulePaths);
+
+    expect(sortedPosix).toEqual(["foo.ts", "foo/bar.ts", "fooBaz.ts"]);
+    expect(sortedWindows.map((p) => p.replace(/\\/g, "/"))).toEqual(
+      sortedPosix,
+    );
+  });
+
+  test("default sort diverges on this input, demonstrating the bug", () => {
+    // "/" (0x2F) sorts before letters while "\" (0x5C) sorts after them,
+    // so the OS-native forms of the same file set sort differently.
+    const windowsPaths = ["fooBaz.ts", "foo\\bar.ts", "foo.ts"];
+    expect([...windowsPaths].sort()).toEqual([
+      "foo.ts",
+      "fooBaz.ts",
+      "foo\\bar.ts",
+    ]);
+    expect([...windowsPaths].sort(compareModulePaths)).toEqual([
+      "foo.ts",
+      "foo\\bar.ts",
+      "fooBaz.ts",
+    ]);
+  });
+
+  test("sorts nested directories before longer sibling file names", () => {
+    const paths = ["a/b/c.ts", "aZ.ts", "a.ts", "a/b.ts"];
+    expect([...paths].sort(compareModulePaths)).toEqual([
+      "a.ts",
+      "a/b.ts",
+      "a/b/c.ts",
+      "aZ.ts",
+    ]);
+    const windows = paths.map((p) => p.replace(/\//g, "\\"));
+    expect(
+      [...windows].sort(compareModulePaths).map((p) => p.replace(/\\/g, "/")),
+    ).toEqual(["a.ts", "a/b.ts", "a/b/c.ts", "aZ.ts"]);
+  });
+});

package/src/cli/codegen_templates/common.ts

@@ -43,3 +43,20 @@ const collator = new Intl.Collator("en-US", {
 export function compareStrings(a: string, b: string): number {
   return collator.compare(a, b);
 }
+
+/**
+ * Comparison function for sorting module paths in codegen output.
+ *
+ * Compares the forward slash normalized form of each path so the resulting
+ * order is identical on every platform. Sorting OS-native paths directly
+ * diverges on Windows because "\" (0x5C) sorts after letters while "/"
+ * (0x2F) sorts before them. Uses plain code unit comparison to match the
+ * default Array.prototype.sort() order these paths sorted with on POSIX.
+ *
+ * Usage: modulePaths.sort(compareModulePaths)
+ */
+export function compareModulePaths(a: string, b: string): number {
+  const aNormalized = a.replace(/\\/g, "/");
+  const bNormalized = b.replace(/\\/g, "/");
+  return aNormalized < bNormalized ? -1 : aNormalized > bNormalized ? 1 : 0;
+}

package/src/cli/lib/codegen.ts

@@ -4,6 +4,7 @@ import { withTmpDir, TempDir } from "../../bundler/fs.js";
 import { entryPoints } from "../../bundler/index.js";
 import { apiCodegen } from "../codegen_templates/api.js";
 import { apiCjsCodegen } from "../codegen_templates/api_cjs.js";
+import { compareModulePaths } from "../codegen_templates/common.js";
 import {
   dynamicDataModelDTS,
   dynamicDataModelTS,
@@ -846,7 +847,7 @@ async function doApiCodegen(
   const absModulePaths = await entryPoints(ctx, functionsDir);
   const modulePaths = absModulePaths
     .map((p) => path.relative(functionsDir, p))
-    .sort();
+    .sort(compareModulePaths);
 
   const writtenFiles: string[] = [];
 

package/src/index.ts

@@ -1 +1 @@
-export const version = "1.42.2-alpha.0";
+export const version = "1.42.2";

package/src/server/meta.ts

@@ -120,8 +120,6 @@ export type RequestMetadata = {
    *
    * This is the same token that `ctx.auth.getUserIdentity()` derives its
    * attributes from.
-   *
-   * @internal
    */
   authToken: string | null;
 };