@rebasepro/server-postgresql 0.0.1-canary.b0e0642 → 0.0.1-canary.bbcb8b4

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rebasepro/server-postgresql",
   "type": "module",
-  "version": "0.0.1-canary.b0e0642",
+  "version": "0.0.1-canary.bbcb8b4",
   "description": "PostgreSQL data source backend implementation for Rebase with Drizzle ORM",
   "funding": {
     "url": "https://github.com/sponsors/rebaseco"
@@ -64,10 +64,10 @@
     "drizzle-orm": "^0.44.4",
     "execa": "^4.1.0",
     "pg": "^8.11.3",
-    "@rebasepro/common": "0.0.1-canary.b0e0642",
-    "@rebasepro/server-core": "0.0.1-canary.b0e0642",
-    "@rebasepro/utils": "0.0.1-canary.b0e0642",
-    "@rebasepro/types": "0.0.1-canary.b0e0642"
+    "@rebasepro/types": "0.0.1-canary.bbcb8b4",
+    "@rebasepro/common": "0.0.1-canary.bbcb8b4",
+    "@rebasepro/server-core": "0.0.1-canary.bbcb8b4",
+    "@rebasepro/utils": "0.0.1-canary.bbcb8b4"
   },
   "devDependencies": {
     "@types/jest": "^29.5.14",

package/test/introspect-db-generation.test.ts

@@ -49,7 +49,7 @@ describe("generateCollectionFile", () => {
             expect(result).toContain('type: "number"');
             expect(result).toContain('type: "boolean"');
             expect(result).toContain('type: "date"');
-            expect(result).toContain('type: "json"');
+            expect(result).toContain('type: "map"');
         });
 
         it("skips FK columns from properties (they become relations)", () => {

package/test/introspect-db-utils.test.ts

@@ -190,14 +190,14 @@ describe("mapPgType", () => {
             expect(mapPgType(t)).toBe("date");
         }
     });
-    it("maps JSON types to json", () => {
-        expect(mapPgType("json")).toBe("json");
-        expect(mapPgType("jsonb")).toBe("json");
+    it("maps JSON types to map", () => {
+        expect(mapPgType("json")).toBe("map");
+        expect(mapPgType("jsonb")).toBe("map");
     });
-    it("maps ARRAY and underscore-prefixed types to json", () => {
-        expect(mapPgType("ARRAY")).toBe("json");
-        expect(mapPgType("_int4")).toBe("json");
-        expect(mapPgType("_text")).toBe("json");
+    it("maps ARRAY and underscore-prefixed types to array", () => {
+        expect(mapPgType("ARRAY")).toBe("array");
+        expect(mapPgType("_int4")).toBe("array");
+        expect(mapPgType("_text")).toBe("array");
     });
     it("maps string-like types to string", () => {
         for (const t of ["text", "varchar", "character varying", "char", "character", "uuid", "bytea", "inet", "cidr", "macaddr", "macaddr8", "interval"]) {
@@ -350,9 +350,12 @@ describe("generateIndexContent", () => {
         expect(lines[2]).toContain("zebra");
     });
 
-    it("each line is a default re-export", () => {
+    it("generates import statements and collections array", () => {
         const result = generateIndexContent(["users"]);
-        expect(result).toBe('export { default as users } from "./users";\n');
+        expect(result).toContain('import usersCollection from "./users";');
+        expect(result).toContain('export const collections = [');
+        expect(result).toContain('    usersCollection,');
+        expect(result).toContain('];');
     });
 });
 
@@ -361,16 +364,16 @@ describe("generateIndexContent", () => {
 // ═══════════════════════════════════════════════════════════════════════
 describe("mergeIndexContent", () => {
     it("adds new exports without duplicating existing ones", () => {
-        const existing = 'export { default as users } from "./users";\n';
+        const existing = 'import usersCollection from "./users";\n\nexport const collections = [\n    usersCollection,\n];\n';
         const result = mergeIndexContent(existing, ["users", "posts"]);
-        expect(result.match(/users/g)!.length).toBe(2); // one in existing, one mention in "users" still just 1 export line
-        expect(result).toContain('export { default as posts } from "./posts";');
-        // users should appear exactly once as an export statement
-        expect(result.match(/export.*users.*from/g)!.length).toBe(1);
+        expect(result.match(/import usersCollection from ".\/users";/g)!.length).toBe(1);
+        expect(result).toContain('import postsCollection from "./posts";');
+        expect(result).toContain('usersCollection,');
+        expect(result).toContain('postsCollection,');
     });
 
     it("returns existing content trimmed + newline when no new files", () => {
-        const existing = 'export { default as a } from "./a";\n';
+        const existing = 'import aCollection from "./a";\n\nexport const collections = [\n    aCollection,\n];\n';
         const result = mergeIndexContent(existing, ["a"]);
         expect(result.trim()).toBe(existing.trim());
     });