@cedarjs/cli 6.0.0-canary.2766 → 6.0.0-canary.2769

package/dist/commands/setup/deploy/helpers/index.js

@@ -4,7 +4,6 @@ import * as parser from "@babel/parser";
 import * as t from "@babel/types";
 import execa from "execa";
 import { Listr } from "listr2";
-import * as recast from "recast";
 import { getConfigPath, getConfig } from "@cedarjs/project-config";
 import { getPaths, writeFilesTask } from "../../../../lib/index.js";
 const updateApiURLTask = (apiUrl) => {
@@ -88,14 +87,6 @@ const verifyUDSetupTask = () => {
     }
   };
 };
-function posToIndex(str, line, column) {
-  const lines = str.split("\n");
-  let index = 0;
-  for (let i = 0; i < line - 1; i++) {
-    index += lines[i].length + 1;
-  }
-  return index + column;
-}
 function resolveConfigObject(arg) {
   if (t.isObjectExpression(arg)) {
     return arg;
@@ -127,15 +118,9 @@ function insertPluginsBeforeCedar({
   content,
   pluginCodes
 }) {
-  const ast = recast.parse(content, {
-    parser: {
-      parse(source) {
-        return parser.parse(source, {
-          sourceType: "module",
-          plugins: ["typescript", "jsx"]
-        });
-      }
-    }
+  const ast = parser.parse(content, {
+    sourceType: "module",
+    plugins: ["typescript", "jsx"]
   });
   const defaultExport = ast.program.body.find(t.isExportDefaultDeclaration);
   if (!defaultExport) {
@@ -163,33 +148,18 @@ function insertPluginsBeforeCedar({
     return null;
   }
   const cedarNode = cedarElement;
-  if (!cedarNode.loc || !arrayExpr.loc || !pluginsProp.loc) {
+  if (!cedarNode.loc || !arrayExpr.loc || !pluginsProp.loc || cedarNode.start == null || arrayExpr.start == null || arrayExpr.end == null) {
     return null;
   }
   const isInline = cedarNode.loc.start.line === arrayExpr.loc.start.line;
   if (isInline) {
-    const startPos = posToIndex(
-      content,
-      arrayExpr.loc.start.line,
-      arrayExpr.loc.start.column
-    );
-    const endPos = posToIndex(
-      content,
-      arrayExpr.loc.end.line,
-      arrayExpr.loc.end.column
-    );
-    const precedingText = content.slice(0, startPos);
-    const followingText = content.slice(endPos);
+    const precedingText = content.slice(0, arrayExpr.start);
+    const followingText = content.slice(arrayExpr.end);
     const existingCodes = elements.flatMap((el) => {
-      if (!el?.loc) {
+      if (el?.start == null || el.end == null) {
         return [];
       }
-      return [
-        content.slice(
-          posToIndex(content, el.loc.start.line, el.loc.start.column),
-          posToIndex(content, el.loc.end.line, el.loc.end.column)
-        )
-      ];
+      return [content.slice(el.start, el.end)];
     });
     const lines2 = content.split("\n");
     const pluginsLine = pluginsProp.loc.start.line;
@@ -205,7 +175,7 @@ function insertPluginsBeforeCedar({
     return precedingText + multiline + followingText;
   }
   const cedarLine = cedarNode.loc.start.line;
-  const insertPos = posToIndex(content, cedarLine, 0);
+  const insertPos = cedarNode.start - cedarNode.loc.start.column;
   const lines = content.split("\n");
   const indent = (lines[cedarLine - 1].match(/^\s*/) ?? [""])[0];
   const insertion = pluginCodes.map((code) => `${indent}${code},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "6.0.0-canary.2766",
+  "version": "6.0.0-canary.2769",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -33,17 +33,17 @@
   "dependencies": {
     "@babel/parser": "7.29.7",
     "@babel/preset-typescript": "7.29.7",
-    "@cedarjs/api-server": "6.0.0-canary.2766",
-    "@cedarjs/cli-helpers": "6.0.0-canary.2766",
-    "@cedarjs/fastify-web": "6.0.0-canary.2766",
-    "@cedarjs/internal": "6.0.0-canary.2766",
-    "@cedarjs/prerender": "6.0.0-canary.2766",
-    "@cedarjs/project-config": "6.0.0-canary.2766",
-    "@cedarjs/structure": "6.0.0-canary.2766",
-    "@cedarjs/telemetry": "6.0.0-canary.2766",
-    "@cedarjs/utils": "6.0.0-canary.2766",
-    "@cedarjs/vite": "6.0.0-canary.2766",
-    "@cedarjs/web-server": "6.0.0-canary.2766",
+    "@cedarjs/api-server": "6.0.0-canary.2769",
+    "@cedarjs/cli-helpers": "6.0.0-canary.2769",
+    "@cedarjs/fastify-web": "6.0.0-canary.2769",
+    "@cedarjs/internal": "6.0.0-canary.2769",
+    "@cedarjs/prerender": "6.0.0-canary.2769",
+    "@cedarjs/project-config": "6.0.0-canary.2769",
+    "@cedarjs/structure": "6.0.0-canary.2769",
+    "@cedarjs/telemetry": "6.0.0-canary.2769",
+    "@cedarjs/utils": "6.0.0-canary.2769",
+    "@cedarjs/vite": "6.0.0-canary.2769",
+    "@cedarjs/web-server": "6.0.0-canary.2769",
     "@listr2/prompt-adapter-enquirer": "4.3.0",
     "@opentelemetry/api": "1.9.1",
     "@opentelemetry/core": "1.30.1",
@@ -80,7 +80,6 @@
     "prettier": "3.8.4",
     "prisma": "7.8.0",
     "prompts": "2.4.2",
-    "recast": "0.23.12",
     "rimraf": "6.1.3",
     "semver": "7.7.4",
     "smol-toml": "1.6.1",