orchid-orm 1.17.32 → 1.17.34

package/codegen/index.js

@@ -415,13 +415,15 @@ const createTable = async (_a) => {
     logger,
     getTable,
     relations,
-    tables
+    tables,
+    delayed
   } = _b, params = __objRest$3(_b, [
     "ast",
     "logger",
     "getTable",
     "relations",
-    "tables"
+    "tables",
+    "delayed"
   ]);
   const key = orchidCore.toCamelCase(ast.name);
   const tablePath = params.tablePath(key);
@@ -451,36 +453,43 @@ const createTable = async (_a) => {
     pqb.columnsShapeToCode(ast.shape, ast, "t"),
     "}));"
   );
-  const relCode = await getRelations(
-    ast,
-    getTable,
-    tablePath,
-    imports,
-    relations,
-    ast.name
-  );
-  if (relCode) {
-    props.push("", ...relCode);
-  }
+  const importsCode = importsToCode(imports);
   const code = [
-    ...Object.entries(imports).map(
-      ([from, name]) => `import { ${name} } from '${from}';`
-    ),
-    "",
     `export class ${className} extends ${params.baseTable.exportAs} {`,
     props,
     "}\n"
   ];
   await fs.mkdir(path.dirname(tablePath), { recursive: true });
   try {
-    await fs.writeFile(tablePath, orchidCore.codeToString(code, "", "  "), { flag: "wx" });
-    logger == null ? void 0 : logger.log(`Created ${orchidCore.pathToLog(tablePath)}`);
+    const content = importsCode + "\n\n" + orchidCore.codeToString(code, "", "  ");
+    await fs.writeFile(tablePath, content, { flag: "wx" });
+    delayed.push(async () => {
+      const imports2 = {};
+      const relCode = await getRelations(
+        ast,
+        getTable,
+        tablePath,
+        imports2,
+        relations,
+        ast.name
+      );
+      if (relCode) {
+        const code2 = orchidCore.codeToString(relCode, "  ", "  ");
+        const updated = content.slice(0, importsCode.length) + `
+${importsToCode(imports2)}` + content.slice(importsCode.length, -2) + "  \n" + code2 + "\n" + content.slice(-2);
+        await fs.writeFile(tablePath, updated);
+      }
+      logger == null ? void 0 : logger.log(`Created ${orchidCore.pathToLog(tablePath)}`);
+    });
   } catch (err) {
     if (err.code !== "EEXIST") {
       throw err;
     }
   }
 };
+function importsToCode(imports) {
+  return Object.entries(imports).map(([from, name]) => `import { ${name} } from '${from}';`).join("\n");
+}
 const getRelations = async (ast, getTable, tablePath, imports, relations, tableName) => {
   const refs = [];
   for (const key in ast.shape) {
@@ -522,7 +531,10 @@ const getRelations = async (ast, getTable, tablePath, imports, relations, tableN
     imports[path2] = info.name;
     code.push(
       `${info.key}: this.belongsTo(() => ${info.name}, {`,
-      [`primaryKey: '${foreignColumns[0]}',`, `foreignKey: '${columns[0]}',`],
+      [
+        `columns: [${foreignColumns.map(orchidCore.singleQuote).join(", ")}],`,
+        `references: [${columns.map(orchidCore.singleQuote).join(", ")}],`
+      ],
       "}),"
     );
     await handleForeignKey({
@@ -1342,6 +1354,7 @@ class AppCodeUpdaterError extends Error {
 const makeGetTable = (path2, ormExportedAs, tables, imp) => {
   let orm;
   return async (tableName) => {
+    var _a;
     if (tables[tableName])
       return tables[tableName];
     if (!orm) {
@@ -1359,14 +1372,19 @@ const makeGetTable = (path2, ormExportedAs, tables, imp) => {
     }
     for (const key in orm) {
       const table = orm[key];
-      if (table && typeof table === "object" && table instanceof pqb.Db && table.table === tableName) {
-        const tableInfo = {
-          key,
-          name: table.name,
-          path: table.filePath
-        };
-        return tables[tableName] = tableInfo;
-      }
+      if (!table || typeof table !== "object" || !(table instanceof pqb.Db) || table.table !== tableName)
+        continue;
+      const name = table.name;
+      if (!name)
+        continue;
+      const path3 = (_a = table.getFilePath) == null ? void 0 : _a.call(table);
+      if (!path3)
+        continue;
+      return tables[tableName] = {
+        key,
+        name,
+        path: path3
+      };
     }
     return;
   };
@@ -1404,13 +1422,15 @@ const appCodeUpdater = ({
       options,
       logger
     );
+    const delayed = [];
     const promises = [
       updateTableFile(__spreadProps(__spreadValues({}, params), {
         ast,
         baseTable,
         getTable,
         relations: cache.relations,
-        tables: cache.tables
+        tables: cache.tables,
+        delayed
       }))
     ];
     if (!cache.createdBaseTable) {
@@ -1421,6 +1441,7 @@ const appCodeUpdater = ({
       );
     }
     await Promise.all(promises);
+    await Promise.all(delayed.map((fn) => fn()));
   },
   async afterAll({ cache, logger }) {
     const { relations } = cache;