orchid-orm 1.8.1 → 1.9.1

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import { columnTypes, getColumnTypes, addQueryOn, VirtualColumn, pushQueryValue, isQueryReturnsAll, getQueryAs, toSqlCacheKey, NotFoundError, relationQueryKey, Adapter, Db, anyShape, getClonedQueryData, columnsShapeToCode, primaryKeyToCode, indexToCode, constraintToCode, columnIndexesToCode, columnForeignKeysToCode, columnCheckToCode, identityToCode } from 'pqb';
 export { OrchidOrmError, OrchidOrmInternalError, columnTypes } from 'pqb';
-import { snakeCaseKey, toSnakeCase, emptyObject, pathToLog, toCamelCase, toPascalCase, getImportPath, singleQuote, codeToString, quoteObjectKey, addCode, columnDefaultArgumentToCode, deepCompare } from 'orchid-core';
+import { getCallerFilePath, snakeCaseKey, toSnakeCase, emptyObject, pathToLog, toCamelCase, toPascalCase, getImportPath, singleQuote, codeToString, quoteObjectKey, addCode, columnDefaultArgumentToCode, deepCompare } from 'orchid-core';
 import { AsyncLocalStorage } from 'node:async_hooks';
 import * as path from 'path';
 import path__default from 'path';
@@ -9,16 +9,25 @@ import typescript from 'typescript';
 
 const createBaseTable = ({
   columnTypes: columnTypes$1,
-  snakeCase
+  snakeCase,
+  filePath
 } = { columnTypes: columnTypes }) => {
   const ct = typeof columnTypes$1 === "function" ? columnTypes$1(columnTypes) : columnTypes$1 || columnTypes;
+  filePath != null ? filePath : filePath = getCallerFilePath();
+  if (!filePath) {
+    throw new Error(
+      `Failed to determine file path of a base table. Please set the \`filePath\` option of \`createBaseTable\` manually.`
+    );
+  }
   return create(
     ct,
+    filePath,
     snakeCase
   );
 };
-const create = (columnTypes, snakeCase) => {
-  const base = class BaseTable {
+const create = (columnTypes, filePath, snakeCase) => {
+  var _a;
+  const base = (_a = class {
     constructor() {
       this.snakeCase = snakeCase;
       this.setColumns = (fn) => {
@@ -74,7 +83,7 @@ const create = (columnTypes, snakeCase) => {
         options
       };
     }
-  };
+  }, _a.filePath = filePath, _a);
   base.prototype.columnTypes = columnTypes;
   return base;
 };
@@ -1774,7 +1783,7 @@ const createTable = async (_a) => {
     "logger"
   ]);
   const tablePath = params.tablePath(toCamelCase(ast.name));
-  const baseTablePath = getImportPath(tablePath, params.baseTablePath);
+  const baseTablePath = getImportPath(tablePath, params.baseTable.filePath);
   const props = [];
   if (ast.schema) {
     props.push(`schema = ${singleQuote(ast.schema)};`);
@@ -1789,9 +1798,9 @@ const createTable = async (_a) => {
     "}));"
   );
   const code = [
-    `import { ${params.baseTableName} } from '${baseTablePath}';
+    `import { ${params.baseTable.name} } from '${baseTablePath}';
 `,
-    `export class ${toPascalCase(ast.name)}Table extends ${params.baseTableName} {`,
+    `export class ${toPascalCase(ast.name)}Table extends ${params.baseTable.name} {`,
     props,
     "}\n"
   ];
@@ -2403,22 +2412,21 @@ const updateTableFile = async (params) => {
 };
 
 const createBaseTableFile = async ({
-  baseTableName,
-  baseTablePath,
+  baseTable,
   logger
 }) => {
-  await fs.mkdir(path__default.dirname(baseTablePath), { recursive: true });
+  await fs.mkdir(path__default.dirname(baseTable.filePath), { recursive: true });
   await fs.writeFile(
-    baseTablePath,
+    baseTable.filePath,
     `import { createBaseTable } from 'orchid-orm';
 
-export const ${baseTableName} = createBaseTable();
+export const ${baseTable.name} = createBaseTable();
 `,
     {
       flag: "wx"
     }
   ).then(() => {
-    logger == null ? void 0 : logger.log(`Created ${pathToLog(baseTablePath)}`);
+    logger == null ? void 0 : logger.log(`Created ${pathToLog(baseTable.filePath)}`);
   }).catch((err) => {
     if (err.code === "EEXIST")
       return;
@@ -2449,18 +2457,21 @@ class AppCodeUpdaterError extends Error {
 }
 const appCodeUpdater = ({
   tablePath,
-  baseTablePath,
-  baseTableName,
   mainFilePath
 }) => {
-  return async ({ ast, options, basePath, cache: cacheObject, logger }) => {
+  return async ({
+    ast,
+    options,
+    basePath,
+    cache: cacheObject,
+    logger,
+    baseTable
+  }) => {
     const params = {
       tablePath(name) {
         const file = tablePath(name);
         return resolvePath(basePath, file);
       },
-      baseTablePath: resolvePath(basePath, baseTablePath),
-      baseTableName: baseTableName || "BaseTable",
       mainFilePath: resolvePath(basePath, mainFilePath),
       logger
     };
@@ -2472,12 +2483,12 @@ const appCodeUpdater = ({
         options,
         logger
       ),
-      updateTableFile(__spreadProps(__spreadValues({}, params), { ast }))
+      updateTableFile(__spreadProps(__spreadValues({}, params), { ast, baseTable }))
     ];
     const cache = cacheObject;
     if (!cache.createdBaseTable) {
       promises.push(
-        createBaseTableFile(params).then(() => {
+        createBaseTableFile({ logger: params.logger, baseTable }).then(() => {
           cache.createdBaseTable = true;
         })
       );