editor: fix type tracking issue

josephjclark · josephjclark · commit fc441af3a13e · 2025-03-21T18:50:31.000Z
diff --git a/assets/js/editor/Editor.tsx b/assets/js/editor/Editor.tsx
@@ -158,11 +158,12 @@ async function loadDTS(specifier: string): Promise<Lib[]> {
       if (!filePath.startsWith('node_modules')) {
         // Load every common typedef into the common module
         let content = await fetchFile(`${commonSpecifier}${filePath}`);
-        content = content.replace(/\* +@(.+?)\*\//gs, '*/');
-        console.log(content);
-        results.push({
-          content: `declare module '@openfn/language-common' { ${content} }`,
-        });
+        if (!content.startsWith('<!DOCTYPE html>')) {
+          content = content.replace(/\* +@(.+?)\*\//gs, '*/');
+          results.push({
+            content: `declare module '@openfn/language-common' { ${content} }`,
+          });
+        }
       }
     }
   }
@@ -176,6 +177,13 @@ async function loadDTS(specifier: string): Promise<Lib[]> {
   for await (const filePath of fetchDTSListing(specifier)) {
     if (!filePath.startsWith('node_modules')) {
       let content = await fetchFile(`${specifier}${filePath}`);
+      if (content.match(/<!doctype html>/i)) {
+        continue;
+      }
+      // Convert relative paths
+      content = content
+        .replace(/from '\.\//g, `from '${name}/`)
+        .replace(/import '\.\//g, `import '${name}/`);
 
       // Remove js doc annotations
       // this regex means: find a * then an @ (with 1+ space in between), then match everything up to a closing comment */
@@ -186,9 +194,6 @@ async function loadDTS(specifier: string): Promise<Lib[]> {
 
       // Import the index as the global namespace - but take care to convert all paths to absolute
       if (fileName === 'index' || fileName === 'Adaptor') {
-        content = content.replace(/from '\.\//g, `from '${name}/`);
-        content = content.replace(/import '\.\//g, `import '${name}/`);
-
         // It turns out that "export * as " seems to straight up not work in Monaco
         // So this little hack will refactor import statements in a way that works
         content = content.replace(
@@ -218,6 +223,7 @@ async function loadDTS(specifier: string): Promise<Lib[]> {
   // This is basically a hack to work around https://github.com/OpenFn/lightning/issues/2641
   // If we find a types.d.ts, append it to every other file
   adaptorDefs = adaptorDefs.map(def => def.replace('{{$TYPES}}', types));
+  console.log(adaptorDefs);
 
   results.push(
     ...adaptorDefs.map(content => ({
diff --git a/assets/js/editor/lib/es5.dts.js b/assets/js/editor/lib/es5.dts.js
@@ -1,5 +1,7 @@
 // https://github.com/microsoft/TypeScript/blob/main/lib/lib.es5.d.ts
 export default `
+
+
 interface Array<T> {
   /**
    * Gets or sets the length of the array. This is a number one higher than the highest index in the array.
@@ -178,6 +180,9 @@ interface Array<T> {
    */
   reduceRight<U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U;
 
+  // JC copied out of VSC core. Needed to support union types apparently
+  copyWithin(target: number, start: number, end?: number): this;
+  
   // JC note that this is the only thing we actually need to get the types to track
   // we could ditch the rest of the definition (if no-one wants to code-complete array.length)
   [n: number]: T;
diff --git a/assets/js/editor/lib/es5.min.dts.js b/assets/js/editor/lib/es5.min.dts.js
@@ -1,6 +1,7 @@
 // Super minimal array definition to support typings
 export default `
   interface Array<T> {
+    copyWithin(target: number, start: number, end?: number): this;
     [n: number]: T;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`// Super minimal array definition to support typings`
`2`	`2`	export default `
`3`	`3`	`interface Array<T> {`
	`4`	`+ copyWithin(target: number, start: number, end?: number): this;`
`4`	`5`	`[n: number]: T;`
`5`	`6`	`}`
`6`	`7`