metal-orm 1.0.63 → 1.0.65

package/README.md

@@ -549,14 +549,16 @@ const [user] = await selectFromEntity(User)
   .where(eq(U.id, 1))
   .execute(session); // user is an actual instance of the User class!
 
-// Use executePlain() if you want raw POJOs instead of class instances
-const [rawUser] = await selectFromEntity(User).executePlain(session);
-
-user.posts.add({ title: 'From decorators' });
-await session.commit();
-```
-
-Tip: to keep selections terse, use `select`, `include` (with `columns`), or the `sel`/`esel` helpers instead of spelling `table.columns.*` over and over. By default, `selectFromEntity` selects all columns if you don't specify any.
+// Use executePlain() if you want raw POJOs instead of class instances
+const [rawUser] = await selectFromEntity(User).executePlain(session);
+
+user.posts.add({ title: 'From decorators' });
+await session.commit();
+```
+
+Note: relation helpers like `add`/`attach` are only available on tracked entities returned by `execute(session)`. `executePlain()` returns POJOs without relation wrappers. Make sure the primary key (e.g. `id`) is selected so relation adds can link correctly.
+
+Tip: to keep selections terse, use `select`, `include` (with `columns`), or the `sel`/`esel` helpers instead of spelling `table.columns.*` over and over. By default, `selectFromEntity` selects all columns if you don't specify any.
 
 
 This level is nice when:

package/dist/index.cjs

@@ -721,12 +721,24 @@ var createBinaryExpression = (operator, left2, right2, escape) => {
   }
   return node;
 };
