@lix-js/sdk 0.4.7 → 0.5.0-preview.1

package/dist/database/kysely-plugin/json-column-plugin.js

@@ -0,0 +1,210 @@
+import { ColumnNode, ColumnUpdateNode, InsertQueryNode, OnConflictNode, OperationNodeTransformer, ValueListNode, ValueNode, ValuesNode, } from "kysely";
+export function JSONColumnPlugin(jsonColumns) {
+    // Build a flat list of all JSON column names for the result transformer
+    const jsonColumnNames = Object.keys(jsonColumns).flatMap((table) => Object.keys(jsonColumns[table]));
+    return {
+        transformResult: async (args) => {
+            for (const row of args.result.rows) {
+                for (const col of jsonColumnNames) {
+                    const text = row[col];
+                    try {
+                        row[col] = JSON.parse(text);
+                    }
+                    catch {
+                        continue;
+                    }
+                }
+            }
+            return args.result;
+        },
+        transformQuery(args) {
+            if (args.node.kind === "InsertQueryNode") {
+                const tableNode = args.node.into;
+                const table = tableNode && tableNode.kind === "TableNode"
+                    ? tableNode.table.identifier.name
+                    : undefined;
+                const columns = args.node.columns;
+                const transformer = new SerializeJsonbTransformer(jsonColumns, table, columns);
+                return transformer.transformNode(args.node);
+            }
+            if (args.node.kind === "UpdateQueryNode") {
+                const tableNode = args.node.table;
+                let table = undefined;
+                if (tableNode && tableNode.kind === "TableNode") {
+                    // @ts-expect-error - kysely type narrowing
+                    table = tableNode.table.identifier.name;
+                }
+                const transformer = new SerializeJsonbTransformer(jsonColumns, table, undefined);
+                return transformer.transformNode(args.node);
+            }
+            return args.node;
+        },
+    };
+}
+class SerializeJsonbTransformer extends OperationNodeTransformer {
+    jsonbColumns;
+    table;
+    columns;
+    constructor(jsonbColumns, table, columns) {
+        super();
+        this.jsonbColumns = jsonbColumns;
+        this.table = table;
+        this.columns = columns;
+    }
+    getJsonColumnConfig(columnName) {
+        if (!this.table || !columnName)
+            return undefined;
+        return this.jsonbColumns[this.table]?.[columnName];
+    }
+    isJsonbColumn(columnName) {
+        return this.getJsonColumnConfig(columnName) !== undefined;
+    }
+    isSqlExpression(node) {
+        // Check if the node is a SQL expression that shouldn't be wrapped
+        // Common SQL expression node types:
+        // - RawNode: Created by sql`` template literals
+        // - FunctionNode: SQL functions like json_set()
+        // - BinaryOperationNode: SQL operations
+        // - etc.
+        // ValueNode is the only type we want to wrap in json()
+        return node && node.kind !== "ValueNode";
+    }
+    transformOnConflict(node) {
+        if (!node.updates) {
+            return node;
+        }
+        // Map the updates array directly
+        const newUpdates = node.updates.map((updateItem) => {
+            // Check if it's a ColumnUpdateNode first
+            if (updateItem.kind === "ColumnUpdateNode") {
+                // @ts-expect-error - kysely type narrowing
+                const columnName = updateItem.column.column.name;
+                if (this.isJsonbColumn(columnName)) {
+                    const valueNode = updateItem.value;
+                    // Check if the value is a SQL expression - if so, don't wrap it
+                    if (this.isSqlExpression(valueNode)) {
+                        return updateItem;
+                    }
+                    // Check if the value part is specifically a ValueNode
+                    if (valueNode.kind === "ValueNode") {
+                        // If it is, serialize it
+                        return {
+                            ...updateItem,
+                            value: this.serializeValue(
+                            // @ts-expect-error - kysely type narrowing
+                            valueNode, this.getJsonColumnConfig(columnName)),
+                        };
+                    }
+                }
+            }
+            // Return unchanged if not a ColumnUpdateNode or not a JSONB column or value is not ValueNode
+            return updateItem;
+        });
+        // Return a new node with the transformed updates
+        return {
+            ...node,
+            updates: newUpdates,
+        };
+    }
+    transformNode(node) {
+        if (!node) {
+            return node;
+        }
+        return super.transformNode(node);
+    }
+    // Serialize JSONB values in updates for ColumnUpdateNodes
+    transformColumnUpdate(node) {
+        // @ts-expect-error - kysely type narrowing
+        const columnName = node.column.column.name;
+        if (this.isJsonbColumn(columnName)) {
+            // Check if the value is a SQL expression (RawNode, etc.) - if so, don't wrap it
+            if (this.isSqlExpression(node.value)) {
+                return node;
+            }
+            return {
+                ...node,
+                value: this.serializeValue(
+                // @ts-expect-error - kysely type narrowing
+                node.value, this.getJsonColumnConfig(columnName)),
+            };
+        }
+        return super.transformColumnUpdate(node);
+    }
+    // Support .set("col", value) syntax (SetOperationNode)
+    transformSetOperation(node) {
+        // node.column.column.name is the column name for SetOperationNode
+        const columnName = node.column?.column?.name;
+        if (columnName && this.isJsonbColumn(columnName)) {
+            // Check if the value is a SQL expression - if so, don't wrap it
+            if (this.isSqlExpression(node.value)) {
+                return node;
+            }
+            return {
+                ...node,
+                value: this.serializeValue(node.value, this.getJsonColumnConfig(columnName)),
+            };
+        }
+        return super.transformSetOperation(node);
+    }
+    transformValues(node) {
+        const newValues = node.values.map((row) => {
+            // Handle literal JS values row
+            if (row.kind === "PrimitiveValueListNode") {
+                const newValueNodes = row.values.map((val, idx) => {
+                    const colNode = this.columns?.[idx];
+                    const valNode = { kind: "ValueNode", value: val };
+                    if (colNode?.kind === "ColumnNode" &&
+                        this.isJsonbColumn(colNode.column.name)) {
+                        const config = this.getJsonColumnConfig(colNode.column.name);
+                        return this.serializeValue(valNode, config);
+                    }
+                    return valNode;
+                });
+                return {
+                    kind: "ValueListNode",
+                    values: newValueNodes,
+                };
+            }
+            // Handle AST rows
+            if (row.kind === "ValueListNode") {
+                const newValuesList = row.values.map((valNode, idx) => {
+                    const colNode = this.columns?.[idx];
+                    if (colNode?.kind === "ColumnNode" &&
+                        this.isJsonbColumn(colNode.column.name)) {
+                        const config = this.getJsonColumnConfig(colNode.column.name);
+                        return this.serializeValue(valNode, config);
+                    }
+                    return valNode;
+                });
+                return { ...row, values: newValuesList };
+            }
+            return row;
+        });
+        return { ...node, values: newValues };
+    }
+    serializeValue(node, config) {
+        const val = node.value;
+        if (val instanceof ArrayBuffer || ArrayBuffer.isView(val) || val === null) {
+            return node;
+        }
+        // Check if this column only accepts objects and we have a string
+        // that might be pre-serialized JSON
+        if (config?.type === "object" && typeof val === "string") {
+            // For object-only columns, assume string values are pre-serialized JSON
+            // to avoid double serialization
+            return {
+                kind: "FunctionNode",
+                func: "json",
+                arguments: [{ kind: "ValueNode", value: val }],
+            };
+        }
+        // For all other cases, stringify the value
+        const jsonText = JSON.stringify(val);
+        return {
+            kind: "FunctionNode",
+            func: "json",
+            arguments: [{ kind: "ValueNode", value: jsonText }],
+        };
+    }
+}
+//# sourceMappingURL=json-column-plugin.js.map

