@inflector/optima 1.0.16 → 1.0.18

package/dist/index.d.ts

@@ -59,7 +59,7 @@ declare const Uuid: () => ColumnBuilder<string, SetFlag$1<Restrict<"defaultNow">
 declare const DateType: () => ColumnBuilder<Date, SetFlag$1<Restrict<"default">, "SQlType">, never>;
 declare const Timestamp: () => ColumnBuilder<Date, SetFlag$1<Restrict<"default">, "SQlType">, never>;
 declare const Enum: <T extends string | number>(vals: readonly T[]) => ColumnBuilder<T, SetFlag$1<SetFlag$1<Restrict<"defaultNow">, "validate">, "SQlType">, never>;
-declare const Json: <T extends z.ZodRawShape>(obj: T) => ColumnBuilder<z.core.$InferObjectOutput<T, {}>, SetFlag$1<Restrict<"primaryKey" | "unique" | "defaultNow">, "SQlType">, never>;
+declare const Json: <T extends z.ZodRawShape = Record<string, any>>(obj: T) => ColumnBuilder<[keyof T] extends [never] ? Record<string, any> : z.core.$InferObjectOutput<T, {}>, SetFlag$1<Restrict<"primaryKey" | "unique" | "defaultNow">, "SQlType">, never>;
 declare const Array$1: <T extends z.ZodTypeAny>(schema: T) => ColumnBuilder<z.core.output<T>[], SetFlag$1<Restrict<"primaryKey" | "unique" | "defaultNow">, "SQlType">, never>;
 declare const Email: () => ColumnBuilder<string, SetFlag$1<SetFlag$1<Restrict<"defaultNow">, "SQlType">, "validate">, never>;
 declare const Slug: () => ColumnBuilder<string, SetFlag$1<SetFlag$1<Restrict<"defaultNow">, "SQlType">, "validate">, never>;

package/dist/index.js

@@ -146,7 +146,11 @@ var SQLBuilder = class {
     const FieldConfig = GetFieldConfig(f);
     let sql = `${name} ${FieldConfig.SQlType || "TEXT"}`;
     if ((FieldConfig.SQlType == "STRUCT" || FieldConfig.SQlType == "LIST") && FieldConfig.STRUCTType) {
-      sql = `${name} ${FieldConfig.STRUCTType}`;
+      if (FieldConfig.STRUCTType == "STRUCT()") {
+        sql = `${name} JSON`;
+      } else {
+        sql = `${name} ${FieldConfig.STRUCTType}`;
+      }
     }
     if (FieldConfig.primaryKey) sql += " PRIMARY KEY";
     if (FieldConfig.notnull) sql += " NOT NULL";
@@ -417,7 +421,7 @@ var escape = (val) => {
   return String(val);
 };
 var SQL_GENERATORS = {
-  eq: (c, v) => `${c} = ${escape(v)}`,
+  eq: (c, v) => v === null ? `${c} IS NULL` : `${c} = ${escape(v)}`,
   ne: (c, v) => `${c} != ${escape(v)}`,
   gt: (c, v) => `${c} > ${escape(v)}`,
   gte: (c, v) => `${c} >= ${escape(v)}`,
@@ -472,7 +476,11 @@ var OptimaTable = class _OptimaTable {
           } else if (val && typeof val === "object" && !Array.isArray(val) && !(val instanceof Date)) {
             processLevel(val, colName);
           } else {
-            conditions.push(SQL_GENERATORS.eq(colName, val));
+            if (val === null) {
+              conditions.push(SQL_GENERATORS.is(colName, null));
+            } else {
+              conditions.push(SQL_GENERATORS.eq(colName, val));
+            }
           }
         }
       };
@@ -584,6 +592,9 @@ ${valuesBlock}${isReturning ? "\nRETURNING *" : ""};`;
         }
         return parsedObj;
       }
+      if (type?.SQlType === "STRUCT" && type?.STRUCTType === "STRUCT()") {
+        return JSON.parse(value);
+      }
       return value;
     };
     this.FormatOut = (data) => {
@@ -970,7 +981,12 @@ var SchemaMigrator = class {
         if (colImpl?.config) {
           const config = { ...colImpl.config };
           if (config.SQlType === "STRUCT" && config.STRUCTType) {
-            config.SQlType = config.STRUCTType;
+            if (config.STRUCTType == "STRUCT()") {
+              config.SQlType = "JSON";
+              config.STRUCTType = "JSON";
+            } else {
+              config.SQlType = config.STRUCTType;
+            }
           }
           cleanSchema[realTableName][colName] = config;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inflector/optima",
-  "version": "1.0.16",
+  "version": "1.0.18",
   "type": "module",
   "author": "Inflector",
   "main": "./dist/index.js",