orchid-orm 1.8.0 → 1.9.0

package/dist/index.d.ts

@@ -2,7 +2,7 @@ import * as pqb from 'pqb';
 import { BelongsToRelation, HasManyRelation, HasOneRelation, Db, IsolationLevel, TransactionOptions, Adapter, FromArgs, Query, FromResult, AdapterOptions, QueryLogOptions, NoPrimaryKeyOption, HasAndBelongsToManyRelation, SetQueryTableAlias, defaultsKey, BaseRelation, RelationQuery, SetQueryReturnsOne, SetQueryReturnsOneOptional, SetQueryReturnsAll, DefaultColumnTypes, ColumnsShape, WhereResult, MergeQuery, SetQueryReturns, QueryReturnType } from 'pqb';
 export { OrchidOrmError, OrchidOrmInternalError, columnTypes } from 'pqb';
 import * as orchid_core from 'orchid-core';
-import { StringKey, EmptyObject, ColumnTypesBase, ColumnShapeOutput, SetOptional } from 'orchid-core';
+import { StringKey, EmptyObject, ColumnTypesBase, ColumnShapeOutput } from 'orchid-core';
 import { AppCodeUpdater } from 'rake-db';
 
 interface BelongsTo extends RelationThunkBase {
@@ -147,9 +147,10 @@ type Table = {
     columnTypes: ColumnTypesBase;
     noPrimaryKey?: boolean;
 };
-declare const createBaseTable: <CT extends ColumnTypesBase>({ columnTypes, snakeCase, }?: {
+declare const createBaseTable: <CT extends ColumnTypesBase>({ columnTypes, snakeCase, filePath, }?: {
     columnTypes?: CT | ((t: DefaultColumnTypes) => CT) | undefined;
     snakeCase?: boolean | undefined;
+    filePath?: string | undefined;
 }) => {
     new (): {
         table: string;
@@ -450,6 +451,7 @@ declare const createBaseTable: <CT extends ColumnTypesBase>({ columnTypes, snake
             options: Options_3;
         };
     };
+    filePath: string;
 };
 
 type QueryMethods<T extends Query> = Record<string, (q: T, ...args: any[]) => any>;
@@ -475,11 +477,13 @@ declare class AppCodeUpdaterError extends Error {
 }
 type AppCodeUpdaterConfig = {
     tablePath(tableName: string): string;
-    baseTablePath: string;
-    baseTableName: string;
     mainFilePath: string;
     logger?: QueryLogOptions['logger'];
 };
-declare const appCodeUpdater: ({ tablePath, baseTablePath, baseTableName, mainFilePath, }: SetOptional<AppCodeUpdaterConfig, 'baseTableName'>) => AppCodeUpdater;
+type BaseTableParam = {
+    filePath: string;
+    name: string;
+};
+declare const appCodeUpdater: ({ tablePath, mainFilePath, }: AppCodeUpdaterConfig) => AppCodeUpdater;
 
-export { AppCodeUpdaterConfig, AppCodeUpdaterError, DbTable, MapMethods, MapQueryMethods, MethodsBase, OrchidORM, QueryMethods, Repo, Table, TableClass, TableClasses, TableToDb, appCodeUpdater, createBaseTable, createRepo, orchidORM };
+export { AppCodeUpdaterConfig, AppCodeUpdaterError, BaseTableParam, DbTable, MapMethods, MapQueryMethods, MethodsBase, OrchidORM, QueryMethods, Repo, Table, TableClass, TableClasses, TableToDb, appCodeUpdater, createBaseTable, createRepo, orchidORM };

package/dist/index.js

@@ -28,16 +28,25 @@ var path__namespace = /*#__PURE__*/_interopNamespaceDefault(path);
 
 const createBaseTable = ({
   columnTypes,
-  snakeCase
+  snakeCase,
+  filePath
 } = { columnTypes: pqb.columnTypes }) => {
   const ct = typeof columnTypes === "function" ? columnTypes(pqb.columnTypes) : columnTypes || pqb.columnTypes;
+  filePath != null ? filePath : filePath = orchidCore.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) => {
@@ -93,7 +102,7 @@ const create = (columnTypes, snakeCase) => {
         options
       };
     }
-  };
+  }, _a.filePath = filePath, _a);
   base.prototype.columnTypes = columnTypes;
   return base;
 };
@@ -1793,7 +1802,7 @@ const createTable = async (_a) => {
     "logger"
   ]);
   const tablePath = params.tablePath(orchidCore.toCamelCase(ast.name));
-  const baseTablePath = orchidCore.getImportPath(tablePath, params.baseTablePath);
+  const baseTablePath = orchidCore.getImportPath(tablePath, params.baseTable.filePath);
   const props = [];
   if (ast.schema) {
     props.push(`schema = ${orchidCore.singleQuote(ast.schema)};`);
@@ -1808,9 +1817,9 @@ const createTable = async (_a) => {
     "}));"
   );
   const code = [
-    `import { ${params.baseTableName} } from '${baseTablePath}';
+    `import { ${params.baseTable.name} } from '${baseTablePath}';
 `,
-    `export class ${orchidCore.toPascalCase(ast.name)}Table extends ${params.baseTableName} {`,
+    `export class ${orchidCore.toPascalCase(ast.name)}Table extends ${params.baseTable.name} {`,
     props,
     "}\n"
   ];
@@ -2422,22 +2431,21 @@ const updateTableFile = async (params) => {
 };
 
 const createBaseTableFile = async ({
-  baseTableName,
-  baseTablePath,
+  baseTable,
   logger
 }) => {
-  await fs.mkdir(path.dirname(baseTablePath), { recursive: true });
+  await fs.mkdir(path.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 ${orchidCore.pathToLog(baseTablePath)}`);
+    logger == null ? void 0 : logger.log(`Created ${orchidCore.pathToLog(baseTable.filePath)}`);
   }).catch((err) => {
     if (err.code === "EEXIST")
       return;
@@ -2468,18 +2476,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
     };
@@ -2491,12 +2502,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;
         })
       );