@pmate/cli 0.24.40 → 0.24.42

package/dist/index.js

@@ -16398,10 +16398,13 @@ async function archiveMessageImages(rootDir, sourceKey, threadKey, messages2) {
   );
 }
 async function archiveMessageImage(rootDir, attachmentRoot, threadKey, imagePath) {
-  if (!imagePath || isExternalImageRef(imagePath) || imagePath.startsWith("attachments/")) {
+  if (!imagePath || isExternalImageRef(imagePath)) {
     return imagePath;
   }
   const normalized = import_node_path18.default.posix.normalize(imagePath.replace(/\\/g, "/"));
+  if (normalized.startsWith("attachments/")) {
+    return import_node_path18.default.join(rootDir, ...normalized.split("/"));
+  }
   if (normalized.startsWith("../") || import_node_path18.default.posix.isAbsolute(normalized)) {
     return imagePath;
   }
@@ -16411,7 +16414,7 @@ async function archiveMessageImage(rootDir, attachmentRoot, threadKey, imagePath
   try {
     await import_node_fs13.promises.mkdir(import_node_path18.default.dirname(destinationPath), { recursive: true });
     await import_node_fs13.promises.copyFile(sourcePath, destinationPath);
-    return destinationRelativePath;
+    return destinationPath;
   } catch {
     return imagePath;
   }
@@ -18928,7 +18931,7 @@ var ServiceRuntimeRunner = class {
     if (cwd) {
       return import_node_path24.default.resolve(process.cwd(), cwd);
     }
-    const repository = this.getType(service) === "vite" || this.getType(service) === "static" ? this.getSite(service).repository?.trim() : this.getType(service) === "fc" ? this.getFc(service).repository?.trim() : this.getType(service) === "ios" || this.getType(service) === "android" ? void 0 : this.getNetwork(service).repository?.trim();
+    const repository = this.getType(service) === "vite" || this.getType(service) === "static" ? this.getRepoStaticSite(service).repository.trim() : this.getType(service) === "fc" ? this.getFc(service).repository?.trim() : this.getType(service) === "ios" || this.getType(service) === "android" ? void 0 : this.getNetwork(service).repository?.trim();
     if (repository) {
       const repoName = repository.replace(/\/+$/, "").split("/").pop()?.replace(/\.git$/i, "");
       if (repoName) {
@@ -18947,13 +18950,14 @@ var ServiceRuntimeRunner = class {
   }
   resolveLocalDir(service, cwd) {
     const repoRoot = this.resolveRepoRoot(service, cwd);
-    const dir = this.getType(service) === "vite" || this.getType(service) === "static" ? this.getSite(service).dir?.trim() : this.getType(service) === "fc" ? this.getFc(service).dir?.trim() : this.getType(service) === "ios" || this.getType(service) === "android" ? void 0 : this.getNetwork(service).dir?.trim();
+    const dir = this.getType(service) === "vite" || this.getType(service) === "static" ? this.getRepoStaticSite(service).dir.trim() : this.getType(service) === "fc" ? this.getFc(service).dir?.trim() : this.getType(service) === "ios" || this.getType(service) === "android" ? void 0 : this.getNetwork(service).dir?.trim();
     if (!dir) {
       throw new Error(`Missing service dir for ${service.id}`);
     }
     return import_node_path24.default.resolve(repoRoot, dir);
   }
   async deployVite(service, options) {
+    this.assertDeployableStaticSite(service);
     const appDir = this.resolveLocalDir(service, options.cwd);
     const packageJsonPath = import_node_path24.default.join(appDir, "package.json");
     if (!(0, import_node_fs20.existsSync)(packageJsonPath)) {
@@ -18983,6 +18987,7 @@ var ServiceRuntimeRunner = class {
     await AliyunService.uploadDirectory(distDir, bucketName);
   }
   async deployStatic(service, options) {
+    this.assertDeployableStaticSite(service);
     const appDir = this.resolveLocalDir(service, options.cwd);
     const srcDir = import_node_path24.default.join(appDir, "src");
     if (!(0, import_node_fs20.existsSync)(srcDir)) {
@@ -19308,6 +19313,9 @@ var ServiceRuntimeRunner = class {
   }
   async initStaticLike(service) {
     const site = this.getSite(service);
+    if (site.exposeType === "managed-oss-cdn") {
+      throw new Error(`Service ${service.id} is managed-oss-cdn and cannot be initialized`);
+    }
     const bucketName = site.bucket?.trim();
     const baseDomain = site.domain?.trim();
     if (!bucketName) {
@@ -19324,6 +19332,19 @@ var ServiceRuntimeRunner = class {
       routeType: this.getType(service) === "vite" ? "spa" : "spa"
     });
   }
+  assertDeployableStaticSite(service) {
+    const site = this.getSite(service);
+    if (site.exposeType === "managed-oss-cdn") {
+      throw new Error(`Service ${service.id} is managed-oss-cdn and cannot be deployed`);
+    }
+  }
+  getRepoStaticSite(service) {
+    const site = this.getSite(service);
+    if (site.exposeType === "managed-oss-cdn") {
+      throw new Error(`Service ${service.id} is managed-oss-cdn and has no repository or dir`);
+    }
+    return site;
+  }
   async initServerApp(service, options, config) {
     const network = this.getNetwork(service);
     const subdomain = "subdomain" in network ? network.subdomain?.trim() : void 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pmate/cli",
-  "version": "0.24.40",
+  "version": "0.24.42",
   "description": "CLI utilities for the pMate project",
   "license": "MIT",
   "bin": {