@archlast/cli 0.1.4 → 0.1.6

package/README.md

@@ -6,6 +6,7 @@ CLI tool for Archlast development, deployment, and Docker lifecycle management.
 
 - Node.js 18+
 - Docker Desktop or Docker Engine
+- Bun 1.3+
 
 ## Installation
 
@@ -13,6 +14,16 @@ CLI tool for Archlast development, deployment, and Docker lifecycle management.
 npm install -g @archlast/cli
 ```
 
+On Windows, ensure Bun is on your PATH (the installer adds it, but terminals need a restart):
+
+```powershell
+[Environment]::SetEnvironmentVariable(
+  "Path",
+  "$env:Path;$env:USERPROFILE\\.bun\\bin",
+  "User"
+)
+```
+
 ## Quick start
 
 ```bash

package/dist/auth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"AAMA,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAcjF;AAED,qBAAa,uBAAwB,SAAQ,KAAK;;CAUjD;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAEzD;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAY9E;AAED,wBAAgB,cAAc,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,CA2C5D;AAED,wBAAgB,cAAc,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAK5E;AAED,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAQ9C;AAED,wBAAgB,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAOjD"}
+{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"AAMA,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAcjF;AAED,qBAAa,uBAAwB,SAAQ,KAAK;;CAUjD;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAEzD;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAY9E;AAED,wBAAgB,cAAc,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,CAuD5D;AAED,wBAAgB,cAAc,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAK5E;AAED,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAQ9C;AAED,wBAAgB,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAOjD"}

package/dist/cli.js