package/dist/database/kysely-plugin/json-column-plugin.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"json-column-plugin.js","sourceRoot":"","sources":["../../../src/database/kysely-plugin/json-column-plugin.ts"],"names":[],"mappings":"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"}

package/dist/database/kysely-plugin/json-column-plugin.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=json-column-plugin.test.d.ts.map

package/dist/database/kysely-plugin/json-column-plugin.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"json-column-plugin.test.d.ts","sourceRoot":"","sources":["../../../src/database/kysely-plugin/json-column-plugin.test.ts"],"names":[],"mappings":""}

package/dist/database/kysely-plugin/json-column-plugin.test.js

@@ -0,0 +1,329 @@
+import { Kysely, sql } from "kysely";
+import { expect, test } from "vitest";
+import { createDialect, createInMemoryDatabase } from "sqlite-wasm-kysely";
+import { JSONColumnPlugin } from "./json-column-plugin.js";
+test("properly serializes string values for any-json columns", async () => {
+    const db = await mockDatabase();
+    // Insert with a string that looks like JSON
+    const jsonLikeString = '{"id":"test_id","name":"test_name","value":123}';
+    await db
+        .insertInto("mock_table")
+        .values({
+        data: jsonLikeString,
+        other: "value",
+    })
+        .execute();
+    // Verify the data was stored as a JSON string (since column accepts any JSON type)
+    const result = await sql `
+		SELECT json(data) as stored_data FROM mock_table
+	`.execute(db);
+    // The stored data should be the string as a JSON string
+    expect(result.rows[0]?.stored_data).toBe(JSON.stringify(jsonLikeString));
+    // Verify it can be parsed correctly
+    const parsed = JSON.parse(result.rows[0]?.stored_data);
+    expect(parsed).toBe(jsonLikeString);
+});
+test("correctly serializes JavaScript objects", async () => {
+    const db = await mockDatabase();
+    // Insert with a JavaScript object
+    const jsObject = { id: "test_id", name: "test_name", value: 123 };
+    await db
+        .insertInto("mock_table")
+        .values({
+        data: jsObject,
+        other: "value",
+    })
+        .execute();
+    // Verify the data was serialized and stored correctly
+    const result = await sql `
+		SELECT json(data) as stored_data FROM mock_table
+	`.execute(db);
+    // The stored data should be the serialized object
+    const parsed = JSON.parse(result.rows[0]?.stored_data);
+    expect(parsed).toEqual(jsObject);
+});
+test("handles null values correctly", async () => {
+    const db = await mockDatabase();
+    await db
+        .insertInto("mock_table")
+        .values({
+        data: null,
+        other: "value",
+    })
+        .execute();
+    const result = await sql `
+		SELECT data FROM mock_table
+	`.execute(db);
+    expect(result.rows[0]?.data).toBe(null);
+});
+test("handles updates with string values", async () => {
+    const db = await mockDatabase();
+    // First insert some data
+    await db
+        .insertInto("mock_table")
+        .values({
+        data: { initial: "data" },
+        other: "value",
+    })
+        .execute();
+    // Update with a string that looks like JSON
+    const jsonLikeString = '{"updated":"value","count":42}';
+    await db.updateTable("mock_table").set({ data: jsonLikeString }).execute();
+    // Verify the update properly serialized the string
+    const result = await sql `
+		SELECT json(data) as stored_data FROM mock_table
+	`.execute(db);
+    expect(result.rows[0]?.stored_data).toBe(JSON.stringify(jsonLikeString));
+});
+test("object-only columns prevent double serialization", async () => {
+    const database = await createInMemoryDatabase({ readOnly: false });
+    const db = new Kysely({
+        dialect: createDialect({ database }),
+        plugins: [
+            JSONColumnPlugin({
+                mock_table: {
+                    object_only: { type: "object" },
+                    any_json: {
+                        type: ["string", "number", "boolean", "object", "array", "null"],
+                    },
+                },
+            }),
+        ],
+    });
+    await sql `
+		CREATE TABLE mock_table (
+			id INTEGER PRIMARY KEY AUTOINCREMENT,
+			object_only TEXT,
+			any_json TEXT
+		) strict;
+	`.execute(db);
+    // For object-only columns, pre-serialized JSON strings should not be double-serialized
+    const preSerializedObject = '{"id":"test","value":123}';
+    await db
+        .insertInto("mock_table")
+        .values({
+        // @ts-expect-error - dynamic types
+        object_only: preSerializedObject,
+        any_json: "plain string",
+    })
+        .execute();
+    const result = await sql `
+		SELECT json(object_only) as object_only_data, json(any_json) as any_json_data FROM mock_table
+	`.execute(db);
+    // object_only should not be double-serialized
+    expect(result.rows[0]?.object_only_data).toBe(preSerializedObject);
+    expect(JSON.parse(result.rows[0]?.object_only_data)).toEqual({
+        id: "test",
+        value: 123,
+    });
+    // any_json should be properly serialized as a JSON string
+    expect(result.rows[0]?.any_json_data).toBe('"plain string"');
+});
+test("handles onConflict with string values", async () => {
+    const db = await mockDatabase();
+    // Insert initial data
+    await db
+        .insertInto("mock_table")
+        .values({
+        id: 1,
+        data: { initial: "data" },
+        other: "value",
+    })
+        .execute();
+    // Try to insert with same id, using onConflict with a string
+    const jsonLikeString = '{"conflict":"resolved","value":999}';
+    await db
+        .insertInto("mock_table")
+        .values({
+        id: 1,
+        data: { should: "not_be_used" },
+        other: "value",
+    })
+        .onConflict((oc) => oc.doUpdateSet({ data: jsonLikeString }))
+        .execute();
+    // Verify the conflict update properly serialized the string
+    const result = await sql `
+		SELECT json(data) as stored_data FROM mock_table WHERE id = 1
+	`.execute(db);
+    expect(result.rows[0]?.stored_data).toBe(JSON.stringify(jsonLikeString));
+});
+const mockDatabase = async () => {
+    const database = await createInMemoryDatabase({ readOnly: false });
+    const db = new Kysely({
+        dialect: createDialect({
+            database,
+        }),
+        plugins: [
+            JSONColumnPlugin({
+                mock_table: {
+                    data: {
+                        type: ["string", "number", "boolean", "object", "array", "null"],
+                    },
+                },
+            }),
+        ],
+    });
+    await sql `
+		CREATE TABLE mock_table (
+			id INTEGER PRIMARY KEY AUTOINCREMENT,
+			data TEXT,
+			other TEXT
+		) strict;
+	`.execute(db);
+    return db;
+};
+test("SQL expressions in JSON columns should not be wrapped in json()", async () => {
+    const db = await mockDatabase();
+    // Insert initial data
+    await db
+        .insertInto("mock_table")
+        .values({
+        data: {
+            enabled: true,
+            settings: {
+                theme: "dark",
+                language: "en",
+            },
+        },
+        other: "value",
+    })
+        .execute();
+    // Try to update using json_set SQL expression
+    const updateQuery = db
+        .updateTable("mock_table")
+        .set({
+        data: sql `json_set(data, '$.settings.theme', 'light')`,
+    })
+        .where("other", "=", "value")
+        .compile();
+    // The SQL should contain json_set directly, not wrapped in json()
+    // Currently this fails - it produces: update "mock_table" set "data" = json(?) where "other" = ?
+    // We want: update "mock_table" set "data" = json_set(data, '$.settings.theme', 'light') where "other" = ?
+    expect(updateQuery.sql).toContain("json_set");
+    expect(updateQuery.sql).not.toContain("json(?)");
+    // Execute the update
+    await db
+        .updateTable("mock_table")
+        .set({
+        data: sql `json_set(data, '$.settings.theme', 'light')`,
+    })
+        .where("other", "=", "value")
+        .execute();
+    // Verify the update worked correctly
+    const result = await db
+        .selectFrom("mock_table")
+        .select("data")
+        .executeTakeFirst();
+    expect(result?.data).toMatchObject({
+        enabled: true,
+        settings: {
+            theme: "light", // Changed from "dark"
+            language: "en",
+        },
+    });
+});
+test("Multiple SQL expressions in JSON columns", async () => {
+    const db = await mockDatabase();
+    // Insert initial data
+    await db
+        .insertInto("mock_table")
+        .values({
+        data: {
+            count: 10,
+            active: true,
+            nested: {
+                value: 100,
+            },
+        },
+        other: "test",
+    })
+        .execute();
+    // Update multiple properties using json_set
+    const updateQuery = db
+        .updateTable("mock_table")
+        .set({
+        data: sql `json_set(data, '$.count', 20, '$.active', false, '$.nested.value', 200)`,
+    })
+        .compile();
+    // Should not wrap the SQL expression
+    expect(updateQuery.sql).toContain("json_set");
+    expect(updateQuery.sql).not.toContain("json(?)");
+    await db
+        .updateTable("mock_table")
+        .set({
+        data: sql `json_set(data, '$.count', 20, '$.active', false, '$.nested.value', 200)`,
+    })
+        .execute();
+    const result = await db
+        .selectFrom("mock_table")
+        .select("data")
+        .executeTakeFirst();
+    expect(result?.data).toMatchObject({
+        count: 20,
+        active: 0, // SQLite stores false as 0
+        nested: {
+            value: 200,
+        },
+    });
+});
+test("SQL expressions in onConflict updates", async () => {
+    const db = await mockDatabase();
+    // Insert initial data
+    await db
+        .insertInto("mock_table")
+        .values({
+        id: 1,
+        data: {
+            version: 1,
+            name: "original",
+            metadata: {
+                updated: false,
+            },
+        },
+        other: "test",
+    })
+        .execute();
+    // Try to insert with same id, using onConflict with SQL expression
+    const insertQuery = db
+        .insertInto("mock_table")
+        .values({
+        id: 1,
+        data: { version: 2, name: "ignored" },
+        other: "test",
+    })
+        .onConflict((oc) => oc.doUpdateSet({
+        data: sql `json_set(data, '$.version', 2, '$.metadata.updated', true)`,
+    }))
+        .compile();
+    // The INSERT values will be wrapped in json(?), but the UPDATE should use json_set
+    expect(insertQuery.sql).toContain("json_set");
+    expect(insertQuery.sql).toContain("on conflict do update set");
+    // Verify json_set is in the UPDATE part, not wrapped in json()
+    expect(insertQuery.sql).toMatch(/do update set.*json_set.*\$\.version/);
+    // Execute the insert with conflict
+    await db
+        .insertInto("mock_table")
+        .values({
+        id: 1,
+        data: { version: 2, name: "ignored" },
+        other: "test",
+    })
+        .onConflict((oc) => oc.doUpdateSet({
+        data: sql `json_set(data, '$.version', 2, '$.metadata.updated', true)`,
+    }))
+        .execute();
+    // Verify the conflict update worked
+    const result = await db
+        .selectFrom("mock_table")
+        .where("id", "=", 1)
+        .select("data")
+        .executeTakeFirst();
+    expect(result?.data).toMatchObject({
+        version: 2, // Updated
+        name: "original", // Kept original
+        metadata: {
+            updated: 1, // SQLite stores true as 1
+        },
+    });
+});
+//# sourceMappingURL=json-column-plugin.test.js.map

