orchid-orm 1.6.1 → 1.6.3

package/dist/index.mjs

@@ -1,13 +1,16 @@
 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 { 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';
 import typescript from 'typescript';
 
 const createBaseTable = (options = { columnTypes }) => {
-  const ct = typeof options.columnTypes === "function" ? options.columnTypes(columnTypes) : options.columnTypes;
+  const ct = typeof options.columnTypes === "function" ? options.columnTypes(columnTypes) : options.columnTypes || columnTypes;
+  if (options.snakeCase) {
+    ct[snakeCaseKey] = true;
+  }
   return create(ct);
 };
 const create = (columnTypes2) => {
@@ -1208,8 +1211,11 @@ const makeRelationQuery = (table, definedAs, relationName, data) => {
         toTable._take();
       }
       const query = this.isSubQuery ? toTable : toTable._whereExists(
-        this.baseQuery,
-        (q) => data.reverseJoin(this, toTable)
+        this,
+        (q) => data.reverseJoin(
+          q,
+          toTable
+        )
       );
       query.query[relationQueryKey] = {
         relationName,
@@ -1597,7 +1603,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) => {
@@ -1644,6 +1650,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) => {
@@ -1739,9 +1748,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);
@@ -1768,6 +1779,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;
@@ -1792,9 +1804,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);
@@ -1812,6 +1826,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;
@@ -1982,7 +1997,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,
@@ -2002,7 +2017,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();
     }
@@ -2055,7 +2070,7 @@ ${spaces}`);
 ${spaces}`);
   }
 };
-const getColumnMethodArgs = (to, key) => {
+const getColumnMethodArgs = (t, to, key) => {
   const value = to[key];
   if (!value)
     return;
@@ -2069,7 +2084,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;
   }
@@ -2202,9 +2217,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);
@@ -2249,6 +2266,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;
@@ -2283,7 +2301,8 @@ const updateTableFile = async (params) => {
 
 const createBaseTableFile = async ({
   baseTableName,
-  baseTablePath
+  baseTablePath,
+  logger
 }) => {
   await fs.mkdir(path__default.dirname(baseTablePath), { recursive: true });
   await fs.writeFile(
@@ -2295,7 +2314,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;
@@ -2329,7 +2350,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);
@@ -2337,10 +2358,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;