orchid-orm 1.7.0 → 1.8.0

package/dist/index.d.ts

@@ -155,6 +155,8 @@ declare const createBaseTable: <CT extends ColumnTypesBase>({ columnTypes, snake
         table: string;
         columns: TableConfig;
         schema?: string | undefined;
+        noPrimaryKey?: boolean | undefined;
+        snakeCase: boolean | undefined;
         columnTypes: ColumnTypesBase extends CT ? {
             timestamps: <T extends orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>>(this: {
                 name(name: string): {
@@ -272,8 +274,6 @@ declare const createBaseTable: <CT extends ColumnTypesBase>({ columnTypes, snake
             }) | undefined): {};
             check(check: orchid_core.RawExpression): {};
         } : CT;
-        noPrimaryKey?: boolean | undefined;
-        snakeCase: boolean | undefined;
         setColumns: <T_18 extends ColumnsShape>(fn: (t: ColumnTypesBase extends CT ? {
             timestamps: <T extends orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>>(this: {
                 name(name: string): {

package/dist/index.js

@@ -37,7 +37,7 @@ const createBaseTable = ({
   );
 };
 const create = (columnTypes, snakeCase) => {
-  return class BaseTable {
+  const base = class BaseTable {
     constructor() {
       this.snakeCase = snakeCase;
       this.setColumns = (fn) => {
@@ -94,6 +94,8 @@ const create = (columnTypes, snakeCase) => {
       };
     }
   };
+  base.prototype.columnTypes = columnTypes;
+  return base;
 };
 
 class BelongsToVirtualColumn extends pqb.VirtualColumn {
@@ -1615,12 +1617,6 @@ const ts = {
   }
 };
 
-const getImportPath = (from, to) => {
-  const rel = path.relative(path.dirname(from), to).split(path.sep).join(path.posix.sep);
-  const importPath = rel.startsWith("./") || rel.startsWith("../") ? rel : `./${rel}`;
-  return importPath.replace(/\.[tj]s$/, "");
-};
-
 const libraryName = "orchid-orm";
 const importKey = "orchidORM";
 const newFile = (options) => `import { orchidORM } from 'orchid-orm';
@@ -1701,7 +1697,7 @@ const createTable$1 = ({ filePath, tablePath, statements, object, content, space
   const key = orchidCore.toCamelCase(ast.name);
   const value = `${orchidCore.toPascalCase(ast.name)}Table`;
   const changes = new FileChanges(content);
-  const importPath = getImportPath(filePath, tablePath(orchidCore.toCamelCase(ast.name)));
+  const importPath = orchidCore.getImportPath(filePath, tablePath(orchidCore.toCamelCase(ast.name)));
   const existing = Array.from(
     ts.import.iterateWithSource(statements, importPath)
   );
@@ -1731,7 +1727,7 @@ ${spaces}`;
 };
 const dropTable = ({ filePath, tablePath, statements, object, content }, ast) => {
   const changes = new FileChanges(content);
-  const importPath = getImportPath(filePath, tablePath(orchidCore.toCamelCase(ast.name)));
+  const importPath = orchidCore.getImportPath(filePath, tablePath(orchidCore.toCamelCase(ast.name)));
   const tableClassName = `${orchidCore.toPascalCase(ast.name)}Table`;
   const importNames = [];
   for (const node of ts.import.iterateWithSource(statements, importPath)) {
@@ -1797,7 +1793,7 @@ const createTable = async (_a) => {
     "logger"
   ]);
   const tablePath = params.tablePath(orchidCore.toCamelCase(ast.name));
-  const baseTablePath = getImportPath(tablePath, params.baseTablePath);
+  const baseTablePath = orchidCore.getImportPath(tablePath, params.baseTablePath);
   const props = [];
   if (ast.schema) {
     props.push(`schema = ${orchidCore.singleQuote(ast.schema)};`);