flint-orm 0.4.4 → 0.4.5

package/dist/migration/types.d.ts

@@ -3,6 +3,7 @@ export interface SerializedColumn {
     name: string;
     sqlType: 'text' | 'integer' | 'real' | 'blob';
     isPrimaryKey: boolean;
+    isAutoIncrement?: boolean;
     isNotNull: boolean;
     isUnique: boolean;
     hasDefault: boolean;

package/dist/src/cli.js

@@ -275,6 +275,9 @@ function diffColumns(tableName, prevCols, currCols) {
     if (prevCol.isPrimaryKey !== currCol.isPrimaryKey) {
       unsafe = true;
     }
+    if ((prevCol.isAutoIncrement ?? false) !== (currCol.isAutoIncrement ?? false)) {
+      unsafe = true;
+    }
     if (prevCol.isNotNull !== currCol.isNotNull) {
       if (prevCol.isNotNull && !currCol.isNotNull) {
         unsafe = true;
@@ -529,6 +532,7 @@ function serializeColumn(col) {
     name: col.name,
     sqlType: internal.sqlType,
     isPrimaryKey: internal.isPrimaryKey,
+    isAutoIncrement: internal.isAutoIncrement ?? false,
     isNotNull: internal.isNotNull,
     isUnique: internal.isUnique,
     hasDefault: internal.hasDefault,
@@ -592,6 +596,8 @@ function columnToDDL(col) {
   const parts = [col.name, sqlType(col)];
   if (col.isPrimaryKey)
     parts.push("PRIMARY KEY");
+  if (col.isAutoIncrement === true)
+    parts.push("AUTOINCREMENT");
   if (col.isNotNull && !col.isPrimaryKey)
     parts.push("NOT NULL");
   if (col.isUnique && !col.isPrimaryKey)
@@ -775,24 +781,7 @@ function serializeOpArg(op) {
   }
 }
 function serializeColumnArg(col) {
-  const obj = {
-    name: col.name,
-    sqlType: col.sqlType,
-    isPrimaryKey: col.isPrimaryKey,
-    isNotNull: col.isNotNull,
-    isUnique: col.isUnique,
-    hasDefault: col.hasDefault,
-    defaultValue: col.defaultValue
-  };
-  if (col.referencesTable && col.referencesColumn) {
-    obj.referencesTable = col.referencesTable;
-    obj.referencesColumn = col.referencesColumn;
-    if (col.onDelete)
-      obj.onDelete = col.onDelete;
-    if (col.onUpdate)
-      obj.onUpdate = col.onUpdate;
-  }
-  return JSON.stringify(obj);
+  return JSON.stringify(col);
 }
 function serializeIndexArg(idx) {
   return `{ name: ${JSON.stringify(idx.name)}, columns: ${JSON.stringify(idx.columns)}, unique: ${idx.unique} }`;
@@ -832,7 +821,7 @@ async function generate(tables, migrationsDir, nameOrOptions) {
   const migrationDir = join(migrationsDir, folderName);
   mkdirSync(migrationDir, { recursive: true });
   const uniqueOps = [...new Set(operations.map((op) => op.type))];
-  const imports = uniqueOps.map((op) => `import { ${op} } from "flint-orm/migration/operations";`).join(`
+  const imports = uniqueOps.map((op) => `import { ${op} } from "flint-orm/migration";`).join(`
 `);
   const operationLines = operations.map((op) => {
     const arg = serializeOpArg(op);

package/dist/src/migration/index.js

@@ -57,6 +57,7 @@ function serializeColumn(col) {
     name: col.name,
     sqlType: internal.sqlType,
     isPrimaryKey: internal.isPrimaryKey,
+    isAutoIncrement: internal.isAutoIncrement ?? false,
     isNotNull: internal.isNotNull,
     isUnique: internal.isUnique,
     hasDefault: internal.hasDefault,
@@ -207,6 +208,9 @@ function diffColumns(tableName, prevCols, currCols) {
     if (prevCol.isPrimaryKey !== currCol.isPrimaryKey) {
       unsafe = true;
     }
+    if ((prevCol.isAutoIncrement ?? false) !== (currCol.isAutoIncrement ?? false)) {
+      unsafe = true;
+    }
     if (prevCol.isNotNull !== currCol.isNotNull) {
       if (prevCol.isNotNull && !currCol.isNotNull) {
         unsafe = true;
@@ -463,6 +467,8 @@ function columnToDDL(col) {
   const parts = [col.name, sqlType(col)];
   if (col.isPrimaryKey)
     parts.push("PRIMARY KEY");
+  if (col.isAutoIncrement === true)
+    parts.push("AUTOINCREMENT");
   if (col.isNotNull && !col.isPrimaryKey)
     parts.push("NOT NULL");
   if (col.isUnique && !col.isPrimaryKey)
@@ -646,24 +652,7 @@ function serializeOpArg(op) {
   }
 }
 function serializeColumnArg(col) {
-  const obj = {
-    name: col.name,
-    sqlType: col.sqlType,
-    isPrimaryKey: col.isPrimaryKey,
-    isNotNull: col.isNotNull,
-    isUnique: col.isUnique,
-    hasDefault: col.hasDefault,
-    defaultValue: col.defaultValue
-  };
-  if (col.referencesTable && col.referencesColumn) {
-    obj.referencesTable = col.referencesTable;
-    obj.referencesColumn = col.referencesColumn;
-    if (col.onDelete)
-      obj.onDelete = col.onDelete;
-    if (col.onUpdate)
-      obj.onUpdate = col.onUpdate;
-  }
-  return JSON.stringify(obj);
+  return JSON.stringify(col);
 }
 function serializeIndexArg(idx) {
   return `{ name: ${JSON.stringify(idx.name)}, columns: ${JSON.stringify(idx.columns)}, unique: ${idx.unique} }`;
@@ -703,7 +692,7 @@ async function generate(tables, migrationsDir, nameOrOptions) {
   const migrationDir = join(migrationsDir, folderName);
   mkdirSync(migrationDir, { recursive: true });
   const uniqueOps = [...new Set(operations.map((op) => op.type))];
-  const imports = uniqueOps.map((op) => `import { ${op} } from "flint-orm/migration/operations";`).join(`
+  const imports = uniqueOps.map((op) => `import { ${op} } from "flint-orm/migration";`).join(`
 `);
   const operationLines = operations.map((op) => {
     const arg = serializeOpArg(op);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flint-orm",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "bin": {
     "flint": "./dist/src/cli.js"
   },