Fix tests and scripts

mdx-js · Oct 27, 2023 · d092cdd · d092cdd
1 parent d48c926
commit d092cdd
Show file tree

Hide file tree

Showing 21 changed files with 53 additions and 66 deletions.
diff --git a/package.json b/package.json
@@ -6,10 +6,10 @@
   ],
   "scripts": {
     "generate": "npm --workspace vscode-mdx run generate",
-    "build": "npm --workspaces run build",
     "format": "remark . -qfo && prettier . -w --log-level warn && xo --fix",
-    "test-api": "npm run test-api --workspaces --if-present",
-    "test": "npm run build && npm run format && npm run test-api"
+    "test-types": "tsc --build --clean packages && tsc --build packages",
+    "test-api": "node --test",
+    "test": "npm run test-types && npm run format && npm run test-api"
   },
   "devDependencies": {
     "@changesets/changelog-github": "^0.4.0",

diff --git a/packages/language-server/package.json b/packages/language-server/package.json
@@ -28,8 +28,8 @@
     "unified"
   ],
   "scripts": {
-    "build": "tsc",
-    "test-api": "node --test"
+    "test-api": "node --test",
+    "test": "npm run test-api"
   },
   "dependencies": {
     "@mdx-js/language-service": "0.1.0",

diff --git a/.../language-server/tests/completion.test.js → ...s/language-server/test/completion.test.js b/.../language-server/tests/completion.test.js → ...s/language-server/test/completion.test.js
diff --git a/...language-server/tests/definitions.test.js → .../language-server/test/definitions.test.js b/...language-server/tests/definitions.test.js → .../language-server/test/definitions.test.js
diff --git a/...language-server/tests/diagnostics.test.js → .../language-server/test/diagnostics.test.js b/...language-server/tests/diagnostics.test.js → .../language-server/test/diagnostics.test.js
diff --git a/...nguage-server/tests/document-link.test.js → ...anguage-server/test/document-link.test.js b/...nguage-server/tests/document-link.test.js → ...anguage-server/test/document-link.test.js
diff --git a/...age-server/tests/document-symbols.test.js → ...uage-server/test/document-symbols.test.js b/...age-server/tests/document-symbols.test.js → ...uage-server/test/document-symbols.test.js
diff --git a/...guage-server/tests/folding-ranges.test.js → ...nguage-server/test/folding-ranges.test.js b/...guage-server/tests/folding-ranges.test.js → ...nguage-server/test/folding-ranges.test.js
diff --git a/packages/language-server/tests/hover.test.js → packages/language-server/test/hover.test.js b/packages/language-server/tests/hover.test.js → packages/language-server/test/hover.test.js
diff --git a/.../language-server/tests/initialize.test.js → ...s/language-server/test/initialize.test.js b/.../language-server/tests/initialize.test.js → ...s/language-server/test/initialize.test.js
diff --git a/...language-server/tests/no-tsconfig.test.js → .../language-server/test/no-tsconfig.test.js b/...language-server/tests/no-tsconfig.test.js → .../language-server/test/no-tsconfig.test.js
diff --git a/...ges/language-server/tests/plugins.test.js → ...ages/language-server/test/plugins.test.js b/...ges/language-server/tests/plugins.test.js → ...ages/language-server/test/plugins.test.js
diff --git a/...guage-server/tests/prepare-rename.test.js → ...nguage-server/test/prepare-rename.test.js b/...guage-server/tests/prepare-rename.test.js → ...nguage-server/test/prepare-rename.test.js
diff --git a/...ages/language-server/tests/rename.test.js → packages/language-server/test/rename.test.js b/...ages/language-server/tests/rename.test.js → packages/language-server/test/rename.test.js
diff --git a/packages/language-server/tests/utils.js → packages/language-server/test/utils.js b/packages/language-server/tests/utils.js → packages/language-server/test/utils.js
diff --git a/packages/language-server/tsconfig.json b/packages/language-server/tsconfig.json
@@ -1,15 +1,10 @@
 {
-  "include": ["**/**.js"],
+  "extends": "..",
+  "include": ["**/*.js", "package.json"],
   "exclude": ["coverage/", "node_modules/"],
+  "references": [{"path": "../language-service"}],
   "compilerOptions": {
-    "checkJs": true,
-    "module": "node16",
     "noEmit": true,
-    "resolveJsonModule": true,
-    "skipLibCheck": true,
-    "strict": true,
-    "paths": {
-      "@mdx-js/language-service": ["../language-service/index.js"]
-    }
+    "resolveJsonModule": true
   }
 }
diff --git a/packages/language-service/package.json b/packages/language-service/package.json
@@ -26,9 +26,9 @@
     "unified"
   ],
   "scripts": {
-    "build": "tsc --build --clean && tsc --build",
-    "prepack": "npm run build",
-    "test": "node --test"
+    "prepack": "tsc --build --clean && tsc --build",
+    "test-api": "node --test",
+    "test": "npm pack && npm run test-api"
   },
   "dependencies": {
     "@types/mdast": "^4.0.0",

diff --git a/packages/language-service/test/language-module.js b/packages/language-service/test/language-module.js
@@ -74,13 +74,7 @@ test('create virtual file w/ mdxjsEsm', () => {
         embeddedFiles: [],
         fileName: 'file:///test.mdx.md',
         kind: FileKind.TypeScriptHostFile,
-        mappings: [
-          {
-            sourceRange: [0, 35],
-            generatedRange: [0, 35],
-            data: FileRangeCapabilities.full
-          }
-        ],
+        mappings: [],
         snapshot: snapshotFromLines('                                  ', '')
       }
     ]
@@ -148,13 +142,7 @@ test('create virtual file w/ mdxFlowExpression', () => {
         embeddedFiles: [],
         fileName: 'file:///test.mdx.md',
         kind: FileKind.TypeScriptHostFile,
-        mappings: [
-          {
-            sourceRange: [0, 10],
-            generatedRange: [0, 10],
-            data: FileRangeCapabilities.full
-          }
-        ],
+        mappings: [],
         snapshot: snapshotFromLines('         ', '')
       }
     ]
@@ -244,8 +232,8 @@ test('create virtual file w/ mdxJsxFlowElement w/ children', () => {
         kind: FileKind.TypeScriptHostFile,
         mappings: [
           {
-            sourceRange: [0, 66],
-            generatedRange: [0, 66],
+            sourceRange: [9, 59],
+            generatedRange: [9, 59],
             data: FileRangeCapabilities.full
           }
         ],
@@ -323,13 +311,7 @@ test('create virtual file w/ mdxJsxFlowElement w/o children', () => {
         embeddedFiles: [],
         fileName: 'file:///test.mdx.md',
         kind: FileKind.TypeScriptHostFile,
-        mappings: [
-          {
-            sourceRange: [0, 8],
-            generatedRange: [0, 8],
-            data: FileRangeCapabilities.full
-          }
-        ],
+        mappings: [],
         snapshot: snapshotFromLines('       ', '')
       }
     ]
@@ -399,8 +381,8 @@ test('create virtual file w/ mdxJsxTextElement', () => {
         kind: FileKind.TypeScriptHostFile,
         mappings: [
           {
-            sourceRange: [0, 10],
-            generatedRange: [0, 10],
+            sourceRange: [0, 2],
+            generatedRange: [0, 2],
             data: FileRangeCapabilities.full
           }
         ],
@@ -473,8 +455,13 @@ test('create virtual file w/ mdxTextExpression', () => {
         kind: FileKind.TypeScriptHostFile,
         mappings: [
           {
-            sourceRange: [0, 18],
-            generatedRange: [0, 18],
+            sourceRange: [0, 4],
+            generatedRange: [0, 4],
+            data: FileRangeCapabilities.full
+          },
+          {
+            sourceRange: [14, 17],
+            generatedRange: [14, 17],
             data: FileRangeCapabilities.full
           }
         ],
@@ -605,8 +592,8 @@ test('create virtual file w/ yaml frontmatter', () => {
         kind: FileKind.TypeScriptHostFile,
         mappings: [
           {
-            sourceRange: [0, 27],
-            generatedRange: [0, 27],
+            sourceRange: [0, 26],
+            generatedRange: [0, 26],
             data: FileRangeCapabilities.full
           }
         ],
@@ -693,8 +680,8 @@ test('update virtual file', () => {
         kind: FileKind.TypeScriptHostFile,
         mappings: [
           {
-            sourceRange: [0, 19],
-            generatedRange: [0, 19],
+            sourceRange: [0, 18],
+            generatedRange: [0, 18],
             data: FileRangeCapabilities.full
           }
         ],

diff --git a/packages/language-service/tsconfig.json b/packages/language-service/tsconfig.json
@@ -1,13 +1,9 @@
 {
-  "include": ["**/**.js"],
+  "extends": "..",
+  "include": ["**/*.js"],
   "exclude": ["coverage/", "node_modules/"],
   "compilerOptions": {
-    "checkJs": true,
     "declaration": true,
-    "emitDeclarationOnly": true,
-    "module": "node16",
-    "skipLibCheck": true,
-    "strict": true,
-    "target": "es2020"
+    "emitDeclarationOnly": true
   }
 }
diff --git a/packages/tsconfig.json b/packages/tsconfig.json
@@ -0,0 +1,16 @@
+{
+  "files": [],
+  "references": [
+    {"path": "./language-server"},
+    {"path": "./language-service"},
+    {"path": "./vscode-mdx"}
+  ],
+  "compilerOptions": {
+    "checkJs": true,
+    "composite": true,
+    "lib": ["es2021"],
+    "module": "node16",
+    "strict": true,
+    "target": "es2021"
+  }
+}
diff --git a/packages/vscode-mdx/tsconfig.json b/packages/vscode-mdx/tsconfig.json
@@ -1,15 +1,8 @@
 {
-  "include": ["**/**.js"],
-  "exclude": ["coverage/", "node_modules/"],
+  "extends": "..",
+  "include": ["**/*.js"],
+  "exclude": ["coverage/", "node_modules/", "out/"],
   "compilerOptions": {
-    "checkJs": true,
-    "esModuleInterop": false,
-    "module": "node16",
-    "noEmit": true,
-    "skipLibCheck": true,
-    "strict": true,
-    "paths": {
-      "@mdx-js/language-service": ["../language-service/index.js"]
-    }
+    "noEmit": true
   }
 }