@within-7/jetr 0.1.1 → 0.2.0

package/README.md

@@ -133,7 +133,9 @@ Config is stored at `~/.jetr/config.json`:
 
 ```json
 {
-  "apiUrl": "https://jetr-api.lixilei.workers.dev",
+  "apiUrl": "https://your-jetr-api.workers.dev",
   "token": "eyJhbG..."
 }
 ```
+
+Override API URL with `jetr login <token> --api-url <url>`.

package/dist/cli.js

@@ -128,34 +128,149 @@ var api = {
 
 // src/deploy.ts
 import { createHash } from "crypto";
-import { readFileSync as readFileSync2, statSync } from "fs";
-import { resolve, join as join2, posix } from "path";
+import { readFileSync as readFileSync3, statSync } from "fs";
+import { resolve, join as join3, posix } from "path";
 import { glob } from "glob";
+
+// src/ignore.ts
+import ignore from "ignore";
+import { existsSync as existsSync2, readFileSync as readFileSync2, writeFileSync as writeFileSync2 } from "fs";
+import { join as join2 } from "path";
+var DEFAULT_JETRIGNORE = `# Dependencies
+node_modules/
+.pnp
+.pnp.js
+
+# Build outputs
+dist/
+build/
+out/
+.next/
+.nuxt/
+.output/
+.cache/
+
+# Logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+
+# Environment
+.env
+.env.*
+.env.local
+.env.*.local
+
+# IDE & Editor
+.vscode/
+.idea/
+*.swp
+*.swo
+*~
+.project
+.classpath
+.settings/
+
+# OS files
+.DS_Store
+Thumbs.db
+desktop.ini
+
+# Git
+.git/
+.gitignore
+
+# Testing
+coverage/
+.nyc_output/
+
+# Package managers
+package-lock.json
+yarn.lock
+pnpm-lock.yaml
+
+# Misc
+*.zip
+*.tar.gz
+`;
+var ALWAYS_IGNORE = [".jetrignore", ".jetrkeep", ".jetrrc"];
+function loadIgnore(dir) {
+  const ig = ignore();
+  ig.add(ALWAYS_IGNORE);
+  const ignorePath = join2(dir, ".jetrignore");
+  if (existsSync2(ignorePath)) {
+    const content = readFileSync2(ignorePath, "utf-8");
+    ig.add(content);
+  } else {
+    ig.add(DEFAULT_JETRIGNORE);
+  }
+  return ig;
+}
+function loadKeep(dir) {
+  const keepPath = join2(dir, ".jetrkeep");
+  if (!existsSync2(keepPath)) return null;
+  const keep = ignore();
+  keep.add(readFileSync2(keepPath, "utf-8"));
+  return keep;
+}
+function shouldInclude(relativePath, ig, keep) {
+  if (ig.ignores(relativePath) || ig.ignores(relativePath + "/")) {
+    if (keep && keep.ignores(relativePath)) {
+      return true;
+    }
+    return false;
+  }
+  return true;
+}
+function createJetrignore(dir) {
+  const ignorePath = join2(dir, ".jetrignore");
+  if (existsSync2(ignorePath)) return false;
+  writeFileSync2(ignorePath, DEFAULT_JETRIGNORE);
+  return true;
+}
+
+// src/deploy.ts
 function hashFile(filePath) {
-  const content = readFileSync2(filePath);
+  const content = readFileSync3(filePath);
   const hash = createHash("sha256").update(content).digest("hex");
   return `sha256:${hash}`;
 }
 async function deploy(siteName, directory, onProgress) {
   const absDir = resolve(directory);
+  const ig = loadIgnore(absDir);
+  const keep = loadKeep(absDir);
   onProgress?.("Scanning files...");
-  const filePaths = await glob("**/*", {
+  const allFiles = await glob("**/*", {
     cwd: absDir,
     nodir: true,
-    dot: false
+    dot: true
   });
+  let ignoredCount = 0;
+  const filePaths = [];
+  for (const fp of allFiles) {
+    const normalizedPath = fp.split("/").join(posix.sep);
+    if (shouldInclude(normalizedPath, ig, keep)) {
+      filePaths.push(fp);
+    } else {
+      ignoredCount++;
+    }
+  }
   if (filePaths.length === 0) {
-    throw new Error(`No files found in ${directory}`);
+    throw new Error(
+      `No files to deploy in ${directory} (${allFiles.length} files found, all ignored)`
+    );
   }
+  onProgress?.(`Found ${filePaths.length} files (${ignoredCount} ignored)`);
   const manifest = {};
   for (const fp of filePaths) {
-    const absPath = join2(absDir, fp);
+    const absPath = join3(absDir, fp);
     const hash = hashFile(absPath);
     const size = statSync(absPath).size;
     const normalizedPath = fp.split("/").join(posix.sep);
     manifest[normalizedPath] = { hash, size };
   }
-  onProgress?.(`Found ${filePaths.length} files`);
   onProgress?.("Computing diff...");
   const diff = await api.deployDiff(siteName, manifest);
   onProgress?.(
@@ -164,8 +279,8 @@ async function deploy(siteName, directory, onProgress) {
   if (diff.upload.length > 0) {
     for (let i = 0; i < diff.upload.length; i++) {
       const fp = diff.upload[i];
-      const absPath = join2(absDir, fp);
-      const content = readFileSync2(absPath);
+      const absPath = join3(absDir, fp);
+      const content = readFileSync3(absPath);
       onProgress?.(`Uploading (${i + 1}/${diff.upload.length}) ${fp}`);
       await api.uploadFile(siteName, fp, content, diff.deploy_id, manifest[fp].hash);
     }
@@ -177,13 +292,14 @@ async function deploy(siteName, directory, onProgress) {
     filesUploaded: result.files_uploaded,
     filesDeleted: result.files_deleted,
     filesUnchanged: diff.unchanged.length,
+    filesIgnored: ignoredCount,
     totalSize: result.total_size
   };
 }
 
 // src/cli.ts
 var program = new Command();
-program.name("jetr").description("CLI for Jetr static site hosting").version("0.1.0");
+program.name("jetr").description("CLI for Jetr static site hosting").version("0.2.0");
 program.command("login").description("Save JWT token for authentication").argument("<token>", "JWT token from auth-gateway login").option("--api-url <url>", "API base URL").action((token, opts) => {
   saveConfig({ token, ...opts.apiUrl ? { apiUrl: opts.apiUrl } : {} });
   console.log(chalk.green("\u2713 Token saved to ~/.jetr/config.json"));
@@ -193,6 +309,15 @@ program.command("whoami").description("Show current config").action(() => {
   console.log(`API:   ${config.apiUrl}`);
   console.log(`Token: ${config.token ? config.token.slice(0, 20) + "..." : chalk.red("not set")}`);
 });
+program.command("init").description("Create a .jetrignore file with default patterns").argument("[directory]", "Target directory", ".").action(async (directory) => {
+  const { resolve: resolve2 } = await import("path");
+  const created = createJetrignore(resolve2(directory));
+  if (created) {
+    console.log(chalk.green("\u2713 Created .jetrignore with default patterns"));
+  } else {
+    console.log(chalk.yellow(".jetrignore already exists"));
+  }
+});
 program.command("create").description("Create a new site").argument("<name>", "Site name (becomes {name}.jetr.within-7.com)").option("-p, --password <password>", "Set access password").option("-e, --expires <seconds>", "Expire after N seconds", parseInt).action(async (name, opts) => {
   const spinner = ora("Creating site...").start();
   try {
@@ -220,6 +345,7 @@ program.command("deploy").description("Deploy a directory to a site").argument("
     console.log(`  Uploaded:  ${result.filesUploaded} files`);
     if (result.filesDeleted > 0) console.log(`  Deleted:   ${result.filesDeleted} files`);
     if (result.filesUnchanged > 0) console.log(`  Unchanged: ${result.filesUnchanged} files`);
+    if (result.filesIgnored > 0) console.log(`  Ignored:   ${chalk.dim(`${result.filesIgnored} files`)}`);
     console.log(`  Size:      ${formatBytes(result.totalSize)}`);
   } catch (e) {
     spinner.fail(e.message);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@within-7/jetr",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "CLI for Jetr static site hosting",
   "type": "module",
   "bin": {
@@ -16,7 +16,8 @@
     "commander": "^13",
     "chalk": "^5",
     "ora": "^8",
-    "glob": "^11"
+    "glob": "^11",
+    "ignore": "^6"
   },
   "devDependencies": {
     "tsup": "^8",