tthr 0.0.53 → 0.0.54

package/dist/index.js

@@ -217,14 +217,16 @@ async function deployFunctionsToServer(projectId, token, functionsDir, environme
       console.log(chalk.dim(`
   Queries:`));
       for (const fn of queries) {
-        console.log(chalk.dim(`    - ${fn.name}`));
+        const argsInfo = fn.args ? chalk.green(" (has args)") : "";
+        console.log(chalk.dim(`    - ${fn.name}${argsInfo}`));
       }
     }
     if (mutations.length > 0) {
       console.log(chalk.dim(`
   Mutations:`));
       for (const fn of mutations) {
-        console.log(chalk.dim(`    - ${fn.name}`));
+        const argsInfo = fn.args ? chalk.green(" (has args)") : "";
+        console.log(chalk.dim(`    - ${fn.name}${argsInfo}`));
       }
     }
   } catch (error) {
@@ -317,7 +319,7 @@ function getColumnSqlType(type) {
 }
 function buildColumnSql(colName, def, forAlterTable = false) {
   const sqlType = getColumnSqlType(def.type);
-  let colSql = `${colName} ${sqlType}`;
+  let colSql = `"${colName}" ${sqlType}`;
   if (def.notNull && !forAlterTable) colSql += " NOT NULL";
   if (def.unique) colSql += " UNIQUE";
   if (def.hasDefault && def.type === "timestamp" && !forAlterTable) {
@@ -325,7 +327,7 @@ function buildColumnSql(colName, def, forAlterTable = false) {
   }
   if (def.references) {
     const [refTable, refCol] = def.references.split(".");
-    colSql += ` REFERENCES ${refTable}(${refCol})`;
+    colSql += ` REFERENCES "${refTable}"("${refCol || "_id"}")`;
   }
   return colSql;
 }
@@ -338,7 +340,7 @@ function generateSchemaSQL(tables) {
       columnDefs.push(buildColumnSql(colName, def));
     }
     statements.push(
-      `CREATE TABLE IF NOT EXISTS ${table.name} (
+      `CREATE TABLE IF NOT EXISTS "${table.name}" (
   ${columnDefs.join(",\n  ")}
 );`
     );
@@ -347,7 +349,7 @@ function generateSchemaSQL(tables) {
       const alterColSql = buildColumnSql(colName, def, true);
       statements.push(
         `-- Add column if missing (will error if exists, which is OK)
-ALTER TABLE ${table.name} ADD COLUMN ${alterColSql};`
+ALTER TABLE "${table.name}" ADD COLUMN ${alterColSql};`
       );
     }
   }
@@ -374,9 +376,25 @@ function parseFunctions(moduleName, source) {
     }
     const fnBody = source.slice(startIndex, endIndex);
     let args;
-    const argsMatch = fnBody.match(/args\s*:\s*(z\.object\s*\(\s*\{[\s\S]*?\}\s*\))/);
-    if (argsMatch) {
-      args = argsMatch[1];
+    const argsStartMatch = fnBody.match(/args\s*:\s*(z\.object\s*\(\s*\{)/);
+    if (argsStartMatch && argsStartMatch.index !== void 0) {
+      const argsStartIndex = argsStartMatch.index + argsStartMatch[0].length - 1;
+      let braceCount = 1;
+      let endIndex2 = argsStartIndex + 1;
+      for (let i = argsStartIndex + 1; i < fnBody.length && braceCount > 0; i++) {
+        const char = fnBody[i];
+        if (char === "{") braceCount++;
+        else if (char === "}") braceCount--;
+        endIndex2 = i;
+      }
+      let parenEndIndex = endIndex2 + 1;
+      while (parenEndIndex < fnBody.length && fnBody[parenEndIndex] !== ")") {
+        parenEndIndex++;
+      }
+      const objectStart = fnBody.indexOf("z.object", argsStartMatch.index);
+      if (objectStart !== -1) {
+        args = fnBody.slice(objectStart, parenEndIndex + 1);
+      }
     }
     functions.push({
       name: `${moduleName}.${fnName}`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tthr",
-  "version": "0.0.53",
+  "version": "0.0.54",
   "description": "Tether CLI - project scaffolding and deployment",
   "type": "module",
   "bin": {