orchid-orm 1.5.19 → 1.5.21

package/.turbo/turbo-test.log

@@ -0,0 +1,26 @@
+
+> orchid-orm@1.5.19 test /home/romeo/dev/my/orchid-orm/packages/orm
+> jest "--coverage" "--coverageReporters" "json-summary"
+
+PASS src/relations/hasAndBelongsToMany.test.ts
+PASS src/codegen/updateTableFile/renameTable.test.ts (5.657 s)
+PASS src/codegen/updateTableFile/createTable.test.ts (5.458 s)
+PASS src/codegen/updateMainFile.test.ts (5.801 s)
+PASS src/relations/belongsTo.test.ts (5.811 s)
+PASS src/codegen/updateTableFile/changeTable.test.ts (6.179 s)
+PASS src/relations/hasMany.test.ts (6.685 s)
+PASS src/bin/init.test.ts
+PASS src/repo.test.ts
+PASS src/relations/hasOne.test.ts
+PASS src/codegen/createBaseTableFile.test.ts
+PASS src/relations/relations.test.ts
+PASS src/codegen/appCodeUpdater.test.ts
+PASS src/orm.test.ts
+PASS src/transaction.test.ts
+PASS src/table.test.ts
+
+Test Suites: 16 passed, 16 total
+Tests:       318 passed, 318 total
+Snapshots:   0 total
+Time:        10.094 s, estimated 12 s
+Ran all test suites.

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # orchid-orm
 
+## 1.5.21
+
+### Patch Changes
+
+- Fix baseTablePath in orm codegen
+
+## 1.5.20
+
+### Patch Changes
+
+- Relative path in rakeDb config
+
 ## 1.5.19
 
 ### Patch Changes

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as pqb from 'pqb';
-import { BelongsToRelation, HasManyRelation, HasOneRelation, Db, Adapter, AdapterOptions, QueryLogOptions, NoPrimaryKeyOption, HasAndBelongsToManyRelation, Query, defaultsKey, EmptyObject, BaseRelation, RelationQuery, SetQueryReturnsOne, SetQueryReturnsOneOptional, SetQueryReturnsAll, ColumnTypesBase, DefaultColumnTypes, ColumnsShape, ColumnShapeOutput, WhereResult, MergeQuery, SetQueryReturns, QueryReturnType } from 'pqb';
+import { BelongsToRelation, HasManyRelation, HasOneRelation, Db, Adapter, AdapterOptions, QueryLogOptions, NoPrimaryKeyOption, HasAndBelongsToManyRelation, Query, defaultsKey, EmptyObject, BaseRelation, RelationQuery, SetQueryReturnsOne, SetQueryReturnsOneOptional, SetQueryReturnsAll, ColumnTypesBase, DefaultColumnTypes, ColumnsShape, ColumnShapeOutput, WhereResult, MergeQuery, SetQueryReturns, QueryReturnType, SetOptional } from 'pqb';
 export { columnTypes } from 'pqb';
 import { AppCodeUpdater } from 'rake-db';
 
@@ -435,6 +435,6 @@ declare type AppCodeUpdaterConfig = {
     baseTableName: string;
     mainFilePath: string;
 };
-declare const appCodeUpdater: (config: AppCodeUpdaterConfig) => AppCodeUpdater;
+declare const appCodeUpdater: ({ tablePath, baseTablePath, baseTableName, mainFilePath, }: SetOptional<AppCodeUpdaterConfig, 'baseTableName'>) => AppCodeUpdater;
 
 export { AppCodeUpdaterConfig, AppCodeUpdaterError, DbTable, MapMethods, MapQueryMethods, MethodsBase, OrchidORM, QueryMethods, Repo, Table, TableClass, TableClasses, TableToDb, appCodeUpdater, createBaseTable, createRepo, orchidORM };

package/dist/index.js

@@ -2341,12 +2341,22 @@ var __spreadValues = (a, b) => {
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 class AppCodeUpdaterError extends Error {
 }
-const appCodeUpdater = (config) => {
-  const params = __spreadProps(__spreadValues({}, config), {
-    tablePath: (name) => path__namespace.resolve(config.tablePath(name)),
-    mainFilePath: path__namespace.resolve(config.mainFilePath)
-  });
-  return async ({ ast, options, cache: cacheObject }) => {
+const appCodeUpdater = ({
+  tablePath,
+  baseTablePath,
+  baseTableName,
+  mainFilePath
+}) => {
+  return async ({ ast, options, basePath, cache: cacheObject }) => {
+    const params = {
+      tablePath(name) {
+        const file = tablePath(name);
+        return resolvePath(basePath, file);
+      },
+      baseTablePath: resolvePath(basePath, baseTablePath),
+      baseTableName: baseTableName || "BaseTable",
+      mainFilePath: resolvePath(basePath, mainFilePath)
+    };
     const promises = [
       updateMainFile(params.mainFilePath, params.tablePath, ast, options),
       updateTableFile(__spreadProps(__spreadValues({}, params), { ast }))
@@ -2362,6 +2372,7 @@ const appCodeUpdater = (config) => {
     await Promise.all(promises);
   };
 };
+const resolvePath = (basePath, filePath) => path__namespace.isAbsolute(filePath) ? filePath : path__namespace.resolve(basePath, filePath);
 
 Object.defineProperty(exports, 'columnTypes', {
   enumerable: true,