orchid-orm 1.6.18 → 1.6.20

package/dist/index.mjs

@@ -1,6 +1,6 @@
 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, toSnakeCase, emptyObject, pathToLog, singleQuote, codeToString, quoteObjectKey, addCode, columnDefaultArgumentToCode } from 'orchid-core';
+import { snakeCaseKey, toSnakeCase, emptyObject, pathToLog, toCamelCase, toPascalCase, singleQuote, codeToString, quoteObjectKey, addCode, columnDefaultArgumentToCode } from 'orchid-core';
 import * as path from 'path';
 import path__default from 'path';
 import fs from 'fs/promises';
@@ -1426,15 +1426,6 @@ const createRepo = (table, methods) => {
   });
 };
 
-const toPascalCase = (s) => {
-  const words = s.match(/(\w)(\w*)/g) || [];
-  return words.map((word) => word[0].toUpperCase() + word.slice(1)).join("");
-};
-const toCamelCase = (s) => {
-  const pascal = toPascalCase(s);
-  return pascal[0].toLowerCase() + pascal.slice(1);
-};
-
 class FileChanges {
   constructor(content) {
     this.content = content;
@@ -1693,7 +1684,7 @@ const createTable$1 = ({ filePath, tablePath, statements, object, content, space
   const key = toCamelCase(ast.name);
   const value = `${toPascalCase(ast.name)}Table`;
   const changes = new FileChanges(content);
-  const importPath = getImportPath(filePath, tablePath(ast.name));
+  const importPath = getImportPath(filePath, tablePath(toCamelCase(ast.name)));
   const existing = Array.from(
     ts.import.iterateWithSource(statements, importPath)
   );
@@ -1723,7 +1714,7 @@ ${spaces}`;
 };
 const dropTable = ({ filePath, tablePath, statements, object, content }, ast) => {
   const changes = new FileChanges(content);
-  const importPath = getImportPath(filePath, tablePath(ast.name));
+  const importPath = getImportPath(filePath, tablePath(toCamelCase(ast.name)));
   const tableClassName = `${toPascalCase(ast.name)}Table`;
   const importNames = [];
   for (const node of ts.import.iterateWithSource(statements, importPath)) {
@@ -1788,7 +1779,7 @@ const createTable = async (_a) => {
     "ast",
     "logger"
   ]);
-  const tablePath = params.tablePath(ast.name);
+  const tablePath = params.tablePath(toCamelCase(ast.name));
   const baseTablePath = getImportPath(tablePath, params.baseTablePath);
   const props = [];
   if (ast.schema) {
@@ -1844,7 +1835,7 @@ const changeTable = async (_a) => {
     "ast",
     "logger"
   ]);
-  const tablePath = params.tablePath(ast.name);
+  const tablePath = params.tablePath(toCamelCase(ast.name));
   const content = await fs.readFile(tablePath, "utf-8").catch(() => void 0);
   if (!content)
     return;
@@ -2261,7 +2252,7 @@ const renameTable = async (_a) => {
     "logger"
   ]);
   var _a2;
-  const tablePath = params.tablePath(ast.from);
+  const tablePath = params.tablePath(toCamelCase(ast.from));
   const content = await fs.readFile(tablePath, "utf-8").catch(() => void 0);
   if (!content)
     return;