forge-fsql 1.0.2 → 1.0.3

package/bin/setup

@@ -6,7 +6,7 @@ import { createRequire } from "module";
 
 // Support both ESM and CJS imports for js-yaml
 const require = createRequire(import.meta.url);
-const yaml = require("js-yaml");
+const YAML = require("yaml");
 
 const projectRoot = process.cwd();
 
@@ -67,45 +67,70 @@ if (!fs.existsSync(manifestPath)) {
   process.exit(1);
 }
 
-let manifest;
+let doc;
 try {
   const fileContents = fs.readFileSync(manifestPath, "utf8");
-  manifest = yaml.load(fileContents);
+  doc = YAML.parseDocument(fileContents);
 } catch (e) {
   console.error("Error reading manifest:", e);
   process.exit(1);
 }
 
-if (!manifest.modules) {
-  manifest.modules = {};
+if (!doc.contents) {
+  doc.contents = doc.createNode({});
 }
 
+if (!doc.has("modules")) {
+  doc.set("modules", doc.createNode({}));
+}
+
+const modules = doc.get("modules");
+
 // Ensure function is an array
 const functionKey = "executeSql";
-if (!manifest.modules.function) {
-  manifest.modules.function = [];
-} else if (!Array.isArray(manifest.modules.function)) {
-  // Handle case where it might be a map (unlikely in Forge but just in case)
-  manifest.modules.function = Object.entries(manifest.modules.function).map(
-    ([key, val]) => ({ key, ...val }),
+if (!modules.has("function")) {
+  modules.set("function", doc.createNode([]));
+}
+
+let functions = modules.get("function");
+
+// If it's somehow not a sequence, convert it (though unlikely in Forge)
+if (!YAML.isSeq(functions)) {
+  const obj = functions.toJSON();
+  functions = doc.createNode(
+    Object.entries(obj).map(([key, val]) => ({ key, ...val })),
   );
+  modules.set("function", functions);
 }
 
-const functionExists = manifest.modules.function.find(
-  (f) => f.key === functionKey,
-);
 const handlerName = "fsql.executeSql";
+let functionExists = functions.items.find((f) => {
+  const js = f.toJSON();
+  return js && js.key === functionKey;
+});
 
 if (!functionExists) {
-  manifest.modules.function.push({
-    key: functionKey,
-    handler: handlerName,
-  });
+  functions.add(
+    doc.createNode({
+      key: functionKey,
+      handler: handlerName,
+    }),
+  );
   console.log(
     `✓ Added function:${functionKey} with handler ${handlerName} to manifest`,
   );
 } else {
-  functionExists.handler = handlerName;
+  // If it's a Pair (map item) or just a Map in the sequence
+  if (YAML.isMap(functionExists)) {
+    functionExists.set("handler", handlerName);
+  } else {
+    // Should not happen with doc.createNode above, but for safety:
+    const idx = functions.items.indexOf(functionExists);
+    functions.set(
+      idx,
+      doc.createNode({ key: functionKey, handler: handlerName }),
+    );
+  }
   console.log(
     `✓ Updated function:${functionKey} handler to ${handlerName} in manifest`,
   );
@@ -113,38 +138,49 @@ if (!functionExists) {
 
 // Ensure webtrigger is an array
 const webtriggerKey = "execute-sql";
-if (!manifest.modules.webtrigger) {
-  manifest.modules.webtrigger = [];
-} else if (!Array.isArray(manifest.modules.webtrigger)) {
-  manifest.modules.webtrigger = Object.entries(manifest.modules.webtrigger).map(
-    ([key, val]) => ({ key, ...val }),
+if (!modules.has("webtrigger")) {
+  modules.set("webtrigger", doc.createNode([]));
+}
+
+let webtriggers = modules.get("webtrigger");
+if (!YAML.isSeq(webtriggers)) {
+  const obj = webtriggers.toJSON();
+  webtriggers = doc.createNode(
+    Object.entries(obj).map(([key, val]) => ({ key, ...val })),
   );
+  modules.set("webtrigger", webtriggers);
 }
 
-const webtriggerExists = manifest.modules.webtrigger.find(
-  (w) => w.key === webtriggerKey,
-);
+let webtriggerExists = webtriggers.items.find((w) => {
+  const js = w.toJSON();
+  return js && js.key === webtriggerKey;
+});
+
 if (!webtriggerExists) {
-  manifest.modules.webtrigger.push({
-    key: webtriggerKey,
-    function: functionKey,
-  });
+  webtriggers.add(
+    doc.createNode({
+      key: webtriggerKey,
+      function: functionKey,
+    }),
+  );
   console.log(`✓ Added webtrigger:${webtriggerKey} to manifest`);
 } else {
-  webtriggerExists.function = functionKey;
+  if (YAML.isMap(webtriggerExists)) {
+    webtriggerExists.set("function", functionKey);
+  } else {
+    const idx = webtriggers.items.indexOf(webtriggerExists);
+    webtriggers.set(
+      idx,
+      doc.createNode({ key: webtriggerKey, function: functionKey }),
+    );
+  }
   console.log(
     `✓ Ensured webtrigger:${webtriggerKey} points to function ${functionKey}`,
   );
 }
 
 try {
-  // Use a large enough lineWidth to prevent wrapping which can break Forge parsing sometimes
-  const newYaml = yaml.dump(manifest, {
-    indent: 2,
-    lineWidth: -1,
-    noRefs: true,
-  });
-  fs.writeFileSync(manifestPath, newYaml);
+  fs.writeFileSync(manifestPath, doc.toString());
   console.log("✓ Updated manifest file successfully");
 } catch (e) {
   console.error("Error writing manifest:", e);

package/dist/cjs/client.js

@@ -1,10 +1,6 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ForgeClient = void 0;
-const node_fetch_1 = __importDefault(require("node-fetch"));
 class ForgeClient {
     constructor(config) {
         this.config = {
@@ -22,7 +18,7 @@ class ForgeClient {
             const headers = {
                 "Content-Type": "application/json",
             };
-            const response = await (0, node_fetch_1.default)(this.config.url, {
+            const response = await fetch(this.config.url, {
                 method: "POST",
                 headers,
                 body: JSON.stringify({ query: finalSql }),

package/dist/client.js

@@ -1,4 +1,3 @@
-import fetch from "node-fetch";
 export class ForgeClient {
     constructor(config) {
         this.config = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "forge-fsql",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "type": "module",
   "description": "Interactive SQL CLI for Atlassian Forge SQL via web triggers",
   "main": "dist/cjs/index.js",
@@ -41,12 +41,11 @@
     "chalk": "^5.4.1",
     "cli-table3": "^0.6.3",
     "dotenv": "^16.0.3",
-    "js-yaml": "^4.1.1"
+    "yaml": "^2.8.2"
   },
   "devDependencies": {
     "@eslint/eslintrc": "^3.3.3",
     "@eslint/js": "^9.39.1",
-    "@types/js-yaml": "^4.0.9",
     "@types/node": "^22.19.1",
     "@typescript-eslint/eslint-plugin": "^8.48.0",
     "@typescript-eslint/parser": "^8.48.0",