npm - neoorm - Versions diffs - 0.8.7 → 0.8.9 - Mend

neoorm 0.8.7 → 0.8.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (96) hide show

package/dist/bin/neoorm.d.ts.map +1 -1
package/dist/bin/neoorm.js +49 -7
package/dist/bin/neoorm.js.map +1 -1
package/dist/codegen/emit-includes.d.ts.map +1 -1
package/dist/codegen/emit-includes.js +1 -0
package/dist/codegen/emit-includes.js.map +1 -1
package/dist/migrate/dev-lock.d.ts.map +1 -1
package/dist/migrate/dev-lock.js +18 -3
package/dist/migrate/dev-lock.js.map +1 -1
package/dist/migrate/runner.d.ts +14 -0
package/dist/migrate/runner.d.ts.map +1 -1
package/dist/migrate/runner.js +135 -24
package/dist/migrate/runner.js.map +1 -1
package/dist/plugins/postgis/columns.js +2 -2
package/dist/plugins/postgis/columns.js.map +1 -1
package/dist/plugins/postgis/columns.test.js +36 -1
package/dist/plugins/postgis/columns.test.js.map +1 -1
package/dist/plugins/postgis/geojson.d.ts +2 -1
package/dist/plugins/postgis/geojson.d.ts.map +1 -1
package/dist/plugins/postgis/geojson.js +7 -2
package/dist/plugins/postgis/geojson.js.map +1 -1
package/dist/runtime/error-codes.d.ts +1 -0
package/dist/runtime/error-codes.d.ts.map +1 -1
package/dist/runtime/error-codes.js +1 -0
package/dist/runtime/error-codes.js.map +1 -1
package/dist/runtime/errors.d.ts.map +1 -1
package/dist/runtime/errors.js +4 -1
package/dist/runtime/errors.js.map +1 -1
package/dist/runtime/mysql-placeholders.d.ts.map +1 -1
package/dist/runtime/mysql-placeholders.js +8 -1
package/dist/runtime/mysql-placeholders.js.map +1 -1
package/dist/runtime/mysql-placeholders.test.js +10 -0
package/dist/runtime/mysql-placeholders.test.js.map +1 -1
package/dist/runtime/query/aggregate.d.ts.map +1 -1
package/dist/runtime/query/aggregate.js +3 -3
package/dist/runtime/query/aggregate.js.map +1 -1
package/dist/runtime/query/compile-aggregate.d.ts.map +1 -1
package/dist/runtime/query/compile-aggregate.js +5 -5
package/dist/runtime/query/compile-aggregate.js.map +1 -1
package/dist/runtime/query/compile-where.d.ts +17 -0
package/dist/runtime/query/compile-where.d.ts.map +1 -1
package/dist/runtime/query/compile-where.js +106 -22
package/dist/runtime/query/compile-where.js.map +1 -1
package/dist/runtime/query/compile-write.d.ts.map +1 -1
package/dist/runtime/query/compile-write.js +17 -6
package/dist/runtime/query/compile-write.js.map +1 -1
package/dist/runtime/query/compile.d.ts +1 -1
package/dist/runtime/query/compile.d.ts.map +1 -1
package/dist/runtime/query/compile.js +1 -1
package/dist/runtime/query/compile.js.map +1 -1
package/dist/runtime/query/count.js +1 -1
package/dist/runtime/query/count.js.map +1 -1
package/dist/runtime/query/cursor.d.ts.map +1 -1
package/dist/runtime/query/cursor.js +7 -2
package/dist/runtime/query/cursor.js.map +1 -1
package/dist/runtime/query/find.d.ts +1 -0
package/dist/runtime/query/find.d.ts.map +1 -1
package/dist/runtime/query/find.js +15 -14
package/dist/runtime/query/find.js.map +1 -1
package/dist/runtime/query/relation-planner.d.ts +1 -0
package/dist/runtime/query/relation-planner.d.ts.map +1 -1
package/dist/runtime/query/relation-planner.js +11 -9
package/dist/runtime/query/relation-planner.js.map +1 -1
package/dist/runtime/query/table-index.d.ts +18 -0
package/dist/runtime/query/table-index.d.ts.map +1 -1
package/dist/runtime/query/table-index.js +77 -1
package/dist/runtime/query/table-index.js.map +1 -1
package/dist/runtime/query/update.js +3 -3
package/dist/runtime/query/update.js.map +1 -1
package/dist/runtime/query/updated-at.d.ts +1 -1
package/dist/runtime/query/updated-at.d.ts.map +1 -1
package/dist/runtime/query/updated-at.js +2 -12
package/dist/runtime/query/updated-at.js.map +1 -1
package/dist/runtime/query/upsert.d.ts.map +1 -1
package/dist/runtime/query/upsert.js +6 -4
package/dist/runtime/query/upsert.js.map +1 -1
package/dist/runtime/schema-error.d.ts +2 -0
package/dist/runtime/schema-error.d.ts.map +1 -1
package/dist/runtime/schema-error.js +18 -0
package/dist/runtime/schema-error.js.map +1 -1
package/dist/schema/relation-types.d.ts +2 -1
package/dist/schema/relation-types.d.ts.map +1 -1
package/dist/studio/er-layout.d.ts +23 -0
package/dist/studio/er-layout.d.ts.map +1 -0
package/dist/studio/er-layout.js +111 -0
package/dist/studio/er-layout.js.map +1 -0
package/dist/studio/server.d.ts +3 -0
package/dist/studio/server.d.ts.map +1 -1
package/dist/studio/server.js +51 -0
package/dist/studio/server.js.map +1 -1
package/dist/studio-ui/assets/{index-Leicgvwr.js → index-ByHGD2Z0.js} +6 -6
package/dist/studio-ui/index.html +1 -1
package/docs/cli.md +3 -2
package/docs/migrations.md +8 -2
package/docs/studio.md +2 -1
package/package.json +1 -1

