sql-typechecker 0.0.19 → 0.0.22

package/out/cli.js

@@ -243330,10 +243330,13 @@ CREATE FUNCTION ${f.name.name}(${argsForCreateFunction}) RETURNS ${f.multipleRow
 $$${f.code}$$ LANGUAGE ${f.language};
 `;
   const funcInvocation = `${f.name.name}(${f.inputs.map((inp, i) => "$" + (i + 1) + "::" + showTypeDroppingNullable(inp.type))})${asExpression}`;
-  const deserializationAndReturn = f.returns.kind === "void" ? "" : `
-const rows = res.rows.map(row => ${genDeserialization(f.returns, "row")});
-return rows${f.multipleRows ? "" : "[0]"};
-`;
+  const deserializationAndReturn = f.returns.kind === "void" ? "" : f.multipleRows === true ? `return res.rows.map(row => ${genDeserialization(f.returns, "row")});` : `
+const row = res.rows[0];
+if (row.some(f => f !== null)){
+  return ${genDeserialization(f.returns, "row")}
+} else {
+  return undefined;
+}`;
   return `
 export async function ${f.name.name}(pool: Pool, args: ${argsType})
   : Promise<${returnTypeAsString}>{
@@ -243390,15 +243393,15 @@ ${f.name?.name}?: ${showTypeAsTypescriptType(f.type)}`).join(",");
     const insert = `
 export async function insert(pool: Pool, row: {${inputRow}}): Promise<{${primaryKeySingleCol.name.name}: ${showTypeAsTypescriptType(primaryKeySingleCol.type)}} | null>{
 
-  const providedFields = Object.keys(row);
+  const providedFields = Object.keys(row)  as (keyof typeof row)[];
 
   const res = await pool.query({
   text: "INSERT INTO ${showQName(table.name)} (" + (providedFields.join(", ")) + ") VALUES (" + providedFields.map((_, i) => "$" + (i + 1)).join(", ") +") RETURNING ${primaryKeySingleCol.name.name}",
   values: providedFields.map(f => row[f]),
   rowMode: "array",
   });
-  if (res && res[0]){
-    return {${primaryKeySingleCol.name.name}: res[0][0]};
+  if (res && res.rows[0]){
+    return {${primaryKeySingleCol.name.name}: res.rows[0][0]};
   } else {
     return null;
   }
@@ -243408,12 +243411,12 @@ ${f.name?.name}?: ${showTypeAsTypescriptType(f.type)}`).join(",");
     const update = `
 export async function update(pool: Pool, pk: {${primaryKeySingleCol.name.name}: ${showTypeAsTypescriptType(primaryKeySingleCol.type)}}, row: {${inputRowForUpdate}}): Promise<null>{
 
-  const providedFields = Object.keys(row);
+  const providedFields = Object.keys(row) as (keyof typeof row)[] ;
   if (providedFields.length === 0){ return null; }
 
   await pool.query({
   text: "UPDATE ${showQName(table.name)} SET " + providedFields.map((f, i) => f + " = $" + (i + 2)).join(", ") + " WHERE ${primaryKeySingleCol.name.name} = $1",
-values: [pk.${primaryKeySingleCol.name.name}].concat(providedFields.map(f => row[f])),
+values: ([pk.${primaryKeySingleCol.name.name}] as any[]).concat(providedFields.map(f => row[f])),
   rowMode: "array",
   });
   return null;
@@ -243496,6 +243499,12 @@ async function go() {
   }
   await fs.appendFile(domainFile, `
 `, "utf-8");
+  const tablesIndexFile = path.format({
+    dir: outDir,
+    name: "tables",
+    ext: ".ts"
+  });
+  await prepOutFile(tablesIndexFile);
   await fs.mkdir(path.join(outDir, "tables"), {recursive: true});
   for (let table of g.tables) {
     const tableOutFile = path.format({
@@ -243507,6 +243516,8 @@ async function go() {
     const text = genCrudOperations(table);
     await fs.appendFile(tableOutFile, mkImportDomainsStatement(g.domains, tableOutFile, domainFile), "utf8");
     await fs.appendFile(tableOutFile, prettier.format(text, {parser: "typescript"}), "utf-8");
+    await fs.appendFile(tablesIndexFile, `export * as ${table.name.name} from "./tables/${table.name.name}";
+`);
   }
   for (let f of allStatements) {
     const createFunctionStatements = f.statements.filter(isCreateFunctionStatement);