package/dist/database/kysely-plugin/json-column-plugin.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"json-column-plugin.test.js","sourceRoot":"","sources":["../../../src/database/kysely-plugin/json-column-plugin.test.ts"],"names":[],"mappings":"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"}

package/dist/database/kysely-plugin/parse-jsonb-plugin-v1.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse-jsonb-plugin-v1.d.ts","sourceRoot":"","sources":["../../../src/database/kysely-plugin/parse-jsonb-plugin-v1.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,QAAQ,CAAC;AAU3C,wBAAgB,kBAAkB,CACjC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,GACpC,YAAY,CA0Cd"}
+{"version":3,"file":"parse-jsonb-plugin-v1.d.ts","sourceRoot":"","sources":["../../../src/database/kysely-plugin/parse-jsonb-plugin-v1.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,QAAQ,CAAC;AAU3C,wBAAgB,kBAAkB,CACjC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,GACpC,YAAY,CAqCd"}

package/dist/database/kysely-plugin/parse-jsonb-plugin-v1.js

@@ -12,26 +12,21 @@ export function ParseJsonBPluginV1(jsonbColumns) {
             }
             for (const row of args.result.rows) {
                 for (const col of jsonColumnNames) {
-                    if (!row[col]) {
-                        // result does not have a whitelisted json column
-                        // ! this is a heursitic. ideally, we invest into
-                        // ! building ParseJsonBPluginV2 that detects
-                        // ! json columns from the query itself
-                        // see https://github.com/opral/lix-sdk/issues/145
+                    const raw = row[col];
+                    // Only parse binary JSONB blobs
+                    if (!(raw instanceof Uint8Array)) {
                         continue;
                     }
                     try {
-                        // sqlite has it's own jsonb format
+                        // sqlite has its own jsonb format
                         // hence, need to query sqlite to convert
-                        // to json
                         const json = sqlite.exec("SELECT json(?)", {
-                            bind: [row[col]],
+                            bind: [raw],
                             returnValue: "resultRows",
                         })[0][0];
                         row[col] = JSON.parse(json);
                     }
                     catch {
-                        // it's not a json binary
                         continue;
                     }
                 }

package/dist/database/kysely-plugin/parse-jsonb-plugin-v1.js.map

@@ -1 +1 @@
-{"version":3,"file":"parse-jsonb-plugin-v1.js","sourceRoot":"","sources":["../../../src/database/kysely-plugin/parse-jsonb-plugin-v1.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,MAAM,QAAQ,CAAC;AAC3C,OAAO,EACN,sBAAsB,GAEtB,MAAM,oBAAoB,CAAC;AAE5B,kDAAkD;AAClD,+BAA+B;AAC/B,IAAI,MAA0B,CAAC;AAE/B,MAAM,UAAU,kBAAkB,CACjC,YAAsC;IAEtC,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,OAAO,CACxD,CAAC,GAAG,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,CAAE,CAC3B,CAAC;IAEF,OAAO;QACN,eAAe,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YAC/B,IAAI,CAAC,MAAM,EAAE,CAAC;gBACb,MAAM,GAAG,MAAM,sBAAsB,CAAC,EAAE,CAAC,CAAC;YAC3C,CAAC;YAED,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;gBACpC,KAAK,MAAM,GAAG,IAAI,eAAe,EAAE,CAAC;oBACnC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;wBACf,iDAAiD;wBACjD,iDAAiD;wBACjD,6CAA6C;wBAC7C,uCAAuC;wBACvC,kDAAkD;wBAClD,SAAS;oBACV,CAAC;oBACD,IAAI,CAAC;wBACJ,mCAAmC;wBACnC,yCAAyC;wBACzC,UAAU;wBACV,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,gBAAgB,EAAE;4BAC1C,IAAI,EAAE,CAAC,GAAG,CAAC,GAAG,CAAe,CAAC;4BAC9B,WAAW,EAAE,YAAY;yBACzB,CAAC,CAAC,CAAC,CAAE,CAAC,CAAC,CAAC,CAAC;wBAEV,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAc,CAAC,CAAC;oBACvC,CAAC;oBAAC,MAAM,CAAC;wBACR,yBAAyB;wBACzB,SAAS;oBACV,CAAC;gBACF,CAAC;YACF,CAAC;YAED,OAAO,IAAI,CAAC,MAAM,CAAC;QACpB,CAAC;QACD,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI;KACnC,CAAC;AACH,CAAC"}
+{"version":3,"file":"parse-jsonb-plugin-v1.js","sourceRoot":"","sources":["../../../src/database/kysely-plugin/parse-jsonb-plugin-v1.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,MAAM,QAAQ,CAAC;AAC3C,OAAO,EACN,sBAAsB,GAEtB,MAAM,oBAAoB,CAAC;AAE5B,kDAAkD;AAClD,+BAA+B;AAC/B,IAAI,MAA0B,CAAC;AAE/B,MAAM,UAAU,kBAAkB,CACjC,YAAsC;IAEtC,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,OAAO,CACxD,CAAC,GAAG,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,CAAE,CAC3B,CAAC;IAEF,OAAO;QACN,eAAe,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YAC/B,IAAI,CAAC,MAAM,EAAE,CAAC;gBACb,MAAM,GAAG,MAAM,sBAAsB,CAAC,EAAE,CAAC,CAAC;YAC3C,CAAC;YAED,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;gBACpC,KAAK,MAAM,GAAG,IAAI,eAAe,EAAE,CAAC;oBACnC,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;oBACrB,gCAAgC;oBAChC,IAAI,CAAC,CAAC,GAAG,YAAY,UAAU,CAAC,EAAE,CAAC;wBAClC,SAAS;oBACV,CAAC;oBACD,IAAI,CAAC;wBACJ,kCAAkC;wBAClC,yCAAyC;wBACzC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,gBAAgB,EAAE;4BAC1C,IAAI,EAAE,CAAC,GAAG,CAAC;4BACX,WAAW,EAAE,YAAY;yBACzB,CAAC,CAAC,CAAC,CAAE,CAAC,CAAC,CAAC,CAAC;wBAEV,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAc,CAAC,CAAC;oBACvC,CAAC;oBAAC,MAAM,CAAC;wBACR,SAAS;oBACV,CAAC;gBACF,CAAC;YACF,CAAC;YAED,OAAO,IAAI,CAAC,MAAM,CAAC;QACpB,CAAC;QACD,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI;KACnC,CAAC;AACH,CAAC"}

package/dist/database/kysely-plugin/parse-jsonb-plugin-v2.js

@@ -114,7 +114,7 @@ function transformSelections(selections, fromNodes, jsonbColumns) {
                     kind: "AliasNode",
                     node: {
                         kind: "FunctionNode",
-                        func: "json",
+                        func: "jsonb",
                         arguments: [
                             {
                                 kind: "ReferenceNode",

package/dist/database/kysely-plugin/parse-jsonb-plugin-v2.js.map

@@ -1 +1 @@
-{"version":3,"file":"parse-jsonb-plugin-v2.js","sourceRoot":"","sources":["../../../src/database/kysely-plugin/parse-jsonb-plugin-v2.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"parse-jsonb-plugin-v2.js","sourceRoot":"","sources":["../../../src/database/kysely-plugin/parse-jsonb-plugin-v2.ts"],"names":[],"mappings":"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"}