@@ -263846,7 +263846,7 @@ ${suffix}`;
 var require_SFTP = __commonJS((exports, module) => {
   var EventEmitter4 = __require("events");
   var fs7 = __require("fs");
-  var { constants } = fs7;
+  var { constants: constants2 } = fs7;
   var {
     Readable: ReadableStream,
     Writable: WritableStream
@@ -265606,25 +265606,25 @@ var require_SFTP = __commonJS((exports, module) => {
       this.extended = initial && initial.extended;
     }
     isDirectory() {
-      return (this.mode & constants.S_IFMT) === constants.S_IFDIR;
+      return (this.mode & constants2.S_IFMT) === constants2.S_IFDIR;
     }
     isFile() {
-      return (this.mode & constants.S_IFMT) === constants.S_IFREG;
+      return (this.mode & constants2.S_IFMT) === constants2.S_IFREG;
     }
     isBlockDevice() {
-      return (this.mode & constants.S_IFMT) === constants.S_IFBLK;
+      return (this.mode & constants2.S_IFMT) === constants2.S_IFBLK;
     }
     isCharacterDevice() {
-      return (this.mode & constants.S_IFMT) === constants.S_IFCHR;
+      return (this.mode & constants2.S_IFMT) === constants2.S_IFCHR;
     }
     isSymbolicLink() {
-      return (this.mode & constants.S_IFMT) === constants.S_IFLNK;
+      return (this.mode & constants2.S_IFMT) === constants2.S_IFLNK;
     }
     isFIFO() {
-      return (this.mode & constants.S_IFMT) === constants.S_IFIFO;
+      return (this.mode & constants2.S_IFMT) === constants2.S_IFIFO;
     }
     isSocket() {
-      return (this.mode & constants.S_IFMT) === constants.S_IFSOCK;
+      return (this.mode & constants2.S_IFMT) === constants2.S_IFSOCK;
     }
   }
   function attrsToBytes(attrs) {
@@ -272716,7 +272716,7 @@ var require_end_of_stream2 = __commonJS((exports, module) => {
 
 // ../../node_modules/.bun/tar-stream@2.2.0/node_modules/tar-stream/pack.js
 var require_pack = __commonJS((exports, module) => {
-  var constants = require_fs_constants();
+  var constants2 = require_fs_constants();
   var eos = require_end_of_stream2();
   var inherits = require_inherits();
   var alloc = Buffer.alloc;
@@ -272734,16 +272734,16 @@ var require_pack = __commonJS((exports, module) => {
       self2.push(END_OF_TAR.slice(0, 512 - size));
   };
   function modeToType(mode) {
-    switch (mode & constants.S_IFMT) {
-      case constants.S_IFBLK:
+    switch (mode & constants2.S_IFMT) {
+      case constants2.S_IFBLK:
         return "block-device";
-      case constants.S_IFCHR:
+      case constants2.S_IFCHR:
         return "character-device";
-      case constants.S_IFDIR:
+      case constants2.S_IFDIR:
         return "directory";
-      case constants.S_IFIFO:
+      case constants2.S_IFIFO:
         return "fifo";
-      case constants.S_IFLNK:
+      case constants2.S_IFLNK:
         return "symlink";
     }
     return "file";
@@ -314824,6 +314824,22 @@ async function generateDI(outputDir, injectables) {
 }
 
 // src/generator.ts
+async function readTextIfExists(filePath) {
+  const bun = globalThis.Bun;
+  if (bun?.file) {
+    const file = bun.file(filePath);
+    if (await file.exists()) {
+      return await file.text();
+    }
+    return null;
+  }
+  try {
+    await fs4.promises.access(filePath, fs4.constants.F_OK);
+    return await fs4.promises.readFile(filePath, "utf-8");
+  } catch {
+    return null;
+  }
+}
 function resolveImport(typeText, sourceFile) {
   return typeText.replace(/import\("([^"]+)"\)\./g, (match2, path6) => {
     if (path6.includes("packages/server/src/db/sqlite")) {
@@ -315328,20 +315344,24 @@ class TypeGenerator {
     const schemaIndexPath = join5(schemaFolderPath, "index.ts");
     let schemaContent = "";
     let schemaSource = "";
-    if (await Bun.file(schemaPath).exists()) {
-      schemaContent = await Bun.file(schemaPath).text();
+    const schemaFile = await readTextIfExists(schemaPath);
+    if (schemaFile !== null) {
+      schemaContent = schemaFile;
       schemaSource = "schema.ts";
       console.log(`Reading schema from ${schemaPath}`);
-    } else if (await Bun.file(schemaIndexPath).exists()) {
-      schemaContent = await Bun.file(schemaIndexPath).text();
-      schemaSource = "schema/index.ts";
-      console.log(`Reading schema from ${schemaIndexPath}`);
     } else {
-      const folderFiles = await this.scanSchemaFolder(schemaFolderPath);
-      schemaContent = folderFiles.map((f) => f.content).join(`
+      const schemaIndexFile = await readTextIfExists(schemaIndexPath);
+      if (schemaIndexFile !== null) {
+        schemaContent = schemaIndexFile;
+        schemaSource = "schema/index.ts";
+        console.log(`Reading schema from ${schemaIndexPath}`);
+      } else {
+        const folderFiles = await this.scanSchemaFolder(schemaFolderPath);
+        schemaContent = folderFiles.map((f) => f.content).join(`
 `);
-      schemaSource = "schema/*.ts";
-      console.log(`Reading schema from folder: ${schemaFolderPath}`);
+        schemaSource = "schema/*.ts";
+        console.log(`Reading schema from folder: ${schemaFolderPath}`);
+      }
     }
     const tableMatches = schemaContent.matchAll(/(?:export\s+(?:const|let)\s+)?(\w+)\s*(?::\s*\w+)?\s*[:=]\s*defineTable\s*\(\s*\{([\s\S]+?)\n\s*}(?:,\s*({[\s\S]+?\n\s*}))?\s*\)/g);
     const tables = {};
