swap id strategey to jsonc (#47)

mcnuttandrew · Jul 3, 2023 · 932511c · 932511c
1 parent bf9c56f
commit 932511c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 99 deletions.
diff --git a/src/lib/projections.ts b/src/lib/projections.ts
@@ -72,7 +72,6 @@ function widgetBuilder(
 ) {
   const widgets: Range<Decoration>[] = [];
   const { schemaTypings, codeUpdateHook } = state.field(cmStatePlugin);
-  // for (const { from, to } of view.visibleRanges) {
   const logger = new Set();
   syntaxTree(state).iterate({
     from: 0,
@@ -97,7 +96,7 @@ function widgetBuilder(
         });
     },
   });
-  // }
+
   try {
     const result = Decoration.set(widgets.sort((a, b) => a.from - b.from));
     return result;
@@ -221,6 +220,9 @@ function identifyProjectionLocationsPreCache(state: EditorState) {
   ) as ProjectionInline[];
   syntaxTree(state).iterate({
     enter: ({ from, to, node }) => {
+      if (node.node.type.name === "⚠") {
+        return;
+      }
       const baseRange = state.selection.ranges[0];
       let blockChildren = false;
       inlineProjections.forEach((projection) => {

diff --git a/src/lib/utils.ts b/src/lib/utils.ts
@@ -223,83 +223,6 @@ export function syntaxNodeToAbsPath(node: SyntaxNode): AbsPathItem[] {
   return (parent ? syntaxNodeToAbsPath(parent) : []).concat(add);
 }
 
-/**
- * Transform an absolute path item list into our key path notation
- * @param absPath
- * @param root
- * @returns
- */
-function absPathToKeyPath(
-  absPath: AbsPathItem[],
-  root: any
-): (string | number)[] {
-  const keyPath: (string | number)[] = [];
-  const pointerLog = [];
-  let idx = 1;
-  while (idx < absPath.length) {
-    const item = absPath[idx];
-    const pointer = getNestedVal(keyPath, root);
-    pointerLog.push(pointer);
-    switch (item.nodeType) {
-      case "Array":
-        if (absPath.at(idx + 1)) {
-          const arrayKey = absPath[idx + 1].index;
-          keyPath.push(arrayKey);
-        } else if (absPath[idx - 1].nodeType === "Property") {
-          // this may lead to bug watch out
-          const terminal = keyPath.at(-1);
-          keyPath.push(`${terminal}___value`);
-        }
-        break;
-      case "Object":
-        if (absPath.at(idx + 1)) {
-          const nextItem = absPath[idx + 1]; // a property node
-          const targetIndex = nextItem.index;
-          // TODO there's a bug here, not sure what
-          // console.log("bugger", targetIndex, pointer);
-          const objKey = Object.keys(pointer)[targetIndex];
-          keyPath.push(objKey);
-        }
-        break;
-      case "Property":
-        break;
-      case "PropertyName":
-        const PropertyNameTerminal = keyPath.pop();
-        keyPath.push(`${PropertyNameTerminal}___key`);
-        break;
-      case "Number":
-      case "String":
-      case "Boolean":
-        const prevItem = absPath[idx - 1];
-        if (prevItem.nodeType === "Property") {
-          const terminal = keyPath.at(-1);
-          keyPath.push(`${terminal}___value`);
-        }
-        break;
-      default:
-        break;
-    }
-
-    idx++;
-  }
-  return keyPath;
-}
-
-const getNestedVal = (props: (string | number)[], obj: any) =>
-  props.reduce((a, prop) => a[prop], obj);
-
-let prevCode: string | undefined = undefined;
-let prevVal: any = {};
-const parseWithCache = (code: string): any => {
-  if (prevCode && code === prevCode) {
-    return prevVal;
-  }
-  const result = Json.parse(code);
-  prevVal = result;
-  prevCode = code;
-  return result;
-};
-
 let codeKey = "";
 let pathCache: Record<string, (string | number)[]> = {};
 export function syntaxNodeToKeyPath(
@@ -313,26 +236,16 @@ export function syntaxNodeToKeyPath(
   if (pathCache[cacheKey]) {
     return pathCache[cacheKey];
   }
-  const absPath = syntaxNodeToAbsPath(node);
-  let parsedRoot = {};
-  try {
-    parsedRoot = parseWithCache(fullCode);
-  } catch (e) {
-    console.error(e);
-    console.error("ERROR CREATING PATH", fullCode);
-    return [];
-  }
-
-  try {
-    const resultPath = absPathToKeyPath(absPath, parsedRoot);
-    pathCache[cacheKey] = resultPath;
-    codeKey = fullCode;
-    return pathCache[cacheKey];
-  } catch (e) {
-    console.error(e);
-    console.error("ERROR CREATING PATH", absPath, parsedRoot);
-    return [];
+  const loc = Json.getLocation(fullCode, node.from);
+  const path = loc.path;
+  if (node.type.name === "PropertyName") {
+    path[path.length - 1] = `${path.at(-1)}___key`;
+  } else if (node.parent?.type.name === "Property") {
+    path.push(`${path.at(-1)}___value`);
   }
+  pathCache[cacheKey] = loc.path;
+  codeKey = fullCode;
+  return loc.path;
 }
 
 function findParseTargetWidth(

diff --git a/src/projections/standard-bundle.ts b/src/projections/standard-bundle.ts
@@ -17,7 +17,7 @@ const bundle = {
   ClickTarget,
   ColorChip,
   ConvertHex: HexConversionProject,
-  Debugger,
+  // Debugger,
   // HeuristicJSONFixes,
   InsertRandomWord,
   NumberSlider,