orchid-orm 1.6.16 → 1.6.18

package/dist/index.mjs

@@ -1,29 +1,45 @@
 import { columnTypes, getColumnTypes, addQueryOn, VirtualColumn, pushQueryValue, isQueryReturnsAll, getQueryAs, toSqlCacheKey, NotFoundError, relationQueryKey, Db, Adapter, anyShape, getClonedQueryData, columnsShapeToCode, primaryKeyToCode, indexToCode, foreignKeyToCode, columnIndexesToCode, columnForeignKeysToCode, columnCheckToCode } from 'pqb';
 export { columnTypes } from 'pqb';
-import { snakeCaseKey, emptyObject, pathToLog, singleQuote, codeToString, quoteObjectKey, addCode, columnDefaultArgumentToCode } from 'orchid-core';
+import { snakeCaseKey, toSnakeCase, emptyObject, pathToLog, singleQuote, codeToString, quoteObjectKey, addCode, columnDefaultArgumentToCode } 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 || columnTypes;
-  if (options.snakeCase) {
-    ct[snakeCaseKey] = true;
-  }
-  return create(ct);
+const createBaseTable = ({
+  columnTypes: columnTypes$1,
+  snakeCase
+} = { columnTypes: columnTypes }) => {
+  const ct = typeof columnTypes$1 === "function" ? columnTypes$1(columnTypes) : columnTypes$1 || columnTypes;
+  return create(
+    ct,
+    snakeCase
+  );
 };
-const create = (columnTypes2) => {
+const create = (columnTypes, snakeCase) => {
   return class BaseTable {
     constructor() {
+      this.snakeCase = snakeCase;
       this.setColumns = (fn) => {
-        const shape = getColumnTypes(columnTypes2, fn);
+        columnTypes[snakeCaseKey] = this.snakeCase;
+        const shape = getColumnTypes(columnTypes, fn);
+        if (this.snakeCase) {
+          for (const key in shape) {
+            const column = shape[key];
+            if (column.data.name)
+              continue;
+            const snakeName = toSnakeCase(key);
+            if (snakeName !== key) {
+              column.data.name = snakeName;
+            }
+          }
+        }
         return {
           shape,
           type: void 0
         };
       };
-      this.columnTypes = columnTypes2;
+      this.columnTypes = columnTypes;
     }
     belongsTo(fn, options) {
       return {