fixes

Author: crowlKats

config.ts

@@ -6,11 +6,7 @@ import {
   promptSelect,
 } from "@std/cli/unstable-prompt-select";
 import { fromFileUrl, join, resolve } from "@std/path";
-import {
-  applyEdits as applyJSONCEdits,
-  modify as modifyJSONC,
-  parse as parseJSONC,
-} from "jsonc-parser";
+import { parse as parseJSONC } from "@david/jsonc-morph";
 import { resolve_config } from "./lib/rs_lib.js";
 import { ValidationError } from "@cliffy/command";
 import { createFlow } from "./deploy/create/flow.ts";
@@ -250,7 +246,7 @@ async function readConfig(
   );
 
   if (config.path) {
-    const path = fromFileUrl(config.config);
+    const path = fromFileUrl(config.path);
     const content = await Deno.readTextFile(path);
     return { config: { path, content }, files: config.files };
   }
@@ -263,14 +259,12 @@ function getAppFromConfig(
 ): { org: undefined | string; app: undefined | string; files: string[] } {
   if (configContent.config) {
     const config = parseJSONC(configContent.config.content);
-    if (
-      typeof config === "object" && config !== null && "deploy" in config &&
-      typeof config.deploy === "object" && config.deploy !== null &&
-      !Array.isArray(config.deploy)
-    ) {
+    const deployObj = config.asObject()?.getIfObject("deploy");
+
+    if (deployObj) {
       return {
-        org: config.deploy.org,
-        app: config.deploy.app,
+        org: deployObj.get("org")?.value()?.asString(),
+        app: deployObj.get("app")?.value()?.asString(),
         files: configContent.files,
       };
     }
@@ -299,19 +293,17 @@ async function writeConfig(
     newConfig.app = app;
   }
 
-  const edits = modifyJSONC(content, ["deploy"], newConfig, {
-    formattingOptions: {
-      insertSpaces: true,
-      tabSize: 2,
-    },
-  });
-  const out = applyJSONCEdits(content, edits);
+  const config = parseJSONC(content);
+  const deployObj = config.asObjectOrForce().getIfObjectOrForce("deploy");
+  deployObj.replaceWith(newConfig);
+  deployObj.ensureMultiline();
+
   await Deno.writeTextFile(
     configContent.config?.path ?? join(Deno.cwd(), "deno.jsonc"),
-    out,
+    config.toString() + "\n",
   );
 
-  if (!configContent) {
+  if (!configContent.config) {
     console.log(
       `Created configuration file at '${join(Deno.cwd(), "deno.jsonc")}'`,
     );

deno.json

@@ -16,6 +16,7 @@
   "exports": "./main.ts",
   "imports": {
     "@cliffy/command": "jsr:@cliffy/command@^1.0.0",
+    "@david/jsonc-morph": "jsr:@david/jsonc-morph@^0.3.1",
     "@deno/sandbox": "jsr:@deno/sandbox@^0.10.0",
     "@std/assert": "jsr:@std/assert@^1.0.16",
     "@std/async": "jsr:@std/async@^1.1.0",
@@ -24,15 +25,13 @@
     "@std/encoding": "jsr:@std/encoding@^1.0.10",
     "@std/fmt": "jsr:@std/fmt@^1.0.8",
     "@std/fs": "jsr:@std/fs@^1.0.19",
-    "@std/jsonc": "jsr:@std/jsonc@^1.0.2",
     "@std/path": "jsr:@std/path@^1.1.2",
     "@std/semver": "jsr:@std/semver@^1.0.8",
     "@std/tar": "jsr:@std/tar@^0.1.9",
     "@trpc/client": "npm:@trpc/client@^11.0.2",
     "@trpc/server": "npm:@trpc/server@^11.0.2",
     "@types/prompts": "npm:@types/prompts@2.4.9",
     "event-source-polyfill": "npm:event-source-polyfill@^1.0.31",
-    "jsonc-parser": "npm:jsonc-parser@^3.3.1",
     "open": "npm:open@^10.1.0",
     "superjson": "npm:superjson@^2.2.2",
     "@deno/framework-detect": "jsr:@deno/framework-detect@^0.3",

deno.lock

@@ -228,15 +228,17 @@ deploy your local directory to the specified application.`)
           rootPath,
         );
 
-        await publish(
-          options,
-          config,
-          rootPath,
-          org,
-          app,
-          options.prod ?? created,
-          options.wait ?? true,
-        );
+        if (!created) {
+          await publish(
+            options,
+            config,
+            rootPath,
+            org,
+            app,
+            options.prod ?? false,
+            options.wait ?? true,
+          );
+        }
       },
       (rootPath) => rootPath,
     ),

deploy/mod.ts

@@ -59,7 +59,7 @@ fn inner_resolve_config(
           .append(exclude.into_path_or_patterns().into_iter());
       }
 
-      let files = collect_files(&real_sys, config.files, allow_node_modules);
+      let files = collect_files(&real_sys, root_path, config.files, allow_node_modules);
 
       return Ok(ConfigLookup {
         path: Some(deno_json.specifier.to_string()),
@@ -77,7 +77,7 @@ fn inner_resolve_config(
           .append(exclude.into_path_or_patterns().into_iter());
       }
 
-      let files = collect_files(&real_sys, files_config, allow_node_modules);
+      let files = collect_files(&real_sys, root_path, files_config, allow_node_modules);
       return Ok(ConfigLookup {
         path: Some(deno_json.specifier.to_string()),
         files,
@@ -87,16 +87,19 @@ fn inner_resolve_config(
 
   Ok(ConfigLookup {
     path: None,
-    files: collect_files(&real_sys, FilePatterns::new_with_base(root_path), allow_node_modules),
+    files: collect_files(&real_sys, root_path.clone(), FilePatterns::new_with_base(root_path), allow_node_modules),
   })
 }
 
 fn collect_files(
   real_sys: &sys_traits::impls::RealSys,
+  root_path: PathBuf,
   files: FilePatterns,
   allow_node_modules: bool,
 ) -> Vec<String> {
-  let mut collector = FileCollector::new(|_| true)
+  let mut collector = FileCollector::new(|entry| {
+    entry.path.starts_with(&root_path)
+  })
     .ignore_git_folder()
     .use_gitignore();