-var eq = (left2, right2) => createBinaryExpression("=", left2, right2);
-var neq = (left2, right2) => createBinaryExpression("!=", left2, right2);
-var gt = (left2, right2) => createBinaryExpression(">", left2, right2);
-var gte = (left2, right2) => createBinaryExpression(">=", left2, right2);
-var lt = (left2, right2) => createBinaryExpression("<", left2, right2);
-var lte = (left2, right2) => createBinaryExpression("<=", left2, right2);
+function eq(left2, right2) {
+  return createBinaryExpression("=", left2, right2);
+}
+function neq(left2, right2) {
+  return createBinaryExpression("!=", left2, right2);
+}
+function gt(left2, right2) {
+  return createBinaryExpression(">", left2, right2);
+}
+function gte(left2, right2) {
+  return createBinaryExpression(">=", left2, right2);
+}
+function lt(left2, right2) {
+  return createBinaryExpression("<", left2, right2);
+}
+function lte(left2, right2) {
+  return createBinaryExpression("<=", left2, right2);
+}
 var like = (left2, pattern, escape) => createBinaryExpression("LIKE", left2, pattern, escape);
 var notLike = (left2, pattern, escape) => createBinaryExpression("NOT LIKE", left2, pattern, escape);
 var and = (...operands) => ({
@@ -836,7 +848,7 @@ var buildWindowFunction = (name, args = [], partitionBy, orderBy) => {
   if (orderBy && orderBy.length) {
     node.orderBy = orderBy;
   }
-  return node;
+  return asType(node);
 };
 var rowNumber = () => buildWindowFunction("ROW_NUMBER");
 var rank = () => buildWindowFunction("RANK");
@@ -940,7 +952,7 @@ var ORDER_DIRECTIONS = {
 };
 
 // src/core/ast/aggregate-functions.ts
-var buildAggregate = (name) => (col2) => ({
+var buildAggregate = (name) => (col2) => asType({
   type: "Function",
   name,
   args: [columnOperand(col2)]
@@ -950,7 +962,7 @@ var sum = buildAggregate("SUM");
 var avg = buildAggregate("AVG");
 var min = buildAggregate("MIN");
 var max = buildAggregate("MAX");
-var countAll = () => ({
+var countAll = () => asType({
   type: "Function",
   name: "COUNT",
   args: []
@@ -960,7 +972,7 @@ var toOrderByNode = (order) => ({
   term: columnOperand(order.column),
   direction: order.direction ?? ORDER_DIRECTIONS.ASC
 });
-var groupConcat = (col2, options) => ({
+var groupConcat = (col2, options) => asType({
   type: "Function",
   name: "GROUP_CONCAT",
   args: [columnOperand(col2)],
@@ -9783,45 +9795,47 @@ var fn = (key, args) => ({
   fn: key,
   args: args.map(toOperand2)
 });
-var lower = (value) => fn("LOWER", [value]);
-var upper = (value) => fn("UPPER", [value]);
-var ascii = (value) => fn("ASCII", [value]);
+var sfn = (key, args) => asType(fn(key, args));
+var nfn = (key, args) => asType(fn(key, args));
+var lower = (value) => sfn("LOWER", [value]);
+var upper = (value) => sfn("UPPER", [value]);
+var ascii = (value) => nfn("ASCII", [value]);
 var char = (...codes) => {
   if (codes.length === 0) throw new Error("char() expects at least 1 argument");
-  return fn("CHAR", codes);
+  return sfn("CHAR", codes);
 };
-var charLength = (value) => fn("CHAR_LENGTH", [value]);
-var length = (value) => fn("LENGTH", [value]);
-var trim = (value, chars) => chars === void 0 ? fn("TRIM", [value]) : fn("TRIM", [value, chars]);
-var ltrim = (value) => fn("LTRIM", [value]);
-var rtrim = (value) => fn("RTRIM", [value]);
+var charLength = (value) => nfn("CHAR_LENGTH", [value]);
+var length = (value) => nfn("LENGTH", [value]);
+var trim = (value, chars) => chars === void 0 ? sfn("TRIM", [value]) : sfn("TRIM", [value, chars]);
+var ltrim = (value) => sfn("LTRIM", [value]);
+var rtrim = (value) => sfn("RTRIM", [value]);
 var concat = (...args) => {
   if (args.length < 2) throw new Error("concat() expects at least 2 arguments");
-  return fn("CONCAT", args);
+  return sfn("CONCAT", args);
 };
 var concatWs = (separator, ...args) => {
   if (args.length < 1) throw new Error("concatWs() expects at least 2 arguments including the separator");
-  return fn("CONCAT_WS", [separator, ...args]);
-};
-var substr = (value, start, length2) => length2 === void 0 ? fn("SUBSTR", [value, start]) : fn("SUBSTR", [value, start, length2]);
-var left = (value, len) => fn("LEFT", [value, len]);
-var right = (value, len) => fn("RIGHT", [value, len]);
-var position = (substring, value) => fn("POSITION", [substring, value]);
-var instr = (value, substring) => fn("INSTR", [value, substring]);
-var locate = (substring, value, start) => start === void 0 ? fn("LOCATE", [substring, value]) : fn("LOCATE", [substring, value, start]);
-var replace = (value, search, replacement) => fn("REPLACE", [value, search, replacement]);
-var repeat = (value, count2) => fn("REPEAT", [value, count2]);
-var lpad = (value, len, pad) => fn("LPAD", [value, len, pad]);
-var rpad = (value, len, pad) => fn("RPAD", [value, len, pad]);
-var space = (count2) => fn("SPACE", [count2]);
-var reverse = (value) => fn("REVERSE", [value]);
-var initcap = (value) => fn("INITCAP", [value]);
-var md5 = (value) => fn("MD5", [value]);
-var sha1 = (value) => fn("SHA1", [value]);
-var sha2 = (value, bits) => fn("SHA2", [value, bits]);
-var bitLength = (value) => fn("BIT_LENGTH", [value]);
-var octetLength = (value) => fn("OCTET_LENGTH", [value]);
-var chr = (code) => fn("CHR", [code]);
+  return sfn("CONCAT_WS", [separator, ...args]);
+};
+var substr = (value, start, length2) => length2 === void 0 ? sfn("SUBSTR", [value, start]) : sfn("SUBSTR", [value, start, length2]);
+var left = (value, len) => sfn("LEFT", [value, len]);
+var right = (value, len) => sfn("RIGHT", [value, len]);
+var position = (substring, value) => nfn("POSITION", [substring, value]);
+var instr = (value, substring) => nfn("INSTR", [value, substring]);
+var locate = (substring, value, start) => start === void 0 ? nfn("LOCATE", [substring, value]) : nfn("LOCATE", [substring, value, start]);
+var replace = (value, search, replacement) => sfn("REPLACE", [value, search, replacement]);
+var repeat = (value, count2) => sfn("REPEAT", [value, count2]);
+var lpad = (value, len, pad) => sfn("LPAD", [value, len, pad]);
+var rpad = (value, len, pad) => sfn("RPAD", [value, len, pad]);
+var space = (count2) => sfn("SPACE", [count2]);
+var reverse = (value) => sfn("REVERSE", [value]);
+var initcap = (value) => sfn("INITCAP", [value]);
+var md5 = (value) => sfn("MD5", [value]);
+var sha1 = (value) => sfn("SHA1", [value]);
+var sha2 = (value, bits) => sfn("SHA2", [value, bits]);
+var bitLength = (value) => nfn("BIT_LENGTH", [value]);
+var octetLength = (value) => nfn("OCTET_LENGTH", [value]);
+var chr = (code) => sfn("CHR", [code]);
 
 // src/core/ddl/introspect/functions/mssql.ts
 var isColumnReference = (value) => typeof value === "object" && value !== null && !("type" in value) && "name" in value && typeof value.name === "string";
@@ -10350,38 +10364,39 @@ var fn3 = (key, args) => ({
   fn: key,
   args: args.map(toOperand3)
 });
-var abs = (value) => fn3("ABS", [value]);
-var acos = (value) => fn3("ACOS", [value]);
-var asin = (value) => fn3("ASIN", [value]);
-var atan = (value) => fn3("ATAN", [value]);
-var atan2 = (y, x) => fn3("ATAN2", [y, x]);
-var ceil = (value) => fn3("CEIL", [value]);
-var ceiling = (value) => fn3("CEILING", [value]);
-var cos = (value) => fn3("COS", [value]);
-var cot = (value) => fn3("COT", [value]);
-var degrees = (value) => fn3("DEGREES", [value]);
-var exp = (value) => fn3("EXP", [value]);
-var floor = (value) => fn3("FLOOR", [value]);
-var ln = (value) => fn3("LN", [value]);
-var log = (value) => fn3("LOG", [value]);
-var log10 = (value) => fn3("LOG10", [value]);
-var logBase = (base, value) => fn3("LOG_BASE", [base, value]);
-var mod = (x, y) => fn3("MOD", [x, y]);
-var pi = () => fn3("PI", []);
-var power = (x, y) => fn3("POWER", [x, y]);
-var pow = (x, y) => fn3("POW", [x, y]);
-var radians = (value) => fn3("RADIANS", [value]);
-var random = () => fn3("RANDOM", []);
-var rand = () => fn3("RAND", []);
-var round = (value, decimals) => decimals === void 0 ? fn3("ROUND", [value]) : fn3("ROUND", [value, decimals]);
-var sign = (value) => fn3("SIGN", [value]);
-var sin = (value) => fn3("SIN", [value]);
-var sqrt = (value) => fn3("SQRT", [value]);
-var tan = (value) => fn3("TAN", [value]);
-var trunc = (value, decimals) => decimals === void 0 ? fn3("TRUNC", [value]) : fn3("TRUNC", [value, decimals]);
-var truncate = (value, decimals) => fn3("TRUNCATE", [value, decimals]);
-var log2 = (value) => fn3("LOG2", [value]);
-var cbrt = (value) => fn3("CBRT", [value]);
+var nfn2 = (key, args) => asType(fn3(key, args));
+var abs = (value) => nfn2("ABS", [value]);
+var acos = (value) => nfn2("ACOS", [value]);
+var asin = (value) => nfn2("ASIN", [value]);
+var atan = (value) => nfn2("ATAN", [value]);
+var atan2 = (y, x) => nfn2("ATAN2", [y, x]);
+var ceil = (value) => nfn2("CEIL", [value]);
+var ceiling = (value) => nfn2("CEILING", [value]);
+var cos = (value) => nfn2("COS", [value]);
+var cot = (value) => nfn2("COT", [value]);
+var degrees = (value) => nfn2("DEGREES", [value]);
+var exp = (value) => nfn2("EXP", [value]);
+var floor = (value) => nfn2("FLOOR", [value]);
+var ln = (value) => nfn2("LN", [value]);
+var log = (value) => nfn2("LOG", [value]);
+var log10 = (value) => nfn2("LOG10", [value]);
+var logBase = (base, value) => nfn2("LOG_BASE", [base, value]);
+var mod = (x, y) => nfn2("MOD", [x, y]);
+var pi = () => nfn2("PI", []);
+var power = (x, y) => nfn2("POWER", [x, y]);
+var pow = (x, y) => nfn2("POW", [x, y]);
+var radians = (value) => nfn2("RADIANS", [value]);
+var random = () => nfn2("RANDOM", []);
+var rand = () => nfn2("RAND", []);
+var round = (value, decimals) => decimals === void 0 ? nfn2("ROUND", [value]) : nfn2("ROUND", [value, decimals]);
+var sign = (value) => nfn2("SIGN", [value]);
+var sin = (value) => nfn2("SIN", [value]);
+var sqrt = (value) => nfn2("SQRT", [value]);
+var tan = (value) => nfn2("TAN", [value]);
+var trunc = (value, decimals) => decimals === void 0 ? nfn2("TRUNC", [value]) : nfn2("TRUNC", [value, decimals]);
+var truncate = (value, decimals) => nfn2("TRUNCATE", [value, decimals]);
+var log2 = (value) => nfn2("LOG2", [value]);
+var cbrt = (value) => nfn2("CBRT", [value]);
 
 // src/core/functions/datetime.ts
 var isColumnDef3 = (val) => !!val && typeof val === "object" && "type" in val && "name" in val;
@@ -10396,31 +10411,34 @@ var fn4 = (key, args) => ({
   fn: key,
   args: args.map(toOperand4)
 });
-var now = () => fn4("NOW", []);
-var currentDate = () => fn4("CURRENT_DATE", []);
-var currentTime = () => fn4("CURRENT_TIME", []);
-var utcNow = () => fn4("UTC_NOW", []);
-var localTime = () => fn4("LOCALTIME", []);
-var localTimestamp = () => fn4("LOCALTIMESTAMP", []);
-var extract = (part, date) => fn4("EXTRACT", [part, date]);
-var year = (date) => fn4("YEAR", [date]);
-var month = (date) => fn4("MONTH", [date]);
-var day = (date) => fn4("DAY", [date]);
-var dateAdd = (date, interval, unit) => fn4("DATE_ADD", [date, interval, unit]);
-var dateSub = (date, interval, unit) => fn4("DATE_SUB", [date, interval, unit]);
-var dateDiff = (date1, date2) => fn4("DATE_DIFF", [date1, date2]);
-var dateFormat = (date, format) => fn4("DATE_FORMAT", [date, format]);
-var unixTimestamp = () => fn4("UNIX_TIMESTAMP", []);
-var fromUnixTime = (timestamp) => fn4("FROM_UNIXTIME", [timestamp]);
-var endOfMonth = (date) => fn4("END_OF_MONTH", [date]);
-var dayOfWeek = (date) => fn4("DAY_OF_WEEK", [date]);
-var weekOfYear = (date) => fn4("WEEK_OF_YEAR", [date]);
-var dateTrunc = (part, date) => fn4("DATE_TRUNC", [part, date]);
-var age = (timestamp, baseTimestamp) => baseTimestamp === void 0 ? fn4("AGE", [timestamp]) : fn4("AGE", [timestamp, baseTimestamp]);
-var hour = (date) => fn4("HOUR", [date]);
-var minute = (date) => fn4("MINUTE", [date]);
-var second = (date) => fn4("SECOND", [date]);
-var quarter = (date) => fn4("QUARTER", [date]);
+var dfn = (key, args) => asType(fn4(key, args));
+var nfn3 = (key, args) => asType(fn4(key, args));
+var sfn2 = (key, args) => asType(fn4(key, args));
+var now = () => dfn("NOW", []);
+var currentDate = () => dfn("CURRENT_DATE", []);
+var currentTime = () => dfn("CURRENT_TIME", []);
+var utcNow = () => dfn("UTC_NOW", []);
+var localTime = () => dfn("LOCALTIME", []);
+var localTimestamp = () => dfn("LOCALTIMESTAMP", []);
+var extract = (part, date) => nfn3("EXTRACT", [part, date]);
+var year = (date) => nfn3("YEAR", [date]);
+var month = (date) => nfn3("MONTH", [date]);
+var day = (date) => nfn3("DAY", [date]);
+var dateAdd = (date, interval, unit) => dfn("DATE_ADD", [date, interval, unit]);
+var dateSub = (date, interval, unit) => dfn("DATE_SUB", [date, interval, unit]);
+var dateDiff = (date1, date2) => nfn3("DATE_DIFF", [date1, date2]);
+var dateFormat = (date, format) => sfn2("DATE_FORMAT", [date, format]);
+var unixTimestamp = () => nfn3("UNIX_TIMESTAMP", []);
+var fromUnixTime = (timestamp) => dfn("FROM_UNIXTIME", [timestamp]);
+var endOfMonth = (date) => dfn("END_OF_MONTH", [date]);
+var dayOfWeek = (date) => nfn3("DAY_OF_WEEK", [date]);
+var weekOfYear = (date) => nfn3("WEEK_OF_YEAR", [date]);
+var dateTrunc = (part, date) => dfn("DATE_TRUNC", [part, date]);
+var age = (timestamp, baseTimestamp) => baseTimestamp === void 0 ? sfn2("AGE", [timestamp]) : sfn2("AGE", [timestamp, baseTimestamp]);
+var hour = (date) => nfn3("HOUR", [date]);
+var minute = (date) => nfn3("MINUTE", [date]);
+var second = (date) => nfn3("SECOND", [date]);
+var quarter = (date) => nfn3("QUARTER", [date]);
 
 // src/core/functions/control-flow.ts
 var isColumnDef4 = (val) => !!val && typeof val === "object" && "type" in val && "name" in val;
@@ -10435,18 +10453,19 @@ var fn5 = (key, args) => ({
   fn: key,
   args: args.map(toOperand5)
 });
+var afn = (key, args) => asType(fn5(key, args));
 var coalesce = (...args) => {
   if (args.length < 2) throw new Error("coalesce() expects at least 2 arguments");
-  return fn5("COALESCE", args);
+  return afn("COALESCE", args);
 };
-var nullif = (val1, val2) => fn5("NULLIF", [val1, val2]);
+var nullif = (val1, val2) => afn("NULLIF", [val1, val2]);
 var greatest = (...args) => {
   if (args.length < 2) throw new Error("greatest() expects at least 2 arguments");
-  return fn5("GREATEST", args);
+  return afn("GREATEST", args);
 };
 var least = (...args) => {
   if (args.length < 2) throw new Error("least() expects at least 2 arguments");
-  return fn5("LEAST", args);
+  return afn("LEAST", args);
 };
 var ifNull = (val, defaultValue) => coalesce(val, defaultValue);
 
@@ -10463,10 +10482,12 @@ var fn6 = (key, args) => ({
   fn: key,
   args: args.map(toOperand6)
 });
-var jsonLength = (target, path) => path === void 0 ? fn6("JSON_LENGTH", [target]) : fn6("JSON_LENGTH", [target, path]);
-var jsonSet = (target, path, value) => fn6("JSON_SET", [target, path, value]);
-var jsonArrayAgg = (value) => fn6("JSON_ARRAYAGG", [value]);
-var jsonContains = (target, candidate, path) => path === void 0 ? fn6("JSON_CONTAINS", [target, candidate]) : fn6("JSON_CONTAINS", [target, candidate, path]);
+var nfn4 = (key, args) => asType(fn6(key, args));
+var afn2 = (key, args) => asType(fn6(key, args));
+var jsonLength = (target, path) => path === void 0 ? nfn4("JSON_LENGTH", [target]) : nfn4("JSON_LENGTH", [target, path]);
+var jsonSet = (target, path, value) => afn2("JSON_SET", [target, path, value]);
+var jsonArrayAgg = (value) => afn2("JSON_ARRAYAGG", [value]);
+var jsonContains = (target, candidate, path) => path === void 0 ? afn2("JSON_CONTAINS", [target, candidate]) : afn2("JSON_CONTAINS", [target, candidate, path]);
 
 // src/core/functions/array.ts
 var isColumnDef6 = (val) => !!val && typeof val === "object" && "type" in val && "name" in val;
@@ -10481,7 +10502,8 @@ var fn7 = (key, args) => ({
   fn: key,
   args: args.map(toOperand7)
 });
-var arrayAppend = (array, value) => fn7("ARRAY_APPEND", [array, value]);
+var afn3 = (key, args) => asType(fn7(key, args));
+var arrayAppend = (array, value) => afn3("ARRAY_APPEND", [array, value]);
 
 // src/orm/als.ts
 var AsyncLocalStorage = class {
@@ -11377,6 +11399,7 @@ var UnitOfWork = class {
     const key = findPrimaryKey(tracked.table);
     const val = tracked.entity[key];
     if (val === void 0 || val === null) return null;
+    if (typeof val !== "string" && typeof val !== "number") return null;
     return val;
   }
 };