mutano 3.7.3 → 3.7.5

package/dist/main.js

@@ -1152,12 +1152,33 @@ function parseViewColumns(sqlContent, startPos, tableDefinitions) {
     "user_relationship_": ["rise_entities", "user_rel"],
     "user_entity_": ["rise_entities", "user_entity"]
   };
-  for (const expr of columnExprs) {
+  for (let i = 0; i < columnExprs.length; i++) {
+    let expr = columnExprs[i];
     if (!expr) continue;
-    const aliasMatch = expr.match(/\s+AS\s+[`"]?([^`"\s,]+)[`"]?\s*$/i);
+    let inlineComment = "";
+    const endCommentMatch = expr.match(/--\s*(.+)$/);
+    if (endCommentMatch) {
+      inlineComment = endCommentMatch[1].trim();
+      expr = expr.replace(/--\s*.+$/, "").trim();
+    }
+    const startCommentMatch = expr.match(/^--\s*(.+?)\n/);
+    if (startCommentMatch && !inlineComment) {
+      inlineComment = startCommentMatch[1].trim();
+      expr = expr.replace(/^--\s*.+?\n/, "").trim();
+    }
+    const nextExpr = columnExprs[i + 1];
+    if (nextExpr && !inlineComment) {
+      const nextStartCommentMatch = nextExpr.match(/^--\s*(.+?)(?:\n|$)/);
+      if (nextStartCommentMatch) {
+        inlineComment = nextStartCommentMatch[1].trim();
+        columnExprs[i + 1] = nextExpr.replace(/^--\s*.+?(?:\n|$)/, "").trim();
+      }
+    }
+    const aliasMatch = expr.match(/\s+AS\s+[`"]?([^`"\s,]+)[`"]?\s*(?:--.*)?$/i);
     if (aliasMatch) {
       const name = aliasMatch[1];
-      const sourceRefMatch = expr.match(/^(?:[`"]?([\w_]+)[`"]?\.)?[`"]?([\w_]+)[`"]?\s+AS/i);
+      const exprWithoutComment = expr.replace(/--.*$/, "");
+      const sourceRefMatch = exprWithoutComment.match(/^(?:[`"]?([\w_]+)[`"]?\.)?[`"]?([\w_]+)[`"]?\s+AS/i);
       const sourceTable = sourceRefMatch?.[1];
       const sourceCol = sourceRefMatch?.[2];
       let type = "varchar(191)";
@@ -1224,6 +1245,9 @@ function parseViewColumns(sqlContent, startPos, tableDefinitions) {
         }
       }
       let comment = sourceColumnComment;
+      if (inlineComment) {
+        comment = inlineComment;
+      }
       columns.push({
         name,
         type,
@@ -1327,6 +1351,11 @@ function parseColumns(columnSection) {
     if (commentMatch) {
       comment = commentMatch[1].replace(/\\'/g, "'");
     }
+    if (type.match(/^(enum|set)\s*\(/i) && comment.match(/@(kysely|ts|zod)\s*\(/)) {
+      throw new Error(
+        `Magic comments are not supported on enum/set columns. Column "${name}" has type "${type}" with comment "${comment}". Remove the magic comment - enum types are automatically generated by mutano.`
+      );
+    }
     columns.push({
       name,
       type,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mutano",
   "type": "module",
-  "version": "3.7.3",
+  "version": "3.7.5",
   "description": "Converts Prisma/MySQL/PostgreSQL/SQLite schemas to Zod/TS/Kysely interfaces",
   "author": "Alisson Cavalcante Agiani <thelinuxlich@gmail.com>",
   "license": "MIT",