package/dist/migrate/runner.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"runner.js","sourceRoot":"","sources":["../../src/migrate/runner.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"runner.js","sourceRoot":"","sources":["../../src/migrate/runner.ts"],"names":[],"mappings":"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"}

package/dist/plugins/postgis/columns.js CHANGED Viewed

@@ -160,8 +160,8 @@ function createSpatialTypePlugin(kind, base, defaultOptions) {
         serializeValue(_col, value) {
             return geoJsonToParam(value);
         },
-        deserializeValue(_col, dbValue) {
-            return geoJsonFromValue(dbValue);
+        deserializeValue(col, dbValue) {
+            return geoJsonFromValue(dbValue, col);
         },
         whereOperators: postgisWhereOperators,
         introspect(_pgDataType, udtName) {

package/dist/plugins/postgis/columns.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"columns.js","sourceRoot":"","sources":["../../../src/plugins/postgis/columns.ts"],"names":[],"mappings":"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~~IAAI~~,EAAE,OAAO;~~YAC7B~~,OAAO,gBAAgB,CAAC,OAAO,CAAC,CAAC;~~QAClC~~,CAAC;QACD,cAAc,EAAE,qBAAqB;QACrC,UAAU,CAAC,WAAW,EAAE,OAAO;YAC9B,IAAI,IAAI,KAAK,WAAW,EAAE,CAAC;gBAC1B,OAAO,OAAO,KAAK,WAAW,CAAC;YAChC,CAAC;YACD,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;gBACtB,OAAO,OAAO,KAAK,UAAU,CAAC;YAC/B,CAAC;YACD,OAAO,OAAO,KAAK,UAAU,CAAC;QAC/B,CAAC;KACD,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,uBAAuB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;AAC5E,MAAM,CAAC,MAAM,aAAa,GAAG,uBAAuB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;AAC/E,MAAM,CAAC,MAAM,SAAS,GAAG,uBAAuB,CAAC,OAAO,EAAE,UAAU,EAAE;IACrE,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,IAAI;CACV,CAAC,CAAC;AAEH,6EAA6E;AAC7E,MAAM,UAAU,QAAQ,CAAC,OAAyB;IACjD,OAAO,YAAY,CAAC,aAAa,CAChC,OAA8C,CAC9C,CAAC;AACH,CAAC;AAED,kCAAkC;AAClC,MAAM,UAAU,SAAS,CAAC,OAA0B;IACnD,OAAO,aAAa,CAAC,aAAa,CACjC,OAA8C,CAC9C,CAAC;AACH,CAAC;AAED,oEAAoE;AACpE,MAAM,UAAU,KAAK,CAAC,OAAsB;IAC3C,OAAO,SAAS,CAAC,aAAa,CAC7B,OAA8C,CAC9C,CAAC;AACH,CAAC"}
1	+ {"version":3,"file":"columns.js","sourceRoot":"","sources":["../../../src/plugins/postgis/columns.ts"],"names":[],"mappings":"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"}

package/dist/plugins/postgis/columns.test.js CHANGED Viewed

@@ -1,6 +1,7 @@
 import { describe, expect, it } from "vitest";
-import { NeoOrmSchemaError } from "../../runtime/errors.js";
+import { InvalidInputError, NeoOrmSchemaError } from "../../runtime/errors.js";
 import { geography, geographyType, geometry, geometryType, point, pointType, } from "./columns.js";
+import { geoJsonFromValue } from "./geojson.js";
 function spatialColumn(kind, typeOptions) {
     return {
         tsName: "location",
@@ -77,4 +78,38 @@ describe("PostGIS spatial SQL types", () => {
         expect(geometryIr?.kind).toBe("union");
     });
 });
+describe("PostGIS GeoJSON parsing", () => {
+    const col = spatialColumn("geometry");
+    it("parses valid GeoJSON and passes through null/objects", () => {
+        expect(geoJsonFromValue('{"type":"Point","coordinates":[1,2]}', col)).toEqual({ type: "Point", coordinates: [1, 2] });
+        expect(geoJsonFromValue(null, col)).toBeNull();
+        expect(geoJsonFromValue(undefined, col)).toBeNull();
+        const obj = { type: "Point", coordinates: [1, 2] };
+        expect(geoJsonFromValue(obj, col)).toBe(obj);
+    });
+    it("wraps corrupt JSON in InvalidInputError instead of SyntaxError", () => {
+        let caught;
+        try {
+            geoJsonFromValue("not-json{{{", col);
+        }
+        catch (err) {
+            caught = err;
+        }
+        expect(caught).toBeInstanceOf(InvalidInputError);
+        expect(caught).not.toBeInstanceOf(SyntaxError);
+        expect(String(caught.message)).toContain("Database returned invalid JSON");
+    });
+    it("carries column context and surfaces via deserializeValue", () => {
+        try {
+            geometryType.deserializeValue?.(col, "not-json{{{");
+            expect.unreachable("expected corrupt GeoJSON to throw");
+        }
+        catch (err) {
+            expect(err).toBeInstanceOf(InvalidInputError);
+            const context = err.context;
+            expect(context?.columnTsName).toBe("location");
+            expect(context?.columnSqlName).toBe("location");
+        }
+    });
+});
 //# sourceMappingURL=columns.test.js.map

package/dist/plugins/postgis/columns.test.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"columns.test.js","sourceRoot":"","sources":["../../../src/plugins/postgis/columns.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;~~AAC5D~~,OAAO,EACN,SAAS,EACT,aAAa,EACb,QAAQ,EACR,YAAY,EACZ,KAAK,EACL,SAAS,GACT,MAAM,cAAc,CAAC;~~AAEtB~~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"}
1	+ {"version":3,"file":"columns.test.js","sourceRoot":"","sources":["../../../src/plugins/postgis/columns.test.ts"],"names":[],"mappings":"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"}

package/dist/plugins/postgis/geojson.d.ts CHANGED Viewed

@@ -1,4 +1,5 @@
+import type { ManifestColumn } from "../../dialect/types.js";
 import type { GeoJsonGeometry } from "./columns.js";
 export declare function geoJsonToParam(value: unknown): unknown;
-export declare function geoJsonFromValue(dbValue: unknown): GeoJsonGeometry | null;
+export declare function geoJsonFromValue(dbValue: unknown, col?: ManifestColumn): GeoJsonGeometry | null;
 //# sourceMappingURL=geojson.d.ts.map

package/dist/plugins/postgis/geojson.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"geojson.d.ts","sourceRoot":"","sources":["../../../src/plugins/postgis/geojson.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAEpD,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAQtD;AAED,wBAAgB,gBAAgB,~~CAAC~~,OAAO,EAAE,OAAO,GAAG,eAAe,GAAG,IAAI,~~CAWzE~~"}
1	+ {"version":3,"file":"geojson.d.ts","sourceRoot":"","sources":["../../../src/plugins/postgis/geojson.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAE7D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAEpD,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAQtD;AAED,wBAAgB,gBAAgB,CAC/B,OAAO,EAAE,OAAO,EAChB,GAAG,CAAC,EAAE,cAAc,GAClB,eAAe,GAAG,IAAI,CAexB"}

package/dist/plugins/postgis/geojson.js CHANGED Viewed

@@ -1,3 +1,4 @@
+import { parseDbJsonValue } from "../../runtime/parse-db-json.js";
 export function geoJsonToParam(value) {
     if (value === null || value === undefined) {
         return null;
@@ -7,12 +8,16 @@ export function geoJsonToParam(value) {
     }
     return JSON.stringify(value);
 }
-export function geoJsonFromValue(dbValue) {
+export function geoJsonFromValue(dbValue, col) {
     if (dbValue === null || dbValue === undefined) {
         return null;
     }
     if (typeof dbValue === "string") {
-        return JSON.parse(dbValue);
+        return parseDbJsonValue(dbValue, {
+            ...(col !== undefined
+                ? { columnTsName: col.tsName, columnSqlName: col.sqlName }
+                : {}),
+        });
     }
     if (typeof dbValue === "object") {
         return dbValue;

package/dist/plugins/postgis/geojson.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"geojson.js","sourceRoot":"","sources":["../../../src/plugins/postgis/geojson.ts"],"names":[],"mappings":"~~AAEA~~,MAAM,UAAU,cAAc,CAAC,KAAc;IAC5C,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QAC3C,OAAO,IAAI,CAAC;IACb,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC/B,OAAO,KAAK,CAAC;IACd,CAAC;IACD,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;AAC9B,CAAC;AAED,MAAM,UAAU,gBAAgB,~~CAAC~~,OAAgB;~~IAChD~~,IAAI,OAAO,KAAK,IAAI,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC/C,OAAO,IAAI,CAAC;IACb,CAAC;IACD,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;QACjC,OAAO,~~IAAI~~,CAAC,KAAK,CAAC,OAAO,CAAoB,CAAC;~~IAC/C~~,CAAC;IACD,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;QACjC,OAAO,OAA0B,CAAC;IACnC,CAAC;IACD,OAAO,IAAI,CAAC;AACb,CAAC"}
1	+ {"version":3,"file":"geojson.js","sourceRoot":"","sources":["../../../src/plugins/postgis/geojson.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAGlE,MAAM,UAAU,cAAc,CAAC,KAAc;IAC5C,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QAC3C,OAAO,IAAI,CAAC;IACb,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC/B,OAAO,KAAK,CAAC;IACd,CAAC;IACD,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;AAC9B,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC/B,OAAgB,EAChB,GAAoB;IAEpB,IAAI,OAAO,KAAK,IAAI,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC/C,OAAO,IAAI,CAAC;IACb,CAAC;IACD,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;QACjC,OAAO,gBAAgB,CAAC,OAAO,EAAE;YAChC,GAAG,CAAC,GAAG,KAAK,SAAS;gBACpB,CAAC,CAAC,EAAE,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,CAAC,OAAO,EAAE;gBAC1D,CAAC,CAAC,EAAE,CAAC;SACN,CAAoB,CAAC;IACvB,CAAC;IACD,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;QACjC,OAAO,OAA0B,CAAC;IACnC,CAAC;IACD,OAAO,IAAI,CAAC;AACb,CAAC"}

package/dist/runtime/error-codes.d.ts CHANGED Viewed

@@ -41,6 +41,7 @@ export declare const SchemaErrorCode: {
     readonly unknown_fk_column: "unknown_fk_column";
     readonly unknown_column_kind: "unknown_column_kind";
     readonly migration_failed: "migration_failed";
+    readonly migration_drift: "migration_drift";
     readonly migration_guard: "migration_guard";
     readonly invalid_config: "invalid_config";
     readonly plugin_error: "plugin_error";

package/dist/runtime/error-codes.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"error-codes.d.ts","sourceRoot":"","sources":["../../src/runtime/error-codes.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,eAAO,MAAM,cAAc;aAE1B,gBAAgB,EAAE,kBAAkB;aACpC,kBAAkB,EAAE,oBAAoB;aACxC,qBAAqB,EAAE,uBAAuB;aAC9C,eAAe,EAAE,iBAAiB;aAClC,aAAa,EAAE,eAAe;aAC9B,kBAAkB,EAAE,oBAAoB;aACxC,gBAAgB,EAAE,kBAAkB;aACpC,eAAe,EAAE,iBAAiB;aAClC,gBAAgB,EAAE,kBAAkB;aACpC,YAAY,EAAE,cAAc;aAG5B,aAAa,EAAE,eAAe;aAC9B,cAAc,EAAE,gBAAgB;aAChC,gBAAgB,EAAE,kBAAkB;aACpC,oBAAoB,EAAE,sBAAsB;aAC5C,cAAc,EAAE,gBAAgB;aAChC,YAAY,EAAE,cAAc;aAC5B,cAAc,EAAE,gBAAgB;aAChC,oBAAoB,EAAE,sBAAsB;aAC5C,mBAAmB,EAAE,qBAAqB;aAC1C,qBAAqB,EAAE,uBAAuB;CACrC,CAAC;AAEX,MAAM,MAAM,mBAAmB,GAC9B,CAAC,OAAO,cAAc,CAAC,CAAC,MAAM,OAAO,cAAc,CAAC,CAAC;AAEtD,+CAA+C;AAC/C,eAAO,MAAM,eAAe;aAC3B,qBAAqB,EAAE,uBAAuB;aAC9C,cAAc,EAAE,gBAAgB;aAChC,kBAAkB,EAAE,oBAAoB;aACxC,sBAAsB,EAAE,wBAAwB;aAChD,mBAAmB,EAAE,qBAAqB;aAC1C,cAAc,EAAE,gBAAgB;aAChC,kBAAkB,EAAE,oBAAoB;aACxC,mBAAmB,EAAE,qBAAqB;aAC1C,kBAAkB,EAAE,oBAAoB;aACxC,uBAAuB,EAAE,yBAAyB;aAClD,iBAAiB,EAAE,mBAAmB;aACtC,oBAAoB,EAAE,sBAAsB;aAC5C,wBAAwB,EAAE,0BAA0B;aACpD,iBAAiB,EAAE,mBAAmB;aACtC,iBAAiB,EAAE,mBAAmB;aACtC,mBAAmB,EAAE,qBAAqB;aAC1C,gBAAgB,EAAE,kBAAkB;aACpC,eAAe,EAAE,iBAAiB;aAClC,cAAc,EAAE,gBAAgB;aAChC,YAAY,EAAE,cAAc;CACnB,CAAC;AAEX,MAAM,MAAM,oBAAoB,GAC/B,CAAC,OAAO,eAAe,CAAC,CAAC,MAAM,OAAO,eAAe,CAAC,CAAC;AAExD,eAAO,MAAM,wBAAwB,0BAInC,CAAC"}
1	+ {"version":3,"file":"error-codes.d.ts","sourceRoot":"","sources":["../../src/runtime/error-codes.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,eAAO,MAAM,cAAc;aAE1B,gBAAgB,EAAE,kBAAkB;aACpC,kBAAkB,EAAE,oBAAoB;aACxC,qBAAqB,EAAE,uBAAuB;aAC9C,eAAe,EAAE,iBAAiB;aAClC,aAAa,EAAE,eAAe;aAC9B,kBAAkB,EAAE,oBAAoB;aACxC,gBAAgB,EAAE,kBAAkB;aACpC,eAAe,EAAE,iBAAiB;aAClC,gBAAgB,EAAE,kBAAkB;aACpC,YAAY,EAAE,cAAc;aAG5B,aAAa,EAAE,eAAe;aAC9B,cAAc,EAAE,gBAAgB;aAChC,gBAAgB,EAAE,kBAAkB;aACpC,oBAAoB,EAAE,sBAAsB;aAC5C,cAAc,EAAE,gBAAgB;aAChC,YAAY,EAAE,cAAc;aAC5B,cAAc,EAAE,gBAAgB;aAChC,oBAAoB,EAAE,sBAAsB;aAC5C,mBAAmB,EAAE,qBAAqB;aAC1C,qBAAqB,EAAE,uBAAuB;CACrC,CAAC;AAEX,MAAM,MAAM,mBAAmB,GAC9B,CAAC,OAAO,cAAc,CAAC,CAAC,MAAM,OAAO,cAAc,CAAC,CAAC;AAEtD,+CAA+C;AAC/C,eAAO,MAAM,eAAe;aAC3B,qBAAqB,EAAE,uBAAuB;aAC9C,cAAc,EAAE,gBAAgB;aAChC,kBAAkB,EAAE,oBAAoB;aACxC,sBAAsB,EAAE,wBAAwB;aAChD,mBAAmB,EAAE,qBAAqB;aAC1C,cAAc,EAAE,gBAAgB;aAChC,kBAAkB,EAAE,oBAAoB;aACxC,mBAAmB,EAAE,qBAAqB;aAC1C,kBAAkB,EAAE,oBAAoB;aACxC,uBAAuB,EAAE,yBAAyB;aAClD,iBAAiB,EAAE,mBAAmB;aACtC,oBAAoB,EAAE,sBAAsB;aAC5C,wBAAwB,EAAE,0BAA0B;aACpD,iBAAiB,EAAE,mBAAmB;aACtC,iBAAiB,EAAE,mBAAmB;aACtC,mBAAmB,EAAE,qBAAqB;aAC1C,gBAAgB,EAAE,kBAAkB;aACpC,eAAe,EAAE,iBAAiB;aAClC,eAAe,EAAE,iBAAiB;aAClC,cAAc,EAAE,gBAAgB;aAChC,YAAY,EAAE,cAAc;CACnB,CAAC;AAEX,MAAM,MAAM,oBAAoB,GAC/B,CAAC,OAAO,eAAe,CAAC,CAAC,MAAM,OAAO,eAAe,CAAC,CAAC;AAExD,eAAO,MAAM,wBAAwB,0BAInC,CAAC"}

package/dist/runtime/error-codes.js CHANGED Viewed

@@ -42,6 +42,7 @@ export const SchemaErrorCode = {
     unknown_fk_column: "unknown_fk_column",
     unknown_column_kind: "unknown_column_kind",
     migration_failed: "migration_failed",
+    migration_drift: "migration_drift",
     migration_guard: "migration_guard",
     invalid_config: "invalid_config",
     plugin_error: "plugin_error",

package/dist/runtime/error-codes.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"error-codes.js","sourceRoot":"","sources":["../../src/runtime/error-codes.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,MAAM,CAAC,MAAM,cAAc,GAAG;IAC7B,iCAAiC;IACjC,gBAAgB,EAAE,kBAAkB;IACpC,kBAAkB,EAAE,oBAAoB;IACxC,qBAAqB,EAAE,uBAAuB;IAC9C,eAAe,EAAE,iBAAiB;IAClC,aAAa,EAAE,eAAe;IAC9B,kBAAkB,EAAE,oBAAoB;IACxC,gBAAgB,EAAE,kBAAkB;IACpC,eAAe,EAAE,iBAAiB;IAClC,gBAAgB,EAAE,kBAAkB;IACpC,YAAY,EAAE,cAAc;IAE5B,4BAA4B;IAC5B,aAAa,EAAE,eAAe;IAC9B,cAAc,EAAE,gBAAgB;IAChC,gBAAgB,EAAE,kBAAkB;IACpC,oBAAoB,EAAE,sBAAsB;IAC5C,cAAc,EAAE,gBAAgB;IAChC,YAAY,EAAE,cAAc;IAC5B,cAAc,EAAE,gBAAgB;IAChC,oBAAoB,EAAE,sBAAsB;IAC5C,mBAAmB,EAAE,qBAAqB;IAC1C,qBAAqB,EAAE,uBAAuB;CACrC,CAAC;AAKX,+CAA+C;AAC/C,MAAM,CAAC,MAAM,eAAe,GAAG;IAC9B,qBAAqB,EAAE,uBAAuB;IAC9C,cAAc,EAAE,gBAAgB;IAChC,kBAAkB,EAAE,oBAAoB;IACxC,sBAAsB,EAAE,wBAAwB;IAChD,mBAAmB,EAAE,qBAAqB;IAC1C,cAAc,EAAE,gBAAgB;IAChC,kBAAkB,EAAE,oBAAoB;IACxC,mBAAmB,EAAE,qBAAqB;IAC1C,kBAAkB,EAAE,oBAAoB;IACxC,uBAAuB,EAAE,yBAAyB;IAClD,iBAAiB,EAAE,mBAAmB;IACtC,oBAAoB,EAAE,sBAAsB;IAC5C,wBAAwB,EAAE,0BAA0B;IACpD,iBAAiB,EAAE,mBAAmB;IACtC,iBAAiB,EAAE,mBAAmB;IACtC,mBAAmB,EAAE,qBAAqB;IAC1C,gBAAgB,EAAE,kBAAkB;IACpC,eAAe,EAAE,iBAAiB;IAClC,cAAc,EAAE,gBAAgB;IAChC,YAAY,EAAE,cAAc;CACnB,CAAC;AAKX,MAAM,CAAC,MAAM,wBAAwB,GAAG,IAAI,GAAG,CAAsB;IACpE,cAAc,CAAC,kBAAkB;IACjC,cAAc,CAAC,gBAAgB;IAC/B,cAAc,CAAC,qBAAqB;CACpC,CAAC,CAAC"}
1	+ {"version":3,"file":"error-codes.js","sourceRoot":"","sources":["../../src/runtime/error-codes.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,MAAM,CAAC,MAAM,cAAc,GAAG;IAC7B,iCAAiC;IACjC,gBAAgB,EAAE,kBAAkB;IACpC,kBAAkB,EAAE,oBAAoB;IACxC,qBAAqB,EAAE,uBAAuB;IAC9C,eAAe,EAAE,iBAAiB;IAClC,aAAa,EAAE,eAAe;IAC9B,kBAAkB,EAAE,oBAAoB;IACxC,gBAAgB,EAAE,kBAAkB;IACpC,eAAe,EAAE,iBAAiB;IAClC,gBAAgB,EAAE,kBAAkB;IACpC,YAAY,EAAE,cAAc;IAE5B,4BAA4B;IAC5B,aAAa,EAAE,eAAe;IAC9B,cAAc,EAAE,gBAAgB;IAChC,gBAAgB,EAAE,kBAAkB;IACpC,oBAAoB,EAAE,sBAAsB;IAC5C,cAAc,EAAE,gBAAgB;IAChC,YAAY,EAAE,cAAc;IAC5B,cAAc,EAAE,gBAAgB;IAChC,oBAAoB,EAAE,sBAAsB;IAC5C,mBAAmB,EAAE,qBAAqB;IAC1C,qBAAqB,EAAE,uBAAuB;CACrC,CAAC;AAKX,+CAA+C;AAC/C,MAAM,CAAC,MAAM,eAAe,GAAG;IAC9B,qBAAqB,EAAE,uBAAuB;IAC9C,cAAc,EAAE,gBAAgB;IAChC,kBAAkB,EAAE,oBAAoB;IACxC,sBAAsB,EAAE,wBAAwB;IAChD,mBAAmB,EAAE,qBAAqB;IAC1C,cAAc,EAAE,gBAAgB;IAChC,kBAAkB,EAAE,oBAAoB;IACxC,mBAAmB,EAAE,qBAAqB;IAC1C,kBAAkB,EAAE,oBAAoB;IACxC,uBAAuB,EAAE,yBAAyB;IAClD,iBAAiB,EAAE,mBAAmB;IACtC,oBAAoB,EAAE,sBAAsB;IAC5C,wBAAwB,EAAE,0BAA0B;IACpD,iBAAiB,EAAE,mBAAmB;IACtC,iBAAiB,EAAE,mBAAmB;IACtC,mBAAmB,EAAE,qBAAqB;IAC1C,gBAAgB,EAAE,kBAAkB;IACpC,eAAe,EAAE,iBAAiB;IAClC,eAAe,EAAE,iBAAiB;IAClC,cAAc,EAAE,gBAAgB;IAChC,YAAY,EAAE,cAAc;CACnB,CAAC;AAKX,MAAM,CAAC,MAAM,wBAAwB,GAAG,IAAI,GAAG,CAAsB;IACpE,cAAc,CAAC,kBAAkB;IACjC,cAAc,CAAC,gBAAgB;IAC/B,cAAc,CAAC,qBAAqB;CACpC,CAAC,CAAC"}

package/dist/runtime/errors.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/runtime/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,KAAK,mBAAmB,EACxB,KAAK,oBAAoB,EACzB,MAAM,kBAAkB,CAAC;AAE1B,MAAM,MAAM,cAAc,GACvB,QAAQ,GACR,QAAQ,GACR,QAAQ,GACR,QAAQ,GACR,QAAQ,GACR,cAAc,GACd,KAAK,CAAC;AAET,oDAAoD;AACpD,MAAM,MAAM,iBAAiB,GAAG;IAC/B,SAAS,EAAE,cAAc,CAAC;IAC1B,IAAI,EAAE,mBAAmB,CAAC;IAC1B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,SAAS,GAAG,SAAS,CAAC;IAC9B,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AAEF,qDAAqD;AACrD,MAAM,MAAM,kBAAkB,GAAG;IAChC,IAAI,EAAE,oBAAoB,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AA+BF,8DAA8D;AAC9D,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,iBAAiB,GAAG,MAAM,CAuDnE;AAED,+DAA+D;AAC/D,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,kBAAkB,GAAG,MAAM,~~CAiDrE~~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"}
1	+ {"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/runtime/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,KAAK,mBAAmB,EACxB,KAAK,oBAAoB,EACzB,MAAM,kBAAkB,CAAC;AAE1B,MAAM,MAAM,cAAc,GACvB,QAAQ,GACR,QAAQ,GACR,QAAQ,GACR,QAAQ,GACR,QAAQ,GACR,cAAc,GACd,KAAK,CAAC;AAET,oDAAoD;AACpD,MAAM,MAAM,iBAAiB,GAAG;IAC/B,SAAS,EAAE,cAAc,CAAC;IAC1B,IAAI,EAAE,mBAAmB,CAAC;IAC1B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,SAAS,GAAG,SAAS,CAAC;IAC9B,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AAEF,qDAAqD;AACrD,MAAM,MAAM,kBAAkB,GAAG;IAChC,IAAI,EAAE,oBAAoB,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AA+BF,8DAA8D;AAC9D,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,iBAAiB,GAAG,MAAM,CAuDnE;AAED,+DAA+D;AAC/D,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,kBAAkB,GAAG,MAAM,CAmDrE;AAED,wCAAwC;AACxC,8BAAsB,WAAY,SAAQ,KAAK;IAC9C,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAC/B,SAAkB,KAAK,EAAE,OAAO,CAAC;IAEjC,YAAY,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAI3C;CACD;AAED,oEAAoE;AACpE,qBAAa,gBAAiB,SAAQ,WAAW;IAChD,QAAQ,CAAC,OAAO,EAAE,iBAAiB,CAAC;IACpC,QAAQ,CAAC,IAAI,EAAE,mBAAmB,CAAC;IAEnC,YAAY,OAAO,EAAE,iBAAiB,EAAE,KAAK,CAAC,EAAE,OAAO,EAKtD;CACD;AAED,0EAA0E;AAC1E,qBAAa,iBAAkB,SAAQ,gBAAgB;IACtD,YAAY,OAAO,EAAE,iBAAiB,EAAE,KAAK,CAAC,EAAE,OAAO,EAGtD;CACD;AAED,mEAAmE;AACnE,qBAAa,oBAAqB,SAAQ,gBAAgB;IACzD,YAAY,OAAO,EAAE,iBAAiB,EAAE,KAAK,CAAC,EAAE,OAAO,EAUtD;CACD;AAED,wEAAwE;AACxE,qBAAa,wBAAyB,SAAQ,gBAAgB;IAC7D,YAAY,OAAO,EAAE,iBAAiB,EAAE,KAAK,CAAC,EAAE,OAAO,EAUtD;CACD;AAED,qEAAqE;AACrE,qBAAa,qBAAsB,SAAQ,gBAAgB;IAC1D,YAAY,OAAO,EAAE,iBAAiB,EAAE,KAAK,CAAC,EAAE,OAAO,EAUtD;CACD;AAED,kEAAkE;AAClE,qBAAa,mBAAoB,SAAQ,gBAAgB;IACxD,YAAY,OAAO,EAAE,iBAAiB,EAAE,KAAK,CAAC,EAAE,OAAO,EAUtD;CACD;AAED,0EAA0E;AAC1E,qBAAa,iBAAkB,SAAQ,gBAAgB;IACtD,YAAY,OAAO,EAAE,iBAAiB,EAAE,KAAK,CAAC,EAAE,OAAO,EAUtD;CACD;AAED,+DAA+D;AAC/D,qBAAa,gBAAiB,SAAQ,gBAAgB;IACrD,YAAY,OAAO,EAAE,iBAAiB,EAAE,KAAK,CAAC,EAAE,OAAO,EAGtD;CACD;AAED,+DAA+D;AAC/D,wBAAgB,gBAAgB,CAC/B,OAAO,EAAE,iBAAiB,EAC1B,KAAK,CAAC,EAAE,OAAO,GACb,gBAAgB,CAsBlB;AAED,yDAAyD;AACzD,qBAAa,iBAAkB,SAAQ,WAAW;IACjD,QAAQ,CAAC,OAAO,EAAE,kBAAkB,CAAC;IACrC,QAAQ,CAAC,IAAI,EAAE,oBAAoB,CAAC;IAEpC,YAAY,OAAO,EAAE,kBAAkB,EAAE,KAAK,CAAC,EAAE,OAAO,EAKvD;CACD;AAED,2DAA2D;AAC3D,qBAAa,iBAAkB,SAAQ,WAAW;IACjD,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,IAAI,iBAA+B;IAE5C,YAAY,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAK5C;CACD;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,WAAW,CAE9D;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,gBAAgB,CAElE;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,iBAAiB,CAEpE;AAED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,iBAAiB,CAE1E;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,oBAAoB,CAE3E;AAED,wBAAgB,qBAAqB,CACpC,GAAG,EAAE,OAAO,GACV,GAAG,IAAI,wBAAwB,CAEjC;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,qBAAqB,CAE7E;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,mBAAmB,CAEzE;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,iBAAiB,CAErE;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,gBAAgB,CAExE"}

package/dist/runtime/errors.js CHANGED Viewed

@@ -77,7 +77,10 @@ export function formatQueryError(context) {
 /** Format a schema error context into a multi-line message. */
 export function formatSchemaError(context) {
     const lines = [];
-    if (context.schemaPath) {
+    if (context.migrationName) {
+        lines.push("Migration error");
+    }
+    else if (context.schemaPath) {
         lines.push(`Schema error in ${context.schemaPath}`);
     }
     else {

package/dist/runtime/errors.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/runtime/errors.ts"],"names":[],"mappings":"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~~QACxB~~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"}
1	+ {"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/runtime/errors.ts"],"names":[],"mappings":"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"}

package/dist/runtime/mysql-placeholders.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"mysql-placeholders.d.ts","sourceRoot":"","sources":["../../src/runtime/mysql-placeholders.ts"],"names":[],"mappings":"~~AAEA~~;;;GAGG;AAEH,MAAM,MAAM,cAAc,GAAG;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,EAAE,CAAC;CAChB,CAAC;AAMF,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,GAAG,IAAI,CAuG3E;AAED,wBAAgB,mBAAmB,CAClC,IAAI,EAAE,cAAc,GAAG,IAAI,EAC3B,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,OAAO,EAAE,GACf;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,OAAO,EAAE,CAAA;CAAE,~~CAMpC~~;AAWD,wBAAgB,2BAA2B,CAC1C,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,OAAO,EAAE,GACf;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,OAAO,EAAE,CAAA;CAAE,CAMpC"}
1	+ {"version":3,"file":"mysql-placeholders.d.ts","sourceRoot":"","sources":["../../src/runtime/mysql-placeholders.ts"],"names":[],"mappings":"AAIA;;;GAGG;AAEH,MAAM,MAAM,cAAc,GAAG;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,EAAE,CAAC;CAChB,CAAC;AAMF,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,GAAG,IAAI,CAuG3E;AAED,wBAAgB,mBAAmB,CAClC,IAAI,EAAE,cAAc,GAAG,IAAI,EAC3B,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,OAAO,EAAE,GACf;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,OAAO,EAAE,CAAA;CAAE,CAcpC;AAWD,wBAAgB,2BAA2B,CAC1C,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,OAAO,EAAE,GACf;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,OAAO,EAAE,CAAA;CAAE,CAMpC"}

package/dist/runtime/mysql-placeholders.js CHANGED Viewed

@@ -1,3 +1,5 @@
+import { compileError } from "./compile-error.js";
+import { QueryErrorCode } from "./error-codes.js";
 import { CappedMap } from "./query/table-index.js";
 const NUMBERED_PLACEHOLDER = /\$\d/;
 const PLAN_CACHE_MAX = 1000;
@@ -113,7 +115,12 @@ export function applyPositionalPlan(plan, sql, params) {
         return { sql, params };
     return {
         sql: plan.sql,
-        params: plan.slots.map((index) => params[index - 1] ?? null),
+        params: plan.slots.map((index) => {
+            if (index < 1 || index > params.length) {
+                compileError(`placeholder $${index} has no bound value (${params.length} params provided)`, { code: QueryErrorCode.invalid_args });
+            }
+            return params[index - 1] ?? null;
+        }),
     };
 }
 function planNumberedToPositionalCached(sql) {

package/dist/runtime/mysql-placeholders.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"mysql-placeholders.js","sourceRoot":"","sources":["../../src/runtime/mysql-placeholders.ts"],"names":[],"mappings":"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~~KAC5D~~,CAAC;AACH,CAAC;AAED,SAAS,8BAA8B,CAAC,GAAW;IAClD,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,GAAG,CAAC;QAAE,OAAO,IAAI,CAAC;IACjD,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAClC,IAAI,MAAM;QAAE,OAAO,MAAM,CAAC;IAC1B,MAAM,IAAI,GAAG,wBAAwB,CAAC,GAAG,CAAC,CAAC;IAC3C,IAAI,IAAI;QAAE,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACnC,OAAO,IAAI,CAAC;AACb,CAAC;AAED,MAAM,UAAU,2BAA2B,CAC1C,GAAW,EACX,MAAiB;IAEjB,OAAO,mBAAmB,CACzB,8BAA8B,CAAC,GAAG,CAAC,EACnC,GAAG,EACH,MAAM,CACN,CAAC;AACH,CAAC"}
1	+ {"version":3,"file":"mysql-placeholders.js","sourceRoot":"","sources":["../../src/runtime/mysql-placeholders.ts"],"names":[],"mappings":"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"}

package/dist/runtime/mysql-placeholders.test.js CHANGED Viewed

@@ -29,5 +29,15 @@ describe("convertNumberedToPositional", () => {
             params: ["second", "second"],
         });
     });
+    it("throws on out-of-range placeholders instead of binding NULL", () => {
+        expect(() => convertNumberedToPositional("SELECT $1, $3", ["a", "b"])).toThrow("placeholder $3 has no bound value (2 params provided)");
+        expect(() => convertNumberedToPositional("SELECT $0", ["a"])).toThrow("placeholder $0 has no bound value (1 params provided)");
+    });
+    it("still coerces in-range undefined to NULL", () => {
+        expect(convertNumberedToPositional("SELECT $1", [undefined])).toEqual({
+            sql: "SELECT ?",
+            params: [null],
+        });
+    });
 });
 //# sourceMappingURL=mysql-placeholders.test.js.map

package/dist/runtime/mysql-placeholders.test.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"mysql-placeholders.test.js","sourceRoot":"","sources":["../../src/runtime/mysql-placeholders.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EACN,2BAA2B,EAC3B,wBAAwB,GACxB,MAAM,yBAAyB,CAAC;AAEjC,QAAQ,CAAC,6BAA6B,EAAE,GAAG,EAAE;IAC5C,EAAE,CAAC,wCAAwC,EAAE,GAAG,EAAE;QACjD,MAAM,MAAM,GAAG,2BAA2B,CACzC,oDAAoD,EACpD,CAAC,GAAG,EAAE,GAAG,CAAC,CACV,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CACtB,iDAAiD,CACjD,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;QAC1D,MAAM,MAAM,GAAG,2BAA2B,CACzC,wCAAwC,EACxC,CAAC,CAAC,CAAC,CACH,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAC;QACjE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;QACrD,MAAM,CAAC,wBAAwB,CAAC,6BAA6B,CAAC,CAAC,CAAC,IAAI,CACnE,IAAI,CACJ,CAAC;QACF,MAAM,CACL,wBAAwB,CACvB,oFAAoF,CACpF,CACD,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACb,MAAM,MAAM,GAAG,2BAA2B,CACzC,6BAA6B,EAC7B,CAAC,GAAG,CAAC,CACL,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;QACvD,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;QACtD,MAAM,GAAG,GAAG,yBAAyB,CAAC;QACtC,MAAM,CAAC,2BAA2B,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YAC3D,GAAG,EAAE,uBAAuB;YAC5B,MAAM,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;SAC1B,CAAC,CAAC;QACH,MAAM,CAAC,2BAA2B,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YAC5D,GAAG,EAAE,uBAAuB;YAC5B,MAAM,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;SAC5B,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}
1	+ {"version":3,"file":"mysql-placeholders.test.js","sourceRoot":"","sources":["../../src/runtime/mysql-placeholders.test.ts"],"names":[],"mappings":"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"}

package/dist/runtime/query/aggregate.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"aggregate.d.ts","sourceRoot":"","sources":["../../../src/runtime/query/aggregate.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EACN,KAAK,kBAAkB,~~EAKvB~~,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,KAAK,YAAY,EAAe,MAAM,cAAc,CAAC;AA8C9D,wBAAgB,iBAAiB,CAChC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5B,SAAS,EAAE,kBAAkB,GAC3B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAiCzB;AAED,wBAAsB,gBAAgB,CACrC,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,YAAY,EACrB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE;IACL,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,MAAM,CAAC,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACrC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;CAC5B,GACC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,~~CAqDlC~~"}
1	+ {"version":3,"file":"aggregate.d.ts","sourceRoot":"","sources":["../../../src/runtime/query/aggregate.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EACN,KAAK,kBAAkB,EAIvB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,KAAK,YAAY,EAAe,MAAM,cAAc,CAAC;AA8C9D,wBAAgB,iBAAiB,CAChC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5B,SAAS,EAAE,kBAAkB,GAC3B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAiCzB;AAED,wBAAsB,gBAAgB,CACrC,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,YAAY,EACrB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE;IACL,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,MAAM,CAAC,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACrC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;CAC5B,GACC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAoDlC"}

package/dist/runtime/query/aggregate.js CHANGED Viewed

@@ -1,7 +1,7 @@
 import { postgresDialect } from "../../dialect/postgres.js";
-import { buildCountAllQuery, compileWhere, getCachedAggregateQuery, toCountSelector, } from "./compile.js";
+import { compileWhere, getCachedAggregateQuery, toCountSelector, } from "./compile.js";
 import { runQueryOne } from "./execute.js";
-import { getTableIndex, requireTable } from "./table-index.js";
+import { countAllSqlFor, getTableIndex, requireTable } from "./table-index.js";
 function coerceAggregateNumber(value) {
     if (value === null || value === undefined)
         return null;
@@ -77,7 +77,7 @@ export async function aggregateRecords(executor, runtime, tableAccessor, args) {
     const table = requireTable(manifest, tableAccessor, "select");
     if (isSimpleStarCount(args)) {
         const tableIndex = getTableIndex(runtime.tableIndex, tableAccessor);
-        const query = tableIndex?.countAllSql ?? buildCountAllQuery(table, dialect);
+        const query = countAllSqlFor(tableIndex, table, dialect);
         const row = await runQueryOne(executor, runtime, { operation: "select", tableAccessor }, query, []);
         return { _count: coerceStarCount(row?.c) };
     }

package/dist/runtime/query/aggregate.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"aggregate.js","sourceRoot":"","sources":["../../../src/runtime/query/aggregate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAE5D,OAAO,EAEN,~~kBAAkB,EAClB,~~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~~GACV~~,UAAU,EAAE,~~WAAW,IAAI,kBAAkB,CAAC,~~KAAK,EAAE,OAAO,CAAC,CAAC;~~QAC/D~~,MAAM,GAAG,GAAG,MAAM,WAAW,CAC5B,QAAQ,EACR,OAAO,EACP,EAAE,SAAS,EAAE,QAAQ,EAAE,aAAa,EAAE,EACtC,KAAK,EACL,EAAE,CACF,CAAC;QACF,OAAO,EAAE,MAAM,EAAE,eAAe,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC;IAC5C,CAAC;IAED,MAAM,SAAS,GAAuB,EAAE,CAAC;IACzC,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QAC/B,SAAS,CAAC,MAAM,GAAG,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACjD,CAAC;IACD,IAAI,IAAI,CAAC,IAAI;QAAE,SAAS,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;IAC1C,IAAI,IAAI,CAAC,IAAI;QAAE,SAAS,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;IAC1C,IAAI,IAAI,CAAC,IAAI;QAAE,SAAS,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;IAC1C,IAAI,IAAI,CAAC,IAAI;QAAE,SAAS,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;IAE1C,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,YAAY,CAC7C,QAAQ,EACR,KAAK,EACL,IAAI,CAAC,KAAK,EACV,OAAO,EACP,CAAC,EACD,OAAO,CAAC,UAAU,CAClB,CAAC;IACF,MAAM,KAAK,GAAG,uBAAuB,CACpC,OAAO,CAAC,UAAU,EAAE,GAAG,CAAC,aAAa,CAAC,EACtC,KAAK,EACL,SAAS,EACT,QAAQ,EACR,OAAO,CAAC,UAAU,EAClB,OAAO,CACP,CAAC;IACF,MAAM,GAAG,GAAG,MAAM,WAAW,CAC5B,QAAQ,EACR,OAAO,EACP,EAAE,SAAS,EAAE,QAAQ,EAAE,aAAa,EAAE,EACtC,KAAK,EACL,MAAM,CACN,CAAC;IAEF,OAAO,iBAAiB,CAAC,GAAG,IAAI,EAAE,EAAE,SAAS,CAAC,CAAC;AAChD,CAAC"}
1	+ {"version":3,"file":"aggregate.js","sourceRoot":"","sources":["../../../src/runtime/query/aggregate.ts"],"names":[],"mappings":"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"}

package/dist/runtime/query/compile-aggregate.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"compile-aggregate.d.ts","sourceRoot":"","sources":["../../../src/runtime/query/compile-aggregate.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACX,OAAO,EACP,cAAc,EACd,aAAa,EACb,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAGN,KAAK,YAAY,~~EACjB~~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"}
1	+ {"version":3,"file":"compile-aggregate.d.ts","sourceRoot":"","sources":["../../../src/runtime/query/compile-aggregate.ts"],"names":[],"mappings":"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"}

package/dist/runtime/query/compile-aggregate.js CHANGED Viewed

@@ -2,7 +2,7 @@ import { compileMysqlFamilyInList } from "../../dialect/mysql-family.js";
 import { postgresDialect } from "../../dialect/postgres.js";
 import { isMysqlFamilyDialect } from "../../dialect/resolve.js";
 import { compileError } from "../compile-error.js";
-import { buildSelectColumns, normalizeLimitOffset, } from "./compile-where.js";
+import { buildSelectColumns, normalizeLimitOffset, parseOrderDirection, } from "./compile-where.js";
 import { columnByTsName, getOrSetSqlCache, getTableIndex, requireTsColumn, } from "./table-index.js";
 function countSqlCol(table, tsName, dialect = postgresDialect, manifestIndex) {
     const tableIndex = getTableIndex(manifestIndex, table.accessor);
@@ -378,7 +378,7 @@ export function compileGroupByOrderBy(table, byKeys, selectors, orderBy, dialect
         if (tsKey === "_count") {
             if (typeof direction === "string") {
                 requireStarCount(selectors, "orderBy._count");
-                const dir = direction.toUpperCase() === "DESC" ? "DESC" : "ASC";
+                const dir = parseOrderDirection(direction);
                 parts.push(`${countStarExpr()} ${dir}`);
                 continue;
             }
@@ -389,7 +389,7 @@ export function compileGroupByOrderBy(table, byKeys, selectors, orderBy, dialect
                 if (typeof colDir !== "string")
                     continue;
                 requireCountMapField(selectors, field, `orderBy._count.${field}`);
-                const dir = colDir.toUpperCase() === "DESC" ? "DESC" : "ASC";
+                const dir = parseOrderDirection(colDir);
                 parts.push(`${countFieldExpr(table, field, manifestIndex, dialect)} ${dir}`);
             }
             continue;
@@ -409,7 +409,7 @@ export function compileGroupByOrderBy(table, byKeys, selectors, orderBy, dialect
                     compileError(`orderBy.${key}.${colName} requires ${key}: { ${colName}: true }`);
                 }
                 const expr = requireFieldAggExpression(key, table, colName, dialect, manifestIndex);
-                const dir = colDir.toUpperCase() === "DESC" ? "DESC" : "ASC";
+                const dir = parseOrderDirection(colDir);
                 parts.push(`${expr} ${dir}`);
             }
             continue;
@@ -420,7 +420,7 @@ export function compileGroupByOrderBy(table, byKeys, selectors, orderBy, dialect
             compileError(`orderBy column "${tsKey}" is not in groupBy by`);
         }
         const col = requireTsColumn(tableIndex, table, tsKey, "groupBy orderBy", "select");
-        const dir = direction.toUpperCase() === "DESC" ? "DESC" : "ASC";
+        const dir = parseOrderDirection(direction);
         parts.push(`${dialect.quoteIdentifier(col.sqlName)} ${dir}`);
     }
     return parts.length > 0 ? `ORDER BY ${parts.join(", ")}` : "";