tthr 0.3.1 → 0.3.3

package/dist/index.js

@@ -11,10 +11,13 @@ import {
   requireAuth,
   resolvePath,
   saveCredentials
-} from "./chunk-HNRJ3DYB.js";
+} from "./chunk-QUS263RB.js";
 
 // src/index.ts
 import { Command } from "commander";
+import fs8 from "fs-extra";
+import { fileURLToPath } from "url";
+import path8 from "path";
 
 // src/commands/init.ts
 import chalk2 from "chalk";
@@ -111,6 +114,12 @@ async function deploySchemaToServer(projectId, token, schemaPath, environment, d
     const schemaUrl = `${API_URL2}/projects/${projectId}/env/${environment}/deploy/schema`;
     console.log(chalk.dim(`
   URL: ${schemaUrl}`));
+    const rlsConfigs = tables.filter((t) => t.rls).map((t) => ({
+      tableName: t.name,
+      enabled: t.rls.enabled,
+      defaultDeny: t.rls.defaultDeny ?? true,
+      policies: t.rls.policies
+    }));
     const requestBody = {
       sql,
       tables: tables.map((t) => ({
@@ -119,6 +128,9 @@ async function deploySchemaToServer(projectId, token, schemaPath, environment, d
         columns: t.columns
       }))
     };
+    if (rlsConfigs.length > 0) {
+      requestBody.rls = rlsConfigs;
+    }
     const response = await fetch(schemaUrl, {
       method: "POST",
       headers: {
@@ -277,10 +289,11 @@ function parseSchema(source) {
   if (!schemaMatch) return tables;
   const schemaContent = schemaMatch[1];
   const schemaStartIndex = source.indexOf(schemaMatch[0]) + "defineSchema({".length;
-  const tableStartRegex = /(\w+)\s*:\s*\{/g;
+  const tableStartRegex = /(\w+)\s*:\s*(?:defineTable\s*\(\s*)?\{/g;
   let match;
   while ((match = tableStartRegex.exec(schemaContent)) !== null) {
     const tableName = match[1];
+    const isDefineTable = match[0].includes("defineTable");
     const startOffset = match.index + match[0].length;
     let braceCount = 1;
     let endOffset = startOffset;
@@ -290,7 +303,28 @@ function parseSchema(source) {
       else if (char === "}") braceCount--;
       endOffset = i;
     }
-    const columnsContent = schemaContent.slice(startOffset, endOffset);
+    let rawContent = schemaContent.slice(startOffset, endOffset);
+    let rlsConfig;
+    let columnsContent;
+    if (isDefineTable) {
+      const columnsBlockMatch = rawContent.match(/columns\s*:\s*\{/);
+      if (columnsBlockMatch) {
+        const colStart = rawContent.indexOf(columnsBlockMatch[0]) + columnsBlockMatch[0].length;
+        let colBraceCount = 1;
+        let colEnd = colStart;
+        for (let i = colStart; i < rawContent.length && colBraceCount > 0; i++) {
+          if (rawContent[i] === "{") colBraceCount++;
+          else if (rawContent[i] === "}") colBraceCount--;
+          colEnd = i;
+        }
+        columnsContent = rawContent.slice(colStart, colEnd);
+      } else {
+        columnsContent = rawContent;
+      }
+      rlsConfig = parseRlsConfig(rawContent);
+    } else {
+      columnsContent = rawContent;
+    }
     const lines = columnsContent.split("\n");
     const nonEmptyLines = lines.filter((line) => line.trim().length > 0);
     const minIndent = nonEmptyLines.reduce((min, line) => {
@@ -334,10 +368,74 @@ function parseSchema(source) {
         oneOf
       };
     }
-    tables.push({ name: tableName, columns, source: tableSource });
+    tables.push({ name: tableName, columns, source: tableSource, rls: rlsConfig });
   }
   return tables;
 }
+function parseRlsConfig(content) {
+  const rlsMatch = content.match(/rls\s*:\s*\{/);
+  if (!rlsMatch) return void 0;
+  const rlsStart = content.indexOf(rlsMatch[0]) + rlsMatch[0].length;
+  let braceCount = 1;
+  let rlsEnd = rlsStart;
+  for (let i = rlsStart; i < content.length && braceCount > 0; i++) {
+    if (content[i] === "{") braceCount++;
+    else if (content[i] === "}") braceCount--;
+    rlsEnd = i;
+  }
+  const rlsContent = content.slice(rlsStart, rlsEnd);
+  const enabledMatch = rlsContent.match(/enabled\s*:\s*(true|false)/);
+  const enabled = enabledMatch ? enabledMatch[1] === "true" : false;
+  const defaultDenyMatch = rlsContent.match(/defaultDeny\s*:\s*(true|false)/);
+  const defaultDeny = defaultDenyMatch ? defaultDenyMatch[1] === "true" : true;
+  const policies = [];
+  const policiesMatch = rlsContent.match(/policies\s*:\s*\[/);
+  if (policiesMatch) {
+    const pStart = rlsContent.indexOf(policiesMatch[0]) + policiesMatch[0].length;
+    let bracketCount = 1;
+    let pEnd = pStart;
+    for (let i = pStart; i < rlsContent.length && bracketCount > 0; i++) {
+      if (rlsContent[i] === "[") bracketCount++;
+      else if (rlsContent[i] === "]") bracketCount--;
+      pEnd = i;
+    }
+    const policiesContent = rlsContent.slice(pStart, pEnd);
+    const policyRegex = /\{([^}]*(?:\{[^}]*\}[^}]*)*)\}/g;
+    let policyMatch;
+    while ((policyMatch = policyRegex.exec(policiesContent)) !== null) {
+      const pBody = policyMatch[1];
+      const name = pBody.match(/name\s*:\s*['"]([^'"]+)['"]/)?.[1];
+      const operation = pBody.match(/operation\s*:\s*['"]([^'"]+)['"]/)?.[1];
+      const role = pBody.match(/role\s*:\s*['"]([^'"]+)['"]/)?.[1];
+      if (!name || !operation) continue;
+      const usingExpr = extractJsonExpression(pBody, "using");
+      const checkExpr = extractJsonExpression(pBody, "check");
+      policies.push({ name, operation, using: usingExpr, check: checkExpr, role });
+    }
+  }
+  if (!enabled && policies.length === 0) return void 0;
+  return { enabled, defaultDeny, policies };
+}
+function extractJsonExpression(text, key) {
+  const keyRegex = new RegExp(`${key}\\s*:\\s*\\{`);
+  const keyMatch = text.match(keyRegex);
+  if (!keyMatch) return void 0;
+  const start = text.indexOf(keyMatch[0]) + keyMatch[0].length;
+  let braceCount = 1;
+  let end = start;
+  for (let i = start; i < text.length && braceCount > 0; i++) {
+    if (text[i] === "{") braceCount++;
+    else if (text[i] === "}") braceCount--;
+    end = i;
+  }
+  const raw = "{" + text.slice(start, end) + "}";
+  try {
+    const jsonStr = raw.replace(/(\w+)\s*:/g, '"$1":').replace(/'/g, '"').replace(/,\s*([}\]])/g, "$1").replace(/"(\$\w+(?:\.\w+)?)"/g, '"$1"');
+    return JSON.parse(jsonStr);
+  } catch {
+    return void 0;
+  }
+}
 function getColumnSqlType(type) {
   switch (type) {
     case "text":
@@ -1586,7 +1684,7 @@ async function runGenerate(spinner) {
   }
   isGenerating = true;
   try {
-    const { generateTypes: generateTypes2 } = await import("./generate-O66KTG5U.js");
+    const { generateTypes: generateTypes2 } = await import("./generate-CQIJJTKG.js");
     spinner.text = "Regenerating types...";
     await generateTypes2({ silent: true });
     spinner.succeed("Types regenerated");
@@ -1806,7 +1904,7 @@ async function devCommand(options) {
       }
     }
     spinner.text = "Generating types...";
-    const { generateTypes: generateTypes2 } = await import("./generate-O66KTG5U.js");
+    const { generateTypes: generateTypes2 } = await import("./generate-CQIJJTKG.js");
     await generateTypes2({ silent: true });
     spinner.succeed("Types generated");
     if (config.projectId) {
@@ -2141,12 +2239,12 @@ async function updateCommand(options) {
   const deps = packageJson.dependencies || {};
   const devDeps = packageJson.devDependencies || {};
   const installedDeps = [];
-  for (const pkg of TETHER_PACKAGES) {
-    if (deps[pkg] && !deps[pkg].startsWith("workspace:")) {
-      installedDeps.push({ name: pkg, current: deps[pkg], isDev: false });
+  for (const pkg2 of TETHER_PACKAGES) {
+    if (deps[pkg2] && !deps[pkg2].startsWith("workspace:")) {
+      installedDeps.push({ name: pkg2, current: deps[pkg2], isDev: false });
     }
-    if (devDeps[pkg] && !devDeps[pkg].startsWith("workspace:")) {
-      installedDeps.push({ name: pkg, current: devDeps[pkg], isDev: true });
+    if (devDeps[pkg2] && !devDeps[pkg2].startsWith("workspace:")) {
+      installedDeps.push({ name: pkg2, current: devDeps[pkg2], isDev: true });
     }
   }
   if (installedDeps.length === 0) {
@@ -2158,19 +2256,19 @@ async function updateCommand(options) {
 `));
   const spinner = ora5("Checking for updates...").start();
   const packagesToUpdate = [];
-  for (const pkg of installedDeps) {
-    const latestVersion = await getLatestVersion2(pkg.name);
+  for (const pkg2 of installedDeps) {
+    const latestVersion = await getLatestVersion2(pkg2.name);
     if (latestVersion) {
-      const currentClean = pkg.current.replace(/^[\^~>=<]+/, "");
+      const currentClean = pkg2.current.replace(/^[\^~>=<]+/, "");
       if (currentClean !== latestVersion) {
         packagesToUpdate.push({
-          name: pkg.name,
+          name: pkg2.name,
           current: currentClean,
           latest: latestVersion,
-          isDev: pkg.isDev
+          isDev: pkg2.isDev
         });
       } else {
-        console.log(chalk5.dim(`  ${pkg.name}@${currentClean} (up to date)`));
+        console.log(chalk5.dim(`  ${pkg2.name}@${currentClean} (up to date)`));
       }
     }
   }
@@ -2180,9 +2278,9 @@ async function updateCommand(options) {
     return;
   }
   console.log(chalk5.cyan("\n  Updates available:\n"));
-  for (const pkg of packagesToUpdate) {
+  for (const pkg2 of packagesToUpdate) {
     console.log(
-      chalk5.white(`  ${pkg.name}`) + chalk5.red(` ${pkg.current}`) + chalk5.dim(" \u2192 ") + chalk5.green(`${pkg.latest}`) + (pkg.isDev ? chalk5.dim(" (dev)") : "")
+      chalk5.white(`  ${pkg2.name}`) + chalk5.red(` ${pkg2.current}`) + chalk5.dim(" \u2192 ") + chalk5.green(`${pkg2.latest}`) + (pkg2.isDev ? chalk5.dim(" (dev)") : "")
     );
   }
   if (options.dryRun) {
@@ -2601,8 +2699,11 @@ function askConfirmation(prompt) {
 }
 
 // src/index.ts
+var __filename = fileURLToPath(import.meta.url);
+var __dirname = path8.dirname(__filename);
+var pkg = fs8.readJsonSync(path8.resolve(__dirname, "../package.json"));
 var program = new Command();
-program.name("tthr").description("Tether CLI - Realtime SQLite for modern applications").version("0.0.1").enablePositionalOptions();
+program.name("tthr").description("Tether CLI - Realtime SQLite for modern applications").version(pkg.version).enablePositionalOptions();
 program.command("init [name]").description("Create a new Tether project").option("-t, --template <template>", "Project template (vue, svelte, react, vanilla)", "vue").action(initCommand);
 program.command("dev").description("Start local development server with hot reload").option("-p, --port <port>", "Port to run on").option("-e, --env <environment>", "Target environment (default: development)").option("--local", "Run fully local (do not connect to cloud)").option("--skip-framework", "Only run Tether watchers, skip framework dev server").allowUnknownOption().passThroughOptions().action((options, command) => {
   const extraArgs = command.args || [];

package/package.json

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