vue-component-meta 1.2.1 → 1.2.2-alpha.1

package/out/index.js

@@ -40,7 +40,16 @@ function createComponentMetaCheckerWorker(loadParsedCommandLine, checkerOptions,
     let projectVersion = 0;
     const scriptSnapshots = new Map();
     const scriptVersions = new Map();
-    const _host = Object.assign(Object.assign({}, ts.sys), { getProjectVersion: () => projectVersion.toString(), getDefaultLibFileName: (options) => ts.getDefaultLibFilePath(options), useCaseSensitiveFileNames: () => ts.sys.useCaseSensitiveFileNames, getCompilationSettings: () => parsedCommandLine.options, getScriptFileNames: () => fileNames, getProjectReferences: () => parsedCommandLine.projectReferences, getScriptVersion: (fileName) => { var _a, _b; return (_b = (_a = scriptVersions.get(fileName)) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : ''; }, getScriptSnapshot: (fileName) => {
+    const _host = {
+        ...ts.sys,
+        getProjectVersion: () => projectVersion.toString(),
+        getDefaultLibFileName: (options) => ts.getDefaultLibFilePath(options),
+        useCaseSensitiveFileNames: () => ts.sys.useCaseSensitiveFileNames,
+        getCompilationSettings: () => parsedCommandLine.options,
+        getScriptFileNames: () => fileNames,
+        getProjectReferences: () => parsedCommandLine.projectReferences,
+        getScriptVersion: (fileName) => scriptVersions.get(fileName)?.toString() ?? '',
+        getScriptSnapshot: (fileName) => {
             if (!scriptSnapshots.has(fileName)) {
                 const fileText = ts.sys.readFile(fileName);
                 if (fileText !== undefined) {
@@ -48,8 +57,13 @@ function createComponentMetaCheckerWorker(loadParsedCommandLine, checkerOptions,
                 }
             }
             return scriptSnapshots.get(fileName);
-        }, getTypeScriptModule: () => ts, getVueCompilationSettings: () => parsedCommandLine.vueOptions });
-    return Object.assign(Object.assign({}, baseCreate(_host, checkerOptions, globalComponentName, ts)), { updateFile(fileName, text) {
+        },
+        getTypeScriptModule: () => ts,
+        getVueCompilationSettings: () => parsedCommandLine.vueOptions,
+    };
+    return {
+        ...baseCreate(_host, checkerOptions, globalComponentName, ts),
+        updateFile(fileName, text) {
             fileName = fileName.replace(/\\/g, '/');
             scriptSnapshots.set(fileName, ts.ScriptSnapshot.fromString(text));
             scriptVersions.set(fileName, scriptVersions.has(fileName) ? scriptVersions.get(fileName) + 1 : 1);
@@ -69,7 +83,8 @@ function createComponentMetaCheckerWorker(loadParsedCommandLine, checkerOptions,
             scriptSnapshots.clear();
             scriptVersions.clear();
             projectVersion++;
-        } });
+        },
+    };
 }
 function baseCreate(_host, checkerOptions, globalComponentName, ts) {
     const globalComponentSnapshot = ts.ScriptSnapshot.fromString('<script setup lang="ts"></script>');
@@ -156,7 +171,6 @@ function baseCreate(_host, checkerOptions, globalComponentName, ts) {
         return _getExports(program, typeChecker, componentPath).exports.map(e => e.getName());
     }
     function getComponentMeta(componentPath, exportName = 'default') {
-        var _a;
         const program = tsLs.getProgram();
         const typeChecker = program.getTypeChecker();
         const { symbolNode, exports } = _getExports(program, typeChecker, componentPath);
@@ -165,7 +179,7 @@ function baseCreate(_host, checkerOptions, globalComponentName, ts) {
             throw `Could not find export ${exportName}`;
         }
         const componentType = typeChecker.getTypeOfSymbolAtLocation(_export, symbolNode);
-        const symbolProperties = (_a = componentType.getProperties()) !== null && _a !== void 0 ? _a : [];
+        const symbolProperties = componentType.getProperties() ?? [];
         return {
             props: getProps(),
             events: getEvents(),
@@ -173,7 +187,6 @@ function baseCreate(_host, checkerOptions, globalComponentName, ts) {
             exposed: getExposed(),
         };
         function getProps() {
-            var _a;
             const $props = symbolProperties.find(prop => prop.escapedName === '$props');
             const propEventRegex = /^(on[A-Z])/;
             let result = [];
@@ -194,13 +207,16 @@ function baseCreate(_host, checkerOptions, globalComponentName, ts) {
             // fill defaults
             const printer = ts.createPrinter(checkerOptions.printer);
             const snapshot = host.getScriptSnapshot(componentPath);
-            const vueSourceFile = (_a = core.virtualFiles.getSource(componentPath)) === null || _a === void 0 ? void 0 : _a.root;
+            const vueSourceFile = core.virtualFiles.getSource(componentPath)?.root;
             const vueDefaults = vueSourceFile && exportName === 'default'
                 ? (vueSourceFile instanceof vue.VueFile ? readVueComponentDefaultProps(vueSourceFile, printer, ts, vueCompilerOptions) : {})
                 : {};
             const tsDefaults = !vueSourceFile ? readTsComponentDefaultProps(componentPath.substring(componentPath.lastIndexOf('.') + 1), // ts | js | tsx | jsx
             snapshot.getText(0, snapshot.getLength()), exportName, printer, ts) : {};
-            for (const [propName, defaultExp] of Object.entries(Object.assign(Object.assign({}, vueDefaults), tsDefaults))) {
+            for (const [propName, defaultExp] of Object.entries({
+                ...vueDefaults,
+                ...tsDefaults,
+            })) {
                 const prop = result.find(p => p.name === propName);
                 if (prop) {
                     prop.default = defaultExp.default;
@@ -253,8 +269,7 @@ function baseCreate(_host, checkerOptions, globalComponentName, ts) {
         }
     }
     function _getExports(program, typeChecker, componentPath) {
-        var _a;
-        const sourceFile = program === null || program === void 0 ? void 0 : program.getSourceFile(getMetaFileName(componentPath));
+        const sourceFile = program?.getSourceFile(getMetaFileName(componentPath));
         if (!sourceFile) {
             throw 'Could not find main source file';
         }
@@ -265,7 +280,7 @@ function baseCreate(_host, checkerOptions, globalComponentName, ts) {
         const exportedSymbols = typeChecker.getExportsOfModule(moduleSymbol);
         let symbolNode;
         for (const symbol of exportedSymbols) {
-            const [declaration] = (_a = symbol.getDeclarations()) !== null && _a !== void 0 ? _a : [];
+            const [declaration] = symbol.getDeclarations() ?? [];
             if (ts.isExportAssignment(declaration)) {
                 symbolNode = declaration.expression;
             }
@@ -286,7 +301,6 @@ function createSchemaResolvers(typeChecker, symbolNode, { rawType, schema: optio
     const visited = new Set();
     ;
     function shouldIgnore(subtype) {
-        var _a;
         const name = typeChecker.typeToString(subtype);
         if (name === 'any') {
             return true;
@@ -295,7 +309,7 @@ function createSchemaResolvers(typeChecker, symbolNode, { rawType, schema: optio
             return true;
         }
         if (typeof options === 'object') {
-            for (const item of (_a = options.ignore) !== null && _a !== void 0 ? _a : []) {
+            for (const item of options.ignore ?? []) {
                 if (typeof item === 'function') {
                     const result = item(name, subtype, typeChecker);
                     if (typeof result === 'boolean')
@@ -327,7 +341,7 @@ function createSchemaResolvers(typeChecker, symbolNode, { rawType, schema: optio
             type: typeChecker.typeToString(subtype),
             rawType: rawType ? subtype : undefined,
             get schema() {
-                return schema !== null && schema !== void 0 ? schema : (schema = resolveSchema(subtype));
+                return schema ??= resolveSchema(subtype);
             },
         };
     }
@@ -340,7 +354,7 @@ function createSchemaResolvers(typeChecker, symbolNode, { rawType, schema: optio
             rawType: rawType ? subtype : undefined,
             description: ts.displayPartsToString(prop.getDocumentationComment(typeChecker)),
             get schema() {
-                return schema !== null && schema !== void 0 ? schema : (schema = resolveSchema(subtype));
+                return schema ??= resolveSchema(subtype);
             },
         };
     }
@@ -353,7 +367,7 @@ function createSchemaResolvers(typeChecker, symbolNode, { rawType, schema: optio
             rawType: rawType ? subtype : undefined,
             description: ts.displayPartsToString(expose.getDocumentationComment(typeChecker)),
             get schema() {
-                return schema !== null && schema !== void 0 ? schema : (schema = resolveSchema(subtype));
+                return schema ??= resolveSchema(subtype);
             },
         };
     }
@@ -366,7 +380,7 @@ function createSchemaResolvers(typeChecker, symbolNode, { rawType, schema: optio
             rawType: rawType ? subtype : undefined,
             signature: typeChecker.signatureToString(call),
             get schema() {
-                return schema !== null && schema !== void 0 ? schema : (schema = typeChecker.getTypeArguments(subtype).map(resolveSchema));
+                return schema ??= typeChecker.getTypeArguments(subtype).map(resolveSchema);
             },
         };
     }
@@ -376,11 +390,11 @@ function createSchemaResolvers(typeChecker, symbolNode, { rawType, schema: optio
             kind: 'event',
             type: typeChecker.signatureToString(signature),
             get schema() {
-                return schema !== null && schema !== void 0 ? schema : (schema = signature.parameters.length > 0
+                return schema ??= signature.parameters.length > 0
                     ? typeChecker
                         .getTypeArguments(typeChecker.getTypeOfSymbolAtLocation(signature.parameters[0], symbolNode))
                         .map(resolveSchema)
-                    : undefined);
+                    : undefined;
             },
         };
     }
@@ -396,7 +410,7 @@ function createSchemaResolvers(typeChecker, symbolNode, { rawType, schema: optio
                 kind: 'enum',
                 type,
                 get schema() {
-                    return schema !== null && schema !== void 0 ? schema : (schema = subtype.types.map(resolveSchema));
+                    return schema ??= subtype.types.map(resolveSchema);
                 },
             };
         }
@@ -407,7 +421,7 @@ function createSchemaResolvers(typeChecker, symbolNode, { rawType, schema: optio
                 kind: 'array',
                 type,
                 get schema() {
-                    return schema !== null && schema !== void 0 ? schema : (schema = typeChecker.getTypeArguments(subtype).map(resolveSchema));
+                    return schema ??= typeChecker.getTypeArguments(subtype).map(resolveSchema);
                 },
             };
         }
@@ -418,7 +432,7 @@ function createSchemaResolvers(typeChecker, symbolNode, { rawType, schema: optio
                 kind: 'object',
                 type,
                 get schema() {
-                    return schema !== null && schema !== void 0 ? schema : (schema = subtype.getProperties().map(resolveNestedProperties).reduce(reducer, {}));
+                    return schema ??= subtype.getProperties().map(resolveNestedProperties).reduce(reducer, {});
                 },
             };
         }
@@ -441,10 +455,9 @@ function readVueComponentDefaultProps(vueSourceFile, printer, ts, vueCompilerOpt
     scriptWorker();
     return result;
     function scriptSetupWorker() {
-        var _a;
         const descriptor = vueSourceFile.sfc;
         const scriptSetupRanges = descriptor.scriptSetupAst ? vue.parseScriptSetupRanges(ts, descriptor.scriptSetupAst, vueCompilerOptions) : undefined;
-        if (descriptor.scriptSetup && (scriptSetupRanges === null || scriptSetupRanges === void 0 ? void 0 : scriptSetupRanges.withDefaultsArg)) {
+        if (descriptor.scriptSetup && scriptSetupRanges?.withDefaultsArg) {
             const defaultsText = descriptor.scriptSetup.content.substring(scriptSetupRanges.withDefaultsArg.start, scriptSetupRanges.withDefaultsArg.end);
             const ast = ts.createSourceFile('/tmp.' + descriptor.scriptSetup.lang, '(' + defaultsText + ')', ts.ScriptTarget.Latest);
             const obj = findObjectLiteralExpression(ast);
@@ -453,7 +466,7 @@ function readVueComponentDefaultProps(vueSourceFile, printer, ts, vueCompilerOpt
                     if (ts.isPropertyAssignment(prop)) {
                         const name = prop.name.getText(ast);
                         const expNode = resolveDefaultOptionExpression(prop.initializer, ts);
-                        const expText = (_a = printer === null || printer === void 0 ? void 0 : printer.printNode(ts.EmitHint.Expression, expNode, ast)) !== null && _a !== void 0 ? _a : expNode.getText(ast);
+                        const expText = printer?.printNode(ts.EmitHint.Expression, expNode, ast) ?? expNode.getText(ast);
                         result[name] = {
                             default: expText,
                         };
@@ -461,12 +474,15 @@ function readVueComponentDefaultProps(vueSourceFile, printer, ts, vueCompilerOpt
                 }
             }
         }
-        else if (descriptor.scriptSetup && (scriptSetupRanges === null || scriptSetupRanges === void 0 ? void 0 : scriptSetupRanges.propsRuntimeArg)) {
+        else if (descriptor.scriptSetup && scriptSetupRanges?.propsRuntimeArg) {
             const defaultsText = descriptor.scriptSetup.content.substring(scriptSetupRanges.propsRuntimeArg.start, scriptSetupRanges.propsRuntimeArg.end);
             const ast = ts.createSourceFile('/tmp.' + descriptor.scriptSetup.lang, '(' + defaultsText + ')', ts.ScriptTarget.Latest);
             const obj = findObjectLiteralExpression(ast);
             if (obj) {
-                result = Object.assign(Object.assign({}, result), resolvePropsOption(ast, obj, printer, ts));
+                result = {
+                    ...result,
+                    ...resolvePropsOption(ast, obj, printer, ts),
+                };
             }
         }
         function findObjectLiteralExpression(node) {
@@ -510,9 +526,8 @@ function readTsComponentDefaultProps(lang, tsFileText, exportName, printer, ts)
         }
         else {
             ast.forEachChild(child => {
-                var _a;
                 if (ts.isVariableStatement(child)
-                    && ((_a = child.modifiers) === null || _a === void 0 ? void 0 : _a.some(mod => mod.kind === ts.SyntaxKind.ExportKeyword))) {
+                    && child.modifiers?.some(mod => mod.kind === ts.SyntaxKind.ExportKeyword)) {
                     for (const dec of child.declarationList.declarations) {
                         if (dec.name.getText(ast) === exportName) {
                             result = dec.initializer;
@@ -544,7 +559,7 @@ function readTsComponentDefaultProps(lang, tsFileText, exportName, printer, ts)
     }
     function getPropsNode() {
         const options = getComponentOptionsNode();
-        const props = options === null || options === void 0 ? void 0 : options.properties.find(prop => { var _a; return ((_a = prop.name) === null || _a === void 0 ? void 0 : _a.getText(ast)) === 'props'; });
+        const props = options?.properties.find(prop => prop.name?.getText(ast) === 'props');
         if (props && ts.isPropertyAssignment(props)) {
             if (ts.isObjectLiteralExpression(props.initializer)) {
                 return props.initializer;
@@ -553,11 +568,10 @@ function readTsComponentDefaultProps(lang, tsFileText, exportName, printer, ts)
     }
 }
 function resolvePropsOption(ast, props, printer, ts) {
-    var _a, _b;
     const result = {};
     for (const prop of props.properties) {
         if (ts.isPropertyAssignment(prop)) {
-            const name = (_a = prop.name) === null || _a === void 0 ? void 0 : _a.getText(ast);
+            const name = prop.name?.getText(ast);
             if (ts.isObjectLiteralExpression(prop.initializer)) {
                 const defaultProp = prop.initializer.properties.find(p => ts.isPropertyAssignment(p) && p.name.getText(ast) === 'default');
                 const requiredProp = prop.initializer.properties.find(p => ts.isPropertyAssignment(p) && p.name.getText(ast) === 'required');
@@ -568,7 +582,7 @@ function resolvePropsOption(ast, props, printer, ts) {
                 }
                 if (defaultProp) {
                     const expNode = resolveDefaultOptionExpression(defaultProp.initializer, ts);
-                    const expText = (_b = printer === null || printer === void 0 ? void 0 : printer.printNode(ts.EmitHint.Expression, expNode, ast)) !== null && _b !== void 0 ? _b : expNode.getText(ast);
+                    const expText = printer?.printNode(ts.EmitHint.Expression, expNode, ast) ?? expNode.getText(ast);
                     result[name].default = expText;
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "vue-component-meta",
-	"version": "1.2.1",
+	"version": "1.2.2-alpha.1",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -13,12 +13,12 @@
 		"directory": "packages/vue-component-meta"
 	},
 	"dependencies": {
-		"@volar/language-core": "1.3.0-alpha.2",
-		"@volar/vue-language-core": "1.2.1",
+		"@volar/language-core": "1.4.0-alpha.1",
+		"@volar/vue-language-core": "1.2.2-alpha.1",
 		"typesafe-path": "^0.2.2"
 	},
 	"peerDependencies": {
 		"typescript": "*"
 	},
-	"gitHead": "b984fa45fbdb96606abf0d211c76b78f0948139e"
+	"gitHead": "ec74b353fe44dc521a0e4048a8f4e18bd99a546f"
 }