@@ -316599,14 +316619,14 @@ function extractFromEnv(content, varName) {
   return null;
 }
 function readAdminToken(archlastPath) {
-  const apiKey = process.env.ARCHLAST_API_KEY;
-  const validation = validateApiKey(apiKey || "");
-  if (!validation.valid) {
+  const envApiKey = process.env.ARCHLAST_API_KEY;
+  if (envApiKey) {
+    const validation = validateApiKey(envApiKey);
+    if (validation.valid) {
+      return envApiKey;
+    }
     throw new Error(validation.error || "Invalid API key");
   }
-  if (apiKey) {
-    return apiKey;
-  }
   const searchPaths = [];
   if (archlastPath) {
     searchPaths.push(path6.resolve(archlastPath, ".env.local"));
@@ -316616,11 +316636,16 @@ function readAdminToken(archlastPath) {
     searchPaths.push(path6.resolve(process.cwd(), ".env"));
     let currentDir = process.cwd();
     for (let i = 0;i < 5; i++) {
-      const repoArchlast = path6.join(currentDir, "apps", "archlast", ".env.local");
+      const repoArchlastLocal = path6.join(currentDir, "apps", "archlast", ".env.local");
+      const repoArchlast = path6.join(currentDir, "apps", "archlast", ".env");
+      if (fs5.existsSync(repoArchlastLocal)) {
+        searchPaths.push(repoArchlastLocal);
+      }
       if (fs5.existsSync(repoArchlast)) {
         searchPaths.push(repoArchlast);
-        break;
       }
+      if (searchPaths.length > 2)
+        break;
       const parent = path6.dirname(currentDir);
       if (parent === currentDir)
         break;
@@ -316632,7 +316657,11 @@ function readAdminToken(archlastPath) {
       const content = fs5.readFileSync(filePath, "utf-8");
       const key = extractFromEnv(content, "ARCHLAST_API_KEY");
       if (key) {
-        return key;
+        const validation = validateApiKey(key);
+        if (validation.valid) {
+          return key;
+        }
+        console.warn(`Warning: Invalid API key format in ${filePath}: ${validation.error}`);
       }
     }
   }
@@ -316717,9 +316746,9 @@ class CodeUploader {
       if (!response.ok) {
         if (response.status === 401) {
           const error = await response.text();
-          throw new Error(`Authentication failed: ${error || "Invalid admin token"}
+          throw new Error(`Authentication failed: ${error || "Invalid API key"}
 
-Please create a token in the dashboard (Settings → API Tokens) and update ARCHLAST_ADMIN_TOKEN in your .env file.`);
+Please create an API key in the admin dashboard (http://localhost:4001/dashboard/settings) and set ARCHLAST_API_KEY in your .env file.`);
         }
         const localFiles2 = await this.collectAllFiles();
         return {
@@ -316817,9 +316846,9 @@ Please create a token in the dashboard (Settings → API Tokens) and update ARCH
         if (response.status === 401) {
           return {
             success: false,
-            message: `Authentication failed: ${errorText || "Invalid admin token"}
+            message: `Authentication failed: ${errorText || "Invalid API key"}
 
-Please create a token in the dashboard (Settings → API Tokens) and update ARCHLAST_ADMIN_TOKEN in your .env file.`
+Please create an API key in the admin dashboard (http://localhost:4001/dashboard/settings) and set ARCHLAST_API_KEY in your .env file.`
           };
         }
         return { success: false, message: errorText };
@@ -322320,7 +322349,7 @@ async function configCommand(options) {
 
 // src/cli.ts
 var program2 = new Command;
-program2.name("archlast").description("Archlast CLI for development and deployment").version("0.1.4");
+program2.name("archlast").description("Archlast CLI for development and deployment").version("0.1.6");
 program2.command("build").description("Generate types without deploying").option("--path <path>", "Path to archlast folder", ".").action(buildCommand);
 program2.command("dev").description("Start development mode with file watching").option("-p, --port <port>", "Server port", "3001").option("--path <path>", "Path to archlast folder", ".").option("--server <url>", "Server URL for code upload", "http://localhost:4000").option("--max-poll <number>", "Maximum server polling retries", "30").action(devCommand);
 program2.command("deploy").description("Deploy to production").option("--path <path>", "Path to archlast folder", ".").option("--server <url>", "Server URL for code upload", "http://localhost:4000").option("--max-poll <number>", "Maximum server polling retries", "30").action(deployCommand);

package/dist/generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../src/generator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAmC5C,qBAAa,aAAa;IACtB,OAAO,CAAC,YAAY,CAAS;gBAEjB,YAAY,EAAE,MAAM;IAI1B,QAAQ,CAAC,QAAQ,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;YAiDzC,uBAAuB;YAgDvB,0BAA0B;IA6CxC,OAAO,CAAC,kBAAkB;IA6H1B,OAAO,CAAC,eAAe;IA+GvB,OAAO,CAAC,cAAc;IAiDtB,OAAO,CAAC,eAAe;YA6RT,2BAA2B;IAwPzC;;OAEG;YACW,gBAAgB;YAyBhB,gBAAgB;YAuDhB,gBAAgB;IAgF9B;;;OAGG;YACW,kBAAkB;YA2GlB,mBAAmB;IA0iBjC,OAAO,CAAC,mBAAmB;IAS3B;;;OAGG;IACG,oBAAoB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAoC/D;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAuBzB;;OAEG;IACH,2BAA2B,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IA2HtD;;OAEG;IACH,OAAO,CAAC,iBAAiB;CAkB5B"}
+{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../src/generator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAqD5C,qBAAa,aAAa;IACtB,OAAO,CAAC,YAAY,CAAS;gBAEjB,YAAY,EAAE,MAAM;IAI1B,QAAQ,CAAC,QAAQ,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;YAiDzC,uBAAuB;YAgDvB,0BAA0B;IA6CxC,OAAO,CAAC,kBAAkB;IA6H1B,OAAO,CAAC,eAAe;IA+GvB,OAAO,CAAC,cAAc;IAiDtB,OAAO,CAAC,eAAe;YA6RT,2BAA2B;IA4PzC;;OAEG;YACW,gBAAgB;YAyBhB,gBAAgB;YAuDhB,gBAAgB;IAgF9B;;;OAGG;YACW,kBAAkB;YA2GlB,mBAAmB;IA0iBjC,OAAO,CAAC,mBAAmB;IAS3B;;;OAGG;IACG,oBAAoB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAoC/D;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAuBzB;;OAEG;IACH,2BAA2B,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IA2HtD;;OAEG;IACH,OAAO,CAAC,iBAAiB;CAkB5B"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@archlast/cli",
-    "version": "0.1.4",
+    "version": "0.1.6",
     "description": "Archlast CLI for development and deployment",
     "type": "module",
     "main": "dist/index.js",
@@ -9,6 +9,7 @@
     },
     "files": [
         "dist",
+        "scripts",
         "README.md",
         "LICENSE"
     ],
@@ -23,6 +24,7 @@
         "format": "prettier --write \"**/*.{ts,tsx,js,jsx,json,md}\"",
         "format:check": "prettier --check \"**/*.{ts,tsx,js,jsx,json,md}\"",
         "prepublishOnly": "bun run build",
+        "postinstall": "node scripts/postinstall.js",
         "clean": "rm -rf dist"
     },
     "keywords": [

package/scripts/postinstall.js

@@ -0,0 +1,65 @@
+const { spawnSync } = require("child_process");
+const fs = require("fs");
+const path = require("path");
+
+function bunOnPath() {
+    try {
+        const result = spawnSync("bun", ["--version"], { stdio: "ignore" });
+        return result.status === 0;
+    } catch {
+        return false;
+    }
+}
+
+function getBunBin() {
+    const home = process.env.USERPROFILE || process.env.HOME;
+    if (!home) return null;
+    return path.join(home, ".bun", "bin");
+}
+
+function pathIncludes(pathValue, target) {
+    const normalizedTarget = target.trim().toLowerCase();
+    return pathValue
+        .split(";")
+        .map((entry) => entry.trim().toLowerCase())
+        .includes(normalizedTarget);
+}
+
+function ensureWindowsBunPath() {
+    if (process.platform !== "win32") return;
+
+    if (bunOnPath()) return;
+
+    const bunBin = getBunBin();
+    if (!bunBin || !fs.existsSync(bunBin)) {
+        console.log("[info] Bun not found. Install it from https://bun.sh/");
+        return;
+    }
+
+    const pathValue = process.env.Path || process.env.PATH || "";
+    if (pathIncludes(pathValue, bunBin)) return;
+
+    const command = `[Environment]::SetEnvironmentVariable('Path', "$env:Path;${bunBin}", 'User')`;
+    const result = spawnSync("powershell.exe", ["-NoProfile", "-Command", command], {
+        stdio: "ignore",
+    });
+
+    if (result.status === 0) {
+        console.log(`[ok] Added ${bunBin} to user PATH. Restart your terminal.`);
+    } else {
+        console.log("[warn] Could not update PATH automatically. Run:");
+        console.log(`[warn] ${command}`);
+    }
+}
+
+function run() {
+    ensureWindowsBunPath();
+}
+
+try {
+    run();
+} catch {
+    // Never fail the install.
+}
+
+process.exit(0);