orchid-orm 1.9.25 → 1.9.27

package/codegen/index.d.ts

@@ -11,7 +11,7 @@ type AppCodeUpdaterConfig = {
 };
 type BaseTableParam = {
     filePath: string;
-    name: string;
+    exportAs: string;
 };
 type AppCodeUpdaterRelations = {
     [Table in string]: AppCodeUpdaterRelationItem;

package/codegen/index.js

@@ -395,7 +395,7 @@ const handleForeignKey = async ({
 var __getOwnPropSymbols$4 = Object.getOwnPropertySymbols;
 var __hasOwnProp$4 = Object.prototype.hasOwnProperty;
 var __propIsEnum$4 = Object.prototype.propertyIsEnumerable;
-var __objRest$2 = (source, exclude) => {
+var __objRest$3 = (source, exclude) => {
   var target = {};
   for (var prop in source)
     if (__hasOwnProp$4.call(source, prop) && exclude.indexOf(prop) < 0)
@@ -414,7 +414,7 @@ const createTable = async (_a) => {
     getTable,
     relations,
     tables
-  } = _b, params = __objRest$2(_b, [
+  } = _b, params = __objRest$3(_b, [
     "ast",
     "logger",
     "getTable",
@@ -431,7 +431,7 @@ const createTable = async (_a) => {
     path: tablePath
   };
   const imports = {
-    [baseTablePath]: params.baseTable.name
+    [baseTablePath]: params.baseTable.exportAs
   };
   const props = [];
   if (ast.schema) {
@@ -462,7 +462,7 @@ const createTable = async (_a) => {
       ([from, name]) => `import { ${name} } from '${from}';`
     ),
     "",
-    `export class ${className} extends ${params.baseTable.name} {`,
+    `export class ${className} extends ${params.baseTable.exportAs} {`,
     props,
     "}\n"
   ];
@@ -549,7 +549,7 @@ var __spreadValues$2 = (a, b) => {
     }
   return a;
 };
-var __objRest$1 = (source, exclude) => {
+var __objRest$2 = (source, exclude) => {
   var target = {};
   for (var prop in source)
     if (__hasOwnProp$3.call(source, prop) && exclude.indexOf(prop) < 0)
@@ -565,7 +565,7 @@ const changeTable = async (_a) => {
   var _b = _a, {
     ast,
     logger
-  } = _b, params = __objRest$1(_b, [
+  } = _b, params = __objRest$2(_b, [
     "ast",
     "logger"
   ]);
@@ -1033,7 +1033,7 @@ const collectObjectFromCode = (node) => {
 var __getOwnPropSymbols$2 = Object.getOwnPropertySymbols;
 var __hasOwnProp$2 = Object.prototype.hasOwnProperty;
 var __propIsEnum$2 = Object.prototype.propertyIsEnumerable;
-var __objRest = (source, exclude) => {
+var __objRest$1 = (source, exclude) => {
   var target = {};
   for (var prop in source)
     if (__hasOwnProp$2.call(source, prop) && exclude.indexOf(prop) < 0)
@@ -1049,7 +1049,7 @@ const renameTable = async (_a) => {
   var _b = _a, {
     ast,
     logger
-  } = _b, params = __objRest(_b, [
+  } = _b, params = __objRest$1(_b, [
     "ast",
     "logger"
   ]);
@@ -1150,7 +1150,7 @@ const createBaseTableFile = async ({
     baseTable.filePath,
     `import { createBaseTable } from 'orchid-orm';
 
-export const ${baseTable.name} = createBaseTable();
+export const ${baseTable.exportAs} = createBaseTable();
 `,
     {
       flag: "wx"
@@ -1308,15 +1308,34 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+var __objRest = (source, exclude) => {
+  var target = {};
+  for (var prop in source)
+    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
+      target[prop] = source[prop];
+  if (source != null && __getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
+        target[prop] = source[prop];
+    }
+  return target;
+};
 class AppCodeUpdaterError extends Error {
 }
-const makeGetTable = (path2, ormExportedAs, tables) => {
+const makeGetTable = (path2, ormExportedAs, tables, imp) => {
   let orm;
   return async (tableName) => {
     if (tables[tableName])
       return tables[tableName];
     if (!orm) {
-      orm = (await import(path2))[ormExportedAs];
+      const mod = await imp(path2).catch((err) => {
+        if (err.code === "ERR_UNKNOWN_FILE_EXTENSION") {
+          return require(path2);
+        } else {
+          throw err;
+        }
+      });
+      orm = mod[ormExportedAs];
       if (!orm) {
         throw new Error(`ORM is not exported as ${ormExportedAs} from ${path2}`);
       }
@@ -1340,15 +1359,9 @@ const appCodeUpdater = ({
   ormPath,
   ormExportedAs = "db"
 }) => ({
-  async process({
-    ast,
-    options,
-    basePath,
-    cache: cacheObject,
-    logger,
-    baseTable
-  }) {
-    var _a, _b;
+  async process(_a) {
+    var _b = _a, { ast, options, basePath, logger, baseTable } = _b, config = __objRest(_b, ["ast", "options", "basePath", "logger", "baseTable"]);
+    var _a2, _b2;
     const params = {
       tablePath(name) {
         const file = tablePath(name);
@@ -1358,10 +1371,15 @@ const appCodeUpdater = ({
       ormExportedAs,
       logger
     };
-    const cache = cacheObject;
-    (_a = cache.relations) != null ? _a : cache.relations = {};
-    (_b = cache.tables) != null ? _b : cache.tables = {};
-    const getTable = makeGetTable(params.ormPath, ormExportedAs, cache.tables);
+    const cache = config.cache;
+    (_a2 = cache.relations) != null ? _a2 : cache.relations = {};
+    (_b2 = cache.tables) != null ? _b2 : cache.tables = {};
+    const getTable = makeGetTable(
+      params.ormPath,
+      ormExportedAs,
+      cache.tables,
+      config.import
+    );
     const promises = [
       updateMainFile(params.ormPath, params.tablePath, ast, options, logger),
       updateTableFile(__spreadProps(__spreadValues({}, params), {