sql-typechecker 0.0.25 → 0.0.28

package/out/cli.js

@@ -241797,10 +241797,11 @@ function unifyRecords(e, source, target) {
   }
   const newFields = source.fields.map((sf, i) => {
     const tf = target.fields[i];
-    const t = unifySimples(e, sf.type, tf.type);
+    const t = unifySimples(tf.expr || e, sf.type, tf.type);
     return {
       name: sf.name || tf.name,
-      type: t
+      type: t,
+      expr: tf.expr
     };
   });
   return {
@@ -241976,7 +241977,8 @@ function doCreateTable(g, s) {
     } else {
       return acc.concat({
         name: c.name,
-        type: mkType(c.dataType, c.constraints || [])
+        type: mkType(c.dataType, c.constraints || []),
+        expr: null
       });
     }
   }, []);
@@ -242051,7 +242053,7 @@ function elabSelect(g, c, s) {
               const foundNullabilityInference = inferredNullability.find((inf) => eqQNames(inf.fromName, fr.name) && inf.fieldName === fi.name?.name);
               if (foundNullabilityInference && isNullable(fi.type)) {
                 const t = foundNullabilityInference.isNull === true ? BuiltinTypes.Null : unnullify(fi.type);
-                return {name: fi.name, type: t};
+                return {name: fi.name, type: t, expr: fi.expr};
               } else {
                 return fi;
               }
@@ -242081,7 +242083,7 @@ function elabSelect(g, c, s) {
           if (c2.expr.type === "ref" && c2.expr.name === "*") {
             return t.fields;
           } else {
-            return [{name: n, type: t.fields[0].type}];
+            return [{name: n, type: t.fields[0].type, expr: c2.expr}];
           }
         } else {
           if (c2.expr.type === "ref" && c2.expr.name === "*") {
@@ -242091,7 +242093,7 @@ function elabSelect(g, c, s) {
           }
         }
       }
-      return [{name: n, type: t}];
+      return [{name: n, type: t, expr: c2.expr}];
     });
     return {
       kind: "record",
@@ -242115,7 +242117,7 @@ function elabSelect(g, c, s) {
         if (t === null) {
           throw new CantReduceToSimpleT(exp, t_);
         } else {
-          return {name: null, type: t};
+          return {name: null, type: t, expr: exp};
         }
       });
       return {
@@ -242142,7 +242144,8 @@ function elabSelect(g, c, s) {
         fields: [
           {
             name: null,
-            type: res
+            type: res,
+            expr: s
           }
         ]
       };
@@ -242208,7 +242211,8 @@ function elabInsert(g, c, s) {
         } else {
           return {
             name: selectedCol.alias || deriveNameFromExpr(selectedCol.expr),
-            type: t
+            type: t,
+            expr: selectedCol.expr
           };
         }
       })
@@ -242246,7 +242250,8 @@ function elabDeleteOrUpdate(g, c, s) {
         } else {
           return {
             name: selectedCol.alias || deriveNameFromExpr(selectedCol.expr),
-            type: t
+            type: t,
+            expr: selectedCol.expr
           };
         }
       })
@@ -242839,7 +242844,11 @@ function elabCall(g, c, e) {
         if (valTSimple === null) {
           throw new CantReduceToSimpleT(e.args[i], argTypes[i]);
         }
-        record.fields.push({name: {name: key.value}, type: valTSimple});
+        record.fields.push({
+          name: {name: key.value},
+          type: valTSimple,
+          expr: e.args[i]
+        });
       }
       return {kind: "jsonknown", record};
     } else {
@@ -242905,7 +242914,7 @@ function elabCall(g, c, e) {
     return unifyOverloadedCall(e, argTypes, allNumericBuiltinTypes.map((t) => ({expectedArgs: [t], returnT: t})));
   }
   if (eqQNames(e.function, {name: "count"})) {
-    return unifyCallGeneral(e, argTypes, [BuiltinTypes.AnyScalar], BuiltinTypes.Boolean);
+    return unifyCallGeneral(e, argTypes, [BuiltinTypes.AnyScalar], BuiltinTypes.Bigint);
   }
   if (eqQNames(e.function, {name: "coalesce"}) || eqQNames(e.function, {name: "nullif"})) {
     if (e.args.length === 0) {
@@ -243176,7 +243185,7 @@ function nullifyRecord(s) {
   return {
     kind: "record",
     fields: s.fields.map((c) => ({
-      name: c.name,
+      ...c,
       type: nullify(c.type)
     }))
   };
@@ -243302,7 +243311,7 @@ return ${genDeserializeSimpleT(returnType, "cells[0]")};
   }
 }
 function functionToTypescript(f) {
-  const returnTypeAsString = f.returns.kind === "void" ? "void" : showTypeAsTypescriptType(f.returns) + (f.multipleRows ? "[]" : " | undefined");
+  const returnTypeAsString = f.returns.kind === "void" ? "void" : showTypeAsTypescriptType(f.returns) + (f.multipleRows ? "[]" : " | null");
   const argsType = "{" + f.inputs.map((k) => {
     const paramTypeAsString = showTypeAsTypescriptType(k.type);
     return k.name.name + ": " + paramTypeAsString;
@@ -243335,7 +243344,7 @@ const row = res.rows[0];
 if (row.some(f => f !== null)){
   return ${genDeserialization(f.returns, "row")}
 } else {
-  return undefined;
+  return null;
 }`;
   return `
 export async function ${f.name.name}(pool: Pool, args: ${argsType})
@@ -243405,6 +243414,20 @@ export async function insert(pool: Pool, row: {${inputRow}}): Promise<{${primary
   } else {
     return null;
   }
+}`;
+    const selectOne = `
+export async function getOne(pool: Pool, pk: {${primaryKeySingleCol.name.name}: ${showTypeAsTypescriptType(primaryKeySingleCol.type)}}): Promise<${showTypeAsTypescriptType(table.rel)} | null>{
+
+const res = await pool.query({
+text: "SELECT * FROM ${showQName(table.name)} WHERE ${primaryKeySingleCol.name.name} = $1",
+values: [pk.${primaryKeySingleCol.name.name}] as any[],
+rowMode: "array",
+});
+if (res.rows[0]){
+return ${genDeserialization(table.rel, "res.rows[0]")};
+} else {
+return null;
+}
 }`;
     const inputRowForUpdate = relWithoutPrim.map((f) => `
 ${f.name?.name}?: ${showTypeAsTypescriptType(f.type)}`).join(",");
@@ -243433,6 +243456,7 @@ return null;
 }`;
     return `
 ${selectAll}
+${selectOne}
 ${insert}
 ${update}
 ${del}
@@ -243541,11 +243565,12 @@ async function go() {
         if (err instanceof ErrorWithLocation && err.l !== void 0) {
           const found = findCode(st.code || "", err.l);
           if (found) {
+            const prefix = found.lineNumber.toString() + "  ";
             console.error("");
             console.error(`Typechecking error`);
             console.error("");
-            console.error(found.line);
-            console.error(import_lodash2.repeat(" ", found.range[0]) + import_lodash2.repeat("^", found.range[1] - found.range[0]));
+            console.error(prefix + found.line);
+            console.error(import_lodash2.repeat(" ", found.range[0] + prefix.length) + import_lodash2.repeat("^", found.range[1] - found.range[0]));
           }
         }
         console.error(err instanceof Error ? err.message : JSON.stringify(err));