orchid-orm 1.6.2 → 1.6.4

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import { columnTypes, getColumnTypes, addQueryOn, VirtualColumn, pushQueryValue, isQueryReturnsAll, getQueryAs, toSqlCacheKey, NotFoundError, relationQueryKey, Db, Adapter, anyShape, getClonedQueryData, columnsShapeToCode, codeToString, primaryKeyToCode, indexToCode, foreignKeyToCode, columnIndexesToCode, columnForeignKeysToCode, columnDefaultArgumentToCode } from 'pqb';
 export { columnTypes } from 'pqb';
-import { snakeCaseKey, emptyObject, singleQuote, quoteObjectKey, addCode } from 'orchid-core';
+import { snakeCaseKey, emptyObject, pathToLog, singleQuote, quoteObjectKey, addCode } from 'orchid-core';
 import * as path from 'path';
 import path__default from 'path';
 import fs from 'fs/promises';
@@ -363,36 +363,41 @@ const makeHasOneMethod = (table, relation, relationName, query) => {
   if ("through" in relation.options) {
     const { through, source } = relation.options;
     const throughRelation = getThroughRelation(table, through);
-    const throughTable = throughRelation.table;
     const sourceRelation = getSourceRelation(throughRelation, source);
     const sourceQuery = sourceRelation.joinQuery(throughRelation.query, sourceRelation.query).as(relationName);
+    const whereExistsCallback = () => sourceQuery;
     return {
       returns: "one",
       method: (params) => {
         const throughQuery = table[through](params);
-        return query.whereExists(throughTable, () => sourceQuery.merge(throughQuery));
+        return query.whereExists(
+          throughQuery,
+          whereExistsCallback
+        );
       },
       joinQuery(fromQuery, toQuery) {
-        return toQuery.whereExists(throughTable, () => {
-          const as = getQueryAs(toQuery);
-          return throughRelation.joinQuery(fromQuery, throughRelation.query).merge(
-            sourceRelation.joinQuery(
+        return toQuery.whereExists(
+          throughRelation.joinQuery(fromQuery, throughRelation.query),
+          () => {
+            const as = getQueryAs(toQuery);
+            return sourceRelation.joinQuery(
               throughRelation.query,
               sourceRelation.query.as(as)
-            )
-          );
-        });
+            );
+          }
+        );
       },
       reverseJoin(fromQuery, toQuery) {
-        return fromQuery.whereExists(throughTable, () => {
-          const as = getQueryAs(toQuery);
-          return throughRelation.joinQuery(fromQuery, throughRelation.query).merge(
-            sourceRelation.joinQuery(
+        return fromQuery.whereExists(
+          throughRelation.joinQuery(fromQuery, throughRelation.query),
+          () => {
+            const as = getQueryAs(toQuery);
+            return sourceRelation.joinQuery(
               throughRelation.query,
               sourceRelation.query.as(as)
-            )
-          );
-        });
+            );
+          }
+        );
       },
       primaryKey: sourceRelation.primaryKey
     };
@@ -550,40 +555,45 @@ const makeHasManyMethod = (table, relation, relationName, query) => {
   if ("through" in relation.options) {
     const { through, source } = relation.options;
     const throughRelation = getThroughRelation(table, through);
-    const throughTable = throughRelation.table.as(through);
     const sourceRelation = getSourceRelation(throughRelation, source);
     const sourceRelationQuery = sourceRelation.query.as(relationName);
     const sourceQuery = sourceRelation.joinQuery(
       throughRelation.query,
       sourceRelationQuery
     );
+    const whereExistsCallback = () => sourceQuery;
     return {
       returns: "many",
       method: (params) => {
         const throughQuery = table[through](params);
-        return query.whereExists(throughTable, () => sourceQuery.merge(throughQuery));
+        return query.whereExists(
+          throughQuery,
+          whereExistsCallback
+        );
       },
       joinQuery(fromQuery, toQuery) {
-        return toQuery.whereExists(throughTable, () => {
-          const as = getQueryAs(toQuery);
-          return throughRelation.joinQuery(fromQuery, throughRelation.query).merge(
-            sourceRelation.joinQuery(
+        return toQuery.whereExists(
+          throughRelation.joinQuery(fromQuery, throughRelation.query),
+          () => {
+            const as = getQueryAs(toQuery);
+            return sourceRelation.joinQuery(
               throughRelation.query,
               sourceRelation.query.as(as)
-            )
-          );
-        });
+            );
+          }
+        );
       },
       reverseJoin(fromQuery, toQuery) {
-        return fromQuery.whereExists(throughTable, () => {
-          const as = getQueryAs(toQuery);
-          return throughRelation.joinQuery(fromQuery, throughRelation.query).merge(
-            sourceRelation.joinQuery(
+        return fromQuery.whereExists(
+          throughRelation.joinQuery(fromQuery, throughRelation.query),
+          () => {
+            const as = getQueryAs(toQuery);
+            return sourceRelation.joinQuery(
               throughRelation.query,
               sourceRelation.query.as(as)
-            )
-          );
-        });
+            );
+          }
+        );
       },
       primaryKey: sourceRelation.primaryKey
     };
@@ -790,6 +800,13 @@ class HasAndBelongsToManyVirtualColumn extends VirtualColumn {
     );
   }
 }
+const removeColumnName = (column) => {
+  if (!column.data.name)
+    return column;
+  const cloned = Object.create(column);
+  cloned.data = __spreadProps$3(__spreadValues$4({}, column.data), { name: void 0 });
+  return cloned;
+};
 const makeHasAndBelongsToManyMethod = (table, qb, relation, relationName, query) => {
   const {
     primaryKey: pk,
@@ -805,8 +822,8 @@ const makeHasAndBelongsToManyMethod = (table, qb, relation, relationName, query)
   baseQuery.baseQuery = baseQuery;
   baseQuery.table = joinTable;
   baseQuery.shape = {
-    [fk]: table.shape[pk],
-    [afk]: query.shape[apk]
+    [fk]: removeColumnName(table.shape[pk]),
+    [afk]: removeColumnName(query.shape[apk])
   };
   baseQuery.query = __spreadProps$3(__spreadValues$4({}, baseQuery.query), {
     shape: baseQuery.shape
@@ -839,15 +856,19 @@ const makeHasAndBelongsToManyMethod = (table, qb, relation, relationName, query)
       state
     ),
     joinQuery(fromQuery, toQuery) {
-      return toQuery.whereExists(
+      const join = toQuery.whereExists(
         subQuery,
-        (q) => q._on(associationForeignKeyFull, `${getQueryAs(toQuery)}.${pk}`)._on(foreignKeyFull, `${getQueryAs(fromQuery)}.${pk}`)
+        (q) => q._on(associationForeignKeyFull, `${getQueryAs(toQuery)}.${apk}`)._on(foreignKeyFull, `${getQueryAs(fromQuery)}.${pk}`)
       );
+      join.query.joinedShapes = __spreadProps$3(__spreadValues$4({}, join.query.joinedShapes), {
+        [fromQuery.query.as || fromQuery.table]: fromQuery.query.shape
+      });
+      return join;
     },
     reverseJoin(fromQuery, toQuery) {
       return fromQuery.whereExists(
         subQuery,
-        (q) => q._on(associationForeignKeyFull, `${getQueryAs(toQuery)}.${pk}`)._on(foreignKeyFull, `${getQueryAs(fromQuery)}.${pk}`)
+        (q) => q._on(associationForeignKeyFull, `${getQueryAs(toQuery)}.${apk}`)._on(foreignKeyFull, `${getQueryAs(fromQuery)}.${pk}`)
       );
     },
     primaryKey: pk,
@@ -1211,11 +1232,8 @@ const makeRelationQuery = (table, definedAs, relationName, data) => {
         toTable._take();
       }
       const query = this.isSubQuery ? toTable : toTable._whereExists(
-        this,
-        (q) => data.reverseJoin(
-          q,
-          toTable
-        )
+        this.baseQuery,
+        (q) => data.reverseJoin(this, toTable)
       );
       query.query[relationQueryKey] = {
         relationName,
@@ -1603,7 +1621,7 @@ const optionsToString = (options) => {
   }
   return lines.join("\n    ");
 };
-const updateMainFile = async (filePath, tablePath, ast, options) => {
+const updateMainFile = async (filePath, tablePath, ast, options, logger) => {
   const result = await fs.readFile(filePath, "utf-8").then(
     (content2) => ({ error: void 0, content: content2 }),
     (error) => {
@@ -1650,6 +1668,9 @@ const updateMainFile = async (filePath, tablePath, ast, options) => {
       await fs.mkdir(path__default.dirname(filePath), { recursive: true });
     }
     await fs.writeFile(filePath, write);
+    logger == null ? void 0 : logger.log(
+      `${result.content ? "Updated" : "Created"} ${pathToLog(filePath)}`
+    );
   }
 };
 const createTable$1 = ({ filePath, tablePath, statements, object, content, spaces }, ast) => {
@@ -1745,9 +1766,11 @@ var __objRest$2 = (source, exclude) => {
 };
 const createTable = async (_a) => {
   var _b = _a, {
-    ast
+    ast,
+    logger
   } = _b, params = __objRest$2(_b, [
-    "ast"
+    "ast",
+    "logger"
   ]);
   const tablePath = params.tablePath(ast.name);
   const baseTablePath = getImportPath(tablePath, params.baseTablePath);
@@ -1755,7 +1778,7 @@ const createTable = async (_a) => {
   if (ast.schema) {
     props.push(`schema = ${singleQuote(ast.schema)};`);
   }
-  props.push(`table = ${singleQuote(ast.name)};`);
+  props.push(`readonly table = ${singleQuote(ast.name)};`);
   if (ast.noPrimaryKey === "ignore") {
     props.push("noPrimaryKey = true;");
   }
@@ -1774,6 +1797,7 @@ const createTable = async (_a) => {
   await fs.mkdir(path__default.dirname(tablePath), { recursive: true });
   try {
     await fs.writeFile(tablePath, codeToString(code, "", "  "), { flag: "wx" });
+    logger == null ? void 0 : logger.log(`Created ${pathToLog(tablePath)}`);
   } catch (err) {
     if (err.code !== "EEXIST") {
       throw err;
@@ -1798,9 +1822,11 @@ var __objRest$1 = (source, exclude) => {
 };
 const changeTable = async (_a) => {
   var _b = _a, {
-    ast
+    ast,
+    logger
   } = _b, params = __objRest$1(_b, [
-    "ast"
+    "ast",
+    "logger"
   ]);
   const tablePath = params.tablePath(ast.name);
   const content = await fs.readFile(tablePath, "utf-8").catch(() => void 0);
@@ -1818,6 +1844,7 @@ const changeTable = async (_a) => {
     addTableData(context);
   }
   await fs.writeFile(tablePath, changes.apply());
+  logger == null ? void 0 : logger.log(`Updated ${pathToLog(tablePath)}`);
 };
 function* iterateColumnsShapes(statements, className) {
   var _a, _b;
@@ -1988,7 +2015,7 @@ const changeColumn = ({ changes, t, spaces }, changeItem, prop) => {
       continue;
     let remove = true;
     if (!replaced[key]) {
-      const code = getColumnMethodArgs(to, key);
+      const code = getColumnMethodArgs(t, to, key);
       if (code) {
         changes.replace(
           item.expression.expression.end,
@@ -2008,7 +2035,7 @@ const changeColumn = ({ changes, t, spaces }, changeItem, prop) => {
   for (const key in propsToChange) {
     if (changedProps[key])
       continue;
-    const code = getColumnMethodArgs(to, key);
+    const code = getColumnMethodArgs(t, to, key);
     if (code) {
       append += codeToString(code, spaces + "  ", "  ").trim();
     }
@@ -2061,7 +2088,7 @@ ${spaces}`);
 ${spaces}`);
   }
 };
-const getColumnMethodArgs = (to, key) => {
+const getColumnMethodArgs = (t, to, key) => {
   const value = to[key];
   if (!value)
     return;
@@ -2075,7 +2102,7 @@ const getColumnMethodArgs = (to, key) => {
   if (key === "collate" || key === "compression") {
     addCode(code, singleQuote(value));
   } else if (key === "default") {
-    addCode(code, columnDefaultArgumentToCode(value));
+    addCode(code, columnDefaultArgumentToCode(t, value));
   } else if (key !== "nullable" && key !== "primaryKey") {
     return;
   }
@@ -2208,9 +2235,11 @@ var __objRest = (source, exclude) => {
 };
 const renameTable = async (_a) => {
   var _b = _a, {
-    ast
+    ast,
+    logger
   } = _b, params = __objRest(_b, [
-    "ast"
+    "ast",
+    "logger"
   ]);
   var _a2;
   const tablePath = params.tablePath(ast.from);
@@ -2255,6 +2284,7 @@ const renameTable = async (_a) => {
     }
   }
   await fs.writeFile(tablePath, changes.apply());
+  logger == null ? void 0 : logger.log(`Updated ${pathToLog(tablePath)}`);
 };
 
 var __defProp$1 = Object.defineProperty;
@@ -2289,7 +2319,8 @@ const updateTableFile = async (params) => {
 
 const createBaseTableFile = async ({
   baseTableName,
-  baseTablePath
+  baseTablePath,
+  logger
 }) => {
   await fs.mkdir(path__default.dirname(baseTablePath), { recursive: true });
   await fs.writeFile(
@@ -2301,7 +2332,9 @@ export const ${baseTableName} = createBaseTable();
     {
       flag: "wx"
     }
-  ).catch((err) => {
+  ).then(() => {
+    logger == null ? void 0 : logger.log(`Created ${pathToLog(baseTablePath)}`);
+  }).catch((err) => {
     if (err.code === "EEXIST")
       return;
     throw err;
@@ -2335,7 +2368,7 @@ const appCodeUpdater = ({
   baseTableName,
   mainFilePath
 }) => {
-  return async ({ ast, options, basePath, cache: cacheObject }) => {
+  return async ({ ast, options, basePath, cache: cacheObject, logger }) => {
     const params = {
       tablePath(name) {
         const file = tablePath(name);
@@ -2343,10 +2376,17 @@ const appCodeUpdater = ({
       },
       baseTablePath: resolvePath(basePath, baseTablePath),
       baseTableName: baseTableName || "BaseTable",
-      mainFilePath: resolvePath(basePath, mainFilePath)
+      mainFilePath: resolvePath(basePath, mainFilePath),
+      logger
     };
     const promises = [
-      updateMainFile(params.mainFilePath, params.tablePath, ast, options),
+      updateMainFile(
+        params.mainFilePath,
+        params.tablePath,
+        ast,
+        options,
+        logger
+      ),
       updateTableFile(__spreadProps(__spreadValues({}, params), { ast }))
     ];
     const cache = cacheObject;