vue-component-meta 3.1.0 → 3.1.2

package/lib/base.js

@@ -17,15 +17,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCheckerByJsonConfigBase = createCheckerByJsonConfigBase;
 exports.createCheckerBase = createCheckerBase;
 const typescript_1 = require("@volar/typescript");
-const vue = require("@vue/language-core");
+const core = require("@vue/language-core");
 const path_browserify_1 = require("path-browserify");
 __exportStar(require("./types"), exports);
 const windowsPathReg = /\\/g;
 function createCheckerByJsonConfigBase(ts, rootDir, json, checkerOptions = {}) {
     rootDir = rootDir.replace(windowsPathReg, '/');
     return baseCreate(ts, () => {
-        const commandLine = vue.createParsedCommandLineByJson(ts, ts.sys, rootDir, json);
-        const { fileNames } = ts.parseJsonConfigFileContent(json, ts.sys, rootDir, {}, undefined, undefined, vue.getAllExtensions(commandLine.vueOptions)
+        const commandLine = core.createParsedCommandLineByJson(ts, ts.sys, rootDir, json);
+        const { fileNames } = ts.parseJsonConfigFileContent(json, ts.sys, rootDir, {}, undefined, undefined, core.getAllExtensions(commandLine.vueOptions)
             .map(extension => ({
             extension: extension.slice(1),
             isMixedContent: true,
@@ -37,8 +37,8 @@ function createCheckerByJsonConfigBase(ts, rootDir, json, checkerOptions = {}) {
 function createCheckerBase(ts, tsconfig, checkerOptions = {}) {
     tsconfig = tsconfig.replace(windowsPathReg, '/');
     return baseCreate(ts, () => {
-        const commandLine = vue.createParsedCommandLine(ts, ts.sys, tsconfig);
-        const { fileNames } = ts.parseJsonSourceFileConfigFileContent(ts.readJsonConfigFile(tsconfig, ts.sys.readFile), ts.sys, path_browserify_1.posix.dirname(tsconfig), {}, tsconfig, undefined, vue.getAllExtensions(commandLine.vueOptions)
+        const commandLine = core.createParsedCommandLine(ts, ts.sys, tsconfig);
+        const { fileNames } = ts.parseJsonSourceFileConfigFileContent(ts.readJsonConfigFile(tsconfig, ts.sys.readFile), ts.sys, path_browserify_1.posix.dirname(tsconfig), {}, tsconfig, undefined, core.getAllExtensions(commandLine.vueOptions)
             .map(extension => ({
             extension: extension.slice(1),
             isMixedContent: true,
@@ -48,19 +48,19 @@ function createCheckerBase(ts, tsconfig, checkerOptions = {}) {
     }, checkerOptions, path_browserify_1.posix.dirname(tsconfig), tsconfig + '.global.vue');
 }
 function baseCreate(ts, getConfigAndFiles, checkerOptions, rootPath, globalComponentName) {
-    let [commandLine, _fileNames] = getConfigAndFiles();
+    let [{ vueOptions, options, projectReferences }, fileNames] = getConfigAndFiles();
     /**
      * Used to lookup if a file is referenced.
      */
-    let fileNames = new Set(_fileNames.map(path => path.replace(windowsPathReg, '/')));
+    let fileNamesSet = new Set(fileNames.map(path => path.replace(windowsPathReg, '/')));
     let projectVersion = 0;
-    vue.writeGlobalTypes(commandLine.vueOptions, ts.sys.writeFile);
+    vueOptions.globalTypesPath = core.createGlobalTypesWriter(vueOptions, ts.sys.writeFile);
     const projectHost = {
         getCurrentDirectory: () => rootPath,
         getProjectVersion: () => projectVersion.toString(),
-        getCompilationSettings: () => commandLine.options,
-        getScriptFileNames: () => [...fileNames],
-        getProjectReferences: () => commandLine.projectReferences,
+        getCompilationSettings: () => options,
+        getScriptFileNames: () => [...fileNamesSet],
+        getProjectReferences: () => projectReferences,
     };
     const globalComponentSnapshot = ts.ScriptSnapshot.fromString('<script setup lang="ts"></script>');
     const scriptSnapshots = new Map();
@@ -75,15 +75,15 @@ function baseCreate(ts, getConfigAndFiles, checkerOptions, rootPath, globalCompo
             getMetaFileName(globalComponentName),
         ];
     };
-    const vueLanguagePlugin = vue.createVueLanguagePlugin(ts, projectHost.getCompilationSettings(), commandLine.vueOptions, id => id);
-    const language = vue.createLanguage([
+    const vueLanguagePlugin = core.createVueLanguagePlugin(ts, projectHost.getCompilationSettings(), vueOptions, id => id);
+    const language = core.createLanguage([
         vueLanguagePlugin,
         {
             getLanguageId(fileName) {
                 return (0, typescript_1.resolveFileLanguageId)(fileName);
             },
         },
-    ], new vue.FileMap(ts.sys.useCaseSensitiveFileNames), fileName => {
+    ], new core.FileMap(ts.sys.useCaseSensitiveFileNames), fileName => {
         let snapshot = scriptSnapshots.get(fileName);
         if (fileName === globalComponentName) {
             snapshot = globalComponentSnapshot;
@@ -119,7 +119,7 @@ function baseCreate(ts, getConfigAndFiles, checkerOptions, rootPath, globalCompo
         const getScriptKind = languageServiceHost.getScriptKind?.bind(languageServiceHost);
         languageServiceHost.getScriptKind = fileName => {
             const scriptKind = getScriptKind(fileName);
-            if (commandLine.vueOptions.extensions.some(ext => fileName.endsWith(ext))) {
+            if (vueOptions.extensions.some(ext => fileName.endsWith(ext))) {
                 if (scriptKind === ts.ScriptKind.JS) {
                     return ts.ScriptKind.TS;
                 }
@@ -138,17 +138,18 @@ function baseCreate(ts, getConfigAndFiles, checkerOptions, rootPath, globalCompo
             fileName = fileName.replace(windowsPathReg, '/');
             scriptSnapshots.set(fileName, ts.ScriptSnapshot.fromString(text));
             // Ensure the file is referenced
-            fileNames.add(fileName);
+            fileNamesSet.add(fileName);
             projectVersion++;
         },
         deleteFile(fileName) {
             fileName = fileName.replace(windowsPathReg, '/');
-            fileNames.delete(fileName);
+            fileNamesSet.delete(fileName);
             projectVersion++;
         },
         reload() {
-            [commandLine, _fileNames] = getConfigAndFiles();
-            fileNames = new Set(_fileNames.map(path => path.replace(windowsPathReg, '/')));
+            [{ vueOptions, options, projectReferences }, fileNames] = getConfigAndFiles();
+            vueOptions.globalTypesPath = core.createGlobalTypesWriter(vueOptions, ts.sys.writeFile);
+            fileNamesSet = new Set(fileNames.map(path => path.replace(windowsPathReg, '/')));
             this.clearCache();
         },
         clearCache() {
@@ -163,13 +164,18 @@ function baseCreate(ts, getConfigAndFiles, checkerOptions, rootPath, globalCompo
         return fileName.endsWith('.meta.ts');
     }
     function getMetaFileName(fileName) {
-        return (commandLine.vueOptions.extensions.some(ext => fileName.endsWith(ext))
+        return (vueOptions.extensions.some(ext => fileName.endsWith(ext))
             ? fileName
             : fileName.slice(0, fileName.lastIndexOf('.'))) + '.meta.ts';
     }
     function getMetaScriptContent(fileName) {
+        const helpersPath = require.resolve('vue-component-type-helpers').replace(windowsPathReg, '/');
+        let helpersRelativePath = path_browserify_1.posix.relative(path_browserify_1.posix.dirname(fileName), helpersPath);
+        if (!helpersRelativePath.startsWith('./') && !helpersRelativePath.startsWith('../')) {
+            helpersRelativePath = './' + helpersRelativePath;
+        }
         let code = `
-import type { ComponentType, ComponentProps, ComponentEmit, ComponentSlots, ComponentExposed } from 'vue-component-meta/lib/helpers';
+import type { ComponentType, ComponentProps, ComponentEmit, ComponentSlots, ComponentExposed } from '${helpersRelativePath}';
 import type * as Components from '${fileName.slice(0, -'.meta.ts'.length)}';
 
 export default {} as { [K in keyof typeof Components]: ComponentMeta<typeof Components[K]>; };
@@ -258,7 +264,7 @@ interface ComponentMeta<T> {
             const { snapshot } = sourceScript;
             const vueFile = sourceScript.generated?.root;
             const vueDefaults = vueFile && exportName === 'default'
-                ? (vueFile instanceof vue.VueVirtualCode ? readVueComponentDefaultProps(vueFile, printer, ts) : {})
+                ? (vueFile instanceof core.VueVirtualCode ? readVueComponentDefaultProps(vueFile, printer, ts) : {})
                 : {};
             const tsDefaults = !vueFile
                 ? readTsComponentDefaultProps(ts.createSourceFile('/tmp.' + componentPath.slice(componentPath.lastIndexOf('.') + 1), // ts | js | tsx | jsx
@@ -596,7 +602,7 @@ function readVueComponentDefaultProps(root, printer, ts) {
             return;
         }
         const { ast } = sfc.scriptSetup;
-        const codegen = vue.tsCodegen.get(sfc);
+        const codegen = core.tsCodegen.get(sfc);
         const scriptSetupRanges = codegen?.getScriptSetupRanges();
         if (scriptSetupRanges?.withDefaults?.argNode) {
             const obj = findObjectLiteralExpression(scriptSetupRanges.withDefaults.argNode);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "vue-component-meta",
-	"version": "3.1.0",
+	"version": "3.1.2",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -14,9 +14,9 @@
 	},
 	"dependencies": {
 		"@volar/typescript": "2.4.23",
-		"@vue/language-core": "3.1.0",
+		"@vue/language-core": "3.1.2",
 		"path-browserify": "^1.0.1",
-		"vue-component-type-helpers": "3.1.0"
+		"vue-component-type-helpers": "3.1.2"
 	},
 	"peerDependencies": {
 		"typescript": "*"
@@ -25,5 +25,5 @@
 		"@types/node": "^22.10.4",
 		"@types/path-browserify": "^1.0.1"
 	},
-	"gitHead": "fa32cb67b68c4fd01a146c7e2a276ffa022df268"
+	"gitHead": "77db3d889305e8c02740f4c14793bff0156ccdb8"
 }

package/lib/helpers.d.ts

@@ -1 +0,0 @@
-export type * from 'vue-component-type-helpers';

package/lib/helpers.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=helpers.js.map