sveld 0.13.2 → 0.14.0

package/CHANGELOG.md

@@ -10,6 +10,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - add isAccessor field to API
 - update Markdown writer to generate a separate table for accessors -->
 
+## [0.14.0](https://github.com/carbon-design-system/sveld/releases/tag/v0.14.0) - 2022-04-09
+
+- add `sveltekit:prefetch`, `sveltekit:noscroll` attributes to props that extend `a` attributes
+- use type-only imports for `SvelteComponentTyped` and extended props
+
+## [0.13.4](https://github.com/carbon-design-system/sveld/releases/tag/v0.13.4) - 2022-02-26
+
+- use file name as module name if library only has a single default export
+
+## [0.13.3](https://github.com/carbon-design-system/sveld/releases/tag/v0.13.3) - 2022-02-13
+
+- component module exports should not be recognized as accessors
+
 ## [0.13.2](https://github.com/carbon-design-system/sveld/releases/tag/v0.13.2) - 2022-02-10
 
 - do not wrap TS `@event` detail in `CustomEvent` if type contains `CustomEvent`

package/LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2020 IBM
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

package/README.md

@@ -173,11 +173,11 @@ export default {
 };
 ```
 
-When building the library with Rollup, TypeScript definitions will be written to the `types` folder by default.
+When building the library, TypeScript definitions are emitted to the `types` folder by default.
 
-Use the `typesOptions.outDir` option to customize the output folder. 
+Customize the output folder using the `typesOptions.outDir` option.
 
-For example, specify the following for the output to be emitted to the `dist` folder:
+The following example emits the output to the `dist` folder:
 
 ```diff
 sveld({
@@ -190,6 +190,7 @@ sveld({
 The [integration](integration) folder contains example set-ups:
 
 - [single-export](integration/single-export): library that exports one component
+- [single-export-default-only](integration/single-export-default-only): library that exports one component using the concise `export { default } ...` syntax
 - [multi-export](integration/multi-export): multi-component library without JSDoc annotations (types are inferred)
 - [multi-export-typed](integration/multi-export-typed): multi-component library with JSDoc annotations
 - [multi-export-typed-ts-only](integration/multi-export-typed-ts-only): multi-component library that only generates TS definitions

package/cli.js

@@ -4,6 +4,6 @@
   try {
     require("./lib").cli(process);
   } catch (error) {
-    process.stderr.write(error + "\n");
+    console.error(error);
   }
 })();

package/lib/ComponentParser.d.ts

@@ -1,4 +1,3 @@
-import * as commentParser from "comment-parser";
 interface ComponentParserDiagnostics {
     moduleName: string;
     filePath: string;
@@ -34,7 +33,9 @@ interface DispatchedEvent {
     detail?: any;
 }
 declare type ComponentEvent = ForwardedEvent | DispatchedEvent;
-interface TypeDef extends Pick<commentParser.Tag, "type" | "name"> {
+interface TypeDef {
+    type: string;
+    name: string;
     description?: string;
     ts: string;
 }
@@ -53,6 +54,7 @@ interface Extends {
 }
 export interface ParsedComponent {
     props: ComponentProp[];
+    moduleExports: ComponentProp[];
     slots: ComponentSlot[];
     events: ComponentEvent[];
     typedefs: TypeDef[];
@@ -64,12 +66,14 @@ export default class ComponentParser {
     private options?;
     private source?;
     private compiled?;
+    private parsed?;
     private rest_props?;
     private extends?;
     private componentComment?;
     private readonly reactive_vars;
     private readonly vars;
     private readonly props;
+    private readonly moduleExports;
     private readonly slots;
     private readonly events;
     private readonly typedefs;
@@ -81,6 +85,7 @@ export default class ComponentParser {
     private sourceAtPos;
     private collectReactiveVars;
     private addProp;
+    private addModuleExport;
     private aliasType;
     private addSlot;
     private addDispatchedEvent;

package/lib/ComponentParser.js

@@ -29,6 +29,7 @@ var ComponentParser = /** @class */ (function () {
         this.reactive_vars = new Set();
         this.vars = new Set();
         this.props = new Map();
+        this.moduleExports = new Map();
         this.slots = new Map();
         this.events = new Map();
         this.typedefs = new Map();
@@ -80,6 +81,17 @@ var ComponentParser = /** @class */ (function () {
             this.props.set(prop_name, data);
         }
     };
+    ComponentParser.prototype.addModuleExport = function (prop_name, data) {
+        if (ComponentParser.assignValue(prop_name) === undefined)
+            return;
+        if (this.moduleExports.has(prop_name)) {
+            var existing_slot = this.moduleExports.get(prop_name);
+            this.moduleExports.set(prop_name, __assign(__assign({}, existing_slot), data));
+        }
+        else {
+            this.moduleExports.set(prop_name, data);
+        }
+    };
     ComponentParser.prototype.aliasType = function (type) {
         if (type === "*")
             return "any";
@@ -120,7 +132,7 @@ var ComponentParser = /** @class */ (function () {
     };
     ComponentParser.prototype.parseCustomTypes = function () {
         var _this = this;
-        commentParser(this.source).forEach(function (_a) {
+        commentParser.parse(this.source, { spacing: "preserve" }).forEach(function (_a) {
             var tags = _a.tags;
             tags.forEach(function (_a) {
                 var tag = _a.tag, tagType = _a.type, name = _a.name, description = _a.description;
@@ -159,11 +171,13 @@ var ComponentParser = /** @class */ (function () {
     ComponentParser.prototype.cleanup = function () {
         this.source = undefined;
         this.compiled = undefined;
+        this.parsed = undefined;
         this.rest_props = undefined;
         this["extends"] = undefined;
         this.componentComment = undefined;
         this.reactive_vars.clear();
         this.props.clear();
+        this.moduleExports.clear();
         this.slots.clear();
         this.events.clear();
         this.typedefs.clear();
@@ -171,20 +185,94 @@ var ComponentParser = /** @class */ (function () {
     };
     ComponentParser.prototype.parseSvelteComponent = function (source, diagnostics) {
         var _this = this;
-        var _a;
+        var _a, _b, _c;
         if ((_a = this.options) === null || _a === void 0 ? void 0 : _a.verbose) {
-            process.stdout.write("[parsing] \"".concat(diagnostics.moduleName, "\" ").concat(diagnostics.filePath, "\n"));
+            console.log("[parsing] \"".concat(diagnostics.moduleName, "\" ").concat(diagnostics.filePath));
         }
         this.cleanup();
         this.source = source;
         this.compiled = (0, compiler_1.compile)(source);
+        this.parsed = (0, compiler_1.parse)(source);
         this.collectReactiveVars();
         this.parseCustomTypes();
+        if ((_b = this.parsed) === null || _b === void 0 ? void 0 : _b.module) {
+            (0, compiler_1.walk)((_c = this.parsed) === null || _c === void 0 ? void 0 : _c.module, {
+                enter: function (node) {
+                    var _a, _b, _c, _d, _e, _f, _g, _h;
+                    if (node.type === "ExportNamedDeclaration") {
+                        var _j = ((_a = node.declaration) === null || _a === void 0 ? void 0 : _a.declarations) ? node.declaration.declarations[0] : node.declaration, declaration_type = _j.type, id = _j.id, init = _j.init, body = _j.body;
+                        var prop_name = id.name;
+                        var value = undefined;
+                        var type = undefined;
+                        var kind = node.declaration.kind;
+                        var description = undefined;
+                        var isFunction = false;
+                        var isFunctionDeclaration = false;
+                        if (init != null) {
+                            if (init.type === "ObjectExpression" ||
+                                init.type === "BinaryExpression" ||
+                                init.type === "ArrayExpression" ||
+                                init.type === "ArrowFunctionExpression") {
+                                value = (_b = _this.sourceAtPos(init.start, init.end)) === null || _b === void 0 ? void 0 : _b.replace(/\n/g, " ");
+                                type = value;
+                                isFunction = init.type === "ArrowFunctionExpression";
+                                if (init.type === "BinaryExpression") {
+                                    if ((init === null || init === void 0 ? void 0 : init.left.type) === "Literal" && typeof (init === null || init === void 0 ? void 0 : init.left.value) === "string") {
+                                        type = "string";
+                                    }
+                                }
+                            }
+                            else {
+                                if (init.type === "UnaryExpression") {
+                                    value = _this.sourceAtPos(init.start, init.end);
+                                    type = typeof ((_c = init.argument) === null || _c === void 0 ? void 0 : _c.value);
+                                }
+                                else {
+                                    value = init.raw;
+                                    type = init.value == null ? undefined : typeof init.value;
+                                }
+                            }
+                        }
+                        if (declaration_type === "FunctionDeclaration") {
+                            value = "() => " + ((_d = _this.sourceAtPos(body.start, body.end)) === null || _d === void 0 ? void 0 : _d.replace(/\n/g, " "));
+                            type = "() => any";
+                            kind = "function";
+                            isFunction = true;
+                            isFunctionDeclaration = true;
+                        }
+                        if (node.leadingComments) {
+                            var last_comment = node.leadingComments[node.leadingComments.length - 1];
+                            var comment = commentParser.parse(ComponentParser.formatComment(last_comment.value), {
+                                spacing: "preserve"
+                            });
+                            var tag = (_e = comment[0]) === null || _e === void 0 ? void 0 : _e.tags[((_f = comment[0]) === null || _f === void 0 ? void 0 : _f.tags.length) - 1];
+                            if ((tag === null || tag === void 0 ? void 0 : tag.tag) === "type")
+                                type = _this.aliasType(tag.type);
+                            description = ComponentParser.assignValue((_h = (_g = comment[0]) === null || _g === void 0 ? void 0 : _g.description) === null || _h === void 0 ? void 0 : _h.trim());
+                        }
+                        if (!description && _this.typedefs.has(type)) {
+                            description = _this.typedefs.get(type).description;
+                        }
+                        _this.addModuleExport(prop_name, {
+                            name: prop_name,
+                            kind: kind,
+                            description: description,
+                            type: type,
+                            value: value,
+                            isFunction: isFunction,
+                            isFunctionDeclaration: isFunctionDeclaration,
+                            constant: kind === "const",
+                            reactive: false
+                        });
+                    }
+                }
+            });
+        }
         var dispatcher_name = undefined;
         var callees = [];
-        (0, compiler_1.walk)(this.compiled.ast, {
+        (0, compiler_1.walk)({ html: this.parsed.html, instance: this.parsed.instance }, {
             enter: function (node, parent, prop) {
-                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
                 if (node.type === "CallExpression") {
                     if (node.callee.name === "createEventDispatcher") {
                         dispatcher_name = parent === null || parent === void 0 ? void 0 : parent.id.name;
@@ -222,7 +310,7 @@ var ComponentParser = /** @class */ (function () {
                         node.declaration = declaration_1;
                         prop_name = exportedName;
                     }
-                    var _m = node.declaration.declarations ? node.declaration.declarations[0] : node.declaration, declaration_type = _m.type, id = _m.id, init = _m.init, body = _m.body;
+                    var _o = node.declaration.declarations ? node.declaration.declarations[0] : node.declaration, declaration_type = _o.type, id = _o.id, init = _o.init, body = _o.body;
                     prop_name !== null && prop_name !== void 0 ? prop_name : (prop_name = id.name);
                     var value = undefined;
                     var type = undefined;
@@ -264,11 +352,13 @@ var ComponentParser = /** @class */ (function () {
                     }
                     if (node.leadingComments) {
                         var last_comment = node.leadingComments[node.leadingComments.length - 1];
-                        var comment = commentParser(ComponentParser.formatComment(last_comment.value));
+                        var comment = commentParser.parse(ComponentParser.formatComment(last_comment.value), {
+                            spacing: "preserve"
+                        });
                         var tag = (_e = comment[0]) === null || _e === void 0 ? void 0 : _e.tags[((_f = comment[0]) === null || _f === void 0 ? void 0 : _f.tags.length) - 1];
                         if ((tag === null || tag === void 0 ? void 0 : tag.tag) === "type")
                             type = _this.aliasType(tag.type);
-                        description = ComponentParser.assignValue((_g = comment[0]) === null || _g === void 0 ? void 0 : _g.description);
+                        description = ComponentParser.assignValue((_h = (_g = comment[0]) === null || _g === void 0 ? void 0 : _g.description) === null || _h === void 0 ? void 0 : _h.trim());
                     }
                     if (!description && _this.typedefs.has(type)) {
                         description = _this.typedefs.get(type).description;
@@ -286,13 +376,13 @@ var ComponentParser = /** @class */ (function () {
                     });
                 }
                 if (node.type === "Comment") {
-                    var data = (_j = (_h = node === null || node === void 0 ? void 0 : node.data) === null || _h === void 0 ? void 0 : _h.trim()) !== null && _j !== void 0 ? _j : "";
+                    var data = (_k = (_j = node === null || node === void 0 ? void 0 : node.data) === null || _j === void 0 ? void 0 : _j.trim()) !== null && _k !== void 0 ? _k : "";
                     if (/^@component/.test(data)) {
                         _this.componentComment = data.replace(/^@component/, "");
                     }
                 }
                 if (node.type === "Slot") {
-                    var slot_name = (_k = node.attributes.find(function (attr) { return attr.name === "name"; })) === null || _k === void 0 ? void 0 : _k.value[0].data;
+                    var slot_name = (_l = node.attributes.find(function (attr) { return attr.name === "name"; })) === null || _l === void 0 ? void 0 : _l.value[0].data;
                     var slot_props = node.attributes
                         .filter(function (attr) { return attr.name !== "name"; })
                         .reduce(function (slot_props, _a) {
@@ -329,7 +419,7 @@ var ComponentParser = /** @class */ (function () {
                         }
                         return __assign(__assign({}, slot_props), (_b = {}, _b[name] = slot_prop_value, _b));
                     }, {});
-                    var fallback = (_l = node.children) === null || _l === void 0 ? void 0 : _l.map(function (_a) {
+                    var fallback = (_m = node.children) === null || _m === void 0 ? void 0 : _m.map(function (_a) {
                         var start = _a.start, end = _a.end;
                         return _this.sourceAtPos(start, end);
                     }).join("").trim();
@@ -383,6 +473,7 @@ var ComponentParser = /** @class */ (function () {
                 }
                 return prop;
             }),
+            moduleExports: ComponentParser.mapToArray(this.moduleExports),
             slots: ComponentParser.mapToArray(this.slots)
                 .map(function (slot) {
                 try {

package/lib/create-exports.d.ts

@@ -1,4 +1,5 @@
 import { ParsedExports } from "./parse-exports";
-export declare function createExports(parsed_exports: ParsedExports): string;
+import { ComponentDocs } from "./rollup-plugin";
+export declare function createExports(parsed_exports: ParsedExports, components: ComponentDocs): string;
 export declare function removeSvelteExt(filePath: string): string;
 export declare function convertSvelteExt(filePath: string): string;

package/lib/create-exports.js

@@ -1,16 +1,25 @@
 "use strict";
 exports.__esModule = true;
 exports.convertSvelteExt = exports.removeSvelteExt = exports.createExports = void 0;
-function createExports(parsed_exports) {
+function createExports(parsed_exports, components) {
     var source = Object.entries(parsed_exports).map(function (_a) {
         var id = _a[0], exportee = _a[1];
+        var module_exports = [];
+        if (components.has(id)) {
+            module_exports = components.get(id).moduleExports.map(function (moduleExport) {
+                return moduleExport.name;
+            });
+        }
+        var named_exports = "";
+        if (module_exports.length > 0)
+            named_exports = ", " + module_exports.join(", ");
         if (id === "default" || exportee["default"]) {
             if (exportee.mixed) {
-                return "export { default as ".concat(id, " } from \"").concat(exportee.source, "\";\nexport { default } from \"").concat(exportee.source, "\";");
+                return "export { default as ".concat(id).concat(named_exports, " } from \"").concat(exportee.source, "\";\nexport { default } from \"").concat(exportee.source, "\";");
             }
-            return "export { default } from \"".concat(exportee.source, "\";");
+            return "export { default".concat(named_exports, " } from \"").concat(exportee.source, "\";");
         }
-        return "export { default as ".concat(id, " } from \"").concat(exportee.source, "\";");
+        return "export { default as ".concat(id).concat(named_exports, " } from \"").concat(exportee.source, "\";");
     });
     return source.join("\n");
 }

package/lib/get-svelte-entry.js

@@ -14,7 +14,7 @@ function getSvelteEntry(entryPoint) {
             return entryPoint;
         }
         else {
-            process.stdout.write("Invalid entry point: ".concat(entry_path, ".\n"));
+            console.log("Invalid entry point: ".concat(entry_path, "."));
             return null;
         }
     }
@@ -23,12 +23,12 @@ function getSvelteEntry(entryPoint) {
         var pkg = JSON.parse(fs.readFileSync(pkg_path, "utf-8"));
         if (pkg.svelte !== undefined)
             return pkg.svelte;
-        process.stdout.write("Could not determine an entry point.\n");
-        process.stdout.write('Specify an entry point to your Svelte code in the "svelte" field of your package.json.\n');
+        console.log("Could not determine an entry point.\n");
+        console.log('Specify an entry point to your Svelte code in the "svelte" field of your package.json.\n');
         return null;
     }
     else {
-        process.stdout.write("Could not locate a package.json file.\n");
+        console.log("Could not locate a package.json file.\n");
         return null;
     }
 }

package/lib/rollup-plugin.js

@@ -48,7 +48,8 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 exports.__esModule = true;
 exports.writeOutput = exports.generateBundle = void 0;
-var fs = require("fs-extra");
+var fs = require("fs");
+var fsp = require("fs/promises");
 var path = require("path");
 var fg = require("fast-glob");
 var writer_ts_definitions_1 = require("./writer/writer-ts-definitions");
@@ -92,7 +93,7 @@ function pluginSveld(opts) {
 exports["default"] = pluginSveld;
 function generateBundle(input, glob) {
     return __awaiter(this, void 0, void 0, function () {
-        var dir, entry, exports, components, parser, _i, _a, _b, moduleName, entry_1, filePath, ext, source, processed;
+        var dir, entry, exports, components, parser, exportEntries, _i, exportEntries_1, _a, exportName, entry_1, filePath, _b, ext, name_1, moduleName, source, processed;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
@@ -110,14 +111,20 @@ function generateBundle(input, glob) {
                     }
                     components = new Map();
                     parser = new ComponentParser_1["default"]();
-                    _i = 0, _a = Object.entries(exports);
+                    exportEntries = Object.entries(exports);
+                    _i = 0, exportEntries_1 = exportEntries;
                     _c.label = 1;
                 case 1:
-                    if (!(_i < _a.length)) return [3 /*break*/, 5];
-                    _b = _a[_i], moduleName = _b[0], entry_1 = _b[1];
-                    filePath = entry_1.source, ext = path.parse(filePath).ext;
+                    if (!(_i < exportEntries_1.length)) return [3 /*break*/, 5];
+                    _a = exportEntries_1[_i], exportName = _a[0], entry_1 = _a[1];
+                    filePath = entry_1.source;
+                    _b = path.parse(filePath), ext = _b.ext, name_1 = _b.name;
+                    moduleName = exportName;
+                    if (exportEntries.length === 1 && exportName === "default") {
+                        moduleName = name_1;
+                    }
                     if (!(ext === ".svelte")) return [3 /*break*/, 4];
-                    return [4 /*yield*/, fs.readFile(path.resolve(dir, filePath), "utf-8")];
+                    return [4 /*yield*/, fsp.readFile(path.resolve(dir, filePath), "utf-8")];
                 case 2:
                     source = _c.sent();
                     return [4 /*yield*/, (0, compiler_1.preprocess)(source, [(0, svelte_preprocess_1.typescript)(), (0, svelte_preprocess_1.replace)([[/<style.+<\/style>/gims, ""]])], {
@@ -151,7 +158,7 @@ function writeOutput(result, opts, input) {
         (0, writer_json_1["default"])(result.components, __assign(__assign({ outFile: "COMPONENT_API.json" }, opts === null || opts === void 0 ? void 0 : opts.jsonOptions), { input: input, inputDir: inputDir }));
     }
     if (opts === null || opts === void 0 ? void 0 : opts.markdown) {
-        (0, writer_markdown_1["default"])(result.components, __assign({ outFile: "COMPONENT_INDEX.md" }, opts === null || opts === void 0 ? void 0 : opts.markdownOptions));
+        (0, writer_markdown_1["default"])(result.components, __assign({ outFile: path.join(process.cwd(), "COMPONENT_INDEX.md") }, opts === null || opts === void 0 ? void 0 : opts.markdownOptions));
     }
 }
 exports.writeOutput = writeOutput;

package/lib/writer/Writer.js

@@ -36,7 +36,8 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 exports.__esModule = true;
-var fs = require("fs-extra");
+var path = require("path");
+var fsp = require("fs/promises");
 var prettier = require("prettier");
 var Writer = /** @class */ (function () {
     function Writer(options) {
@@ -47,29 +48,21 @@ var Writer = /** @class */ (function () {
             return prettier.format(raw, this.options);
         }
         catch (error) {
-            process.stderr.write(error + "\n");
+            console.error(error);
             return raw;
         }
     };
     Writer.prototype.write = function (filePath, raw) {
         return __awaiter(this, void 0, void 0, function () {
-            var error_1;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        _a.trys.push([0, 3, , 4]);
-                        return [4 /*yield*/, fs.ensureFile(filePath)];
+                    case 0: return [4 /*yield*/, fsp.mkdir(path.parse(filePath).dir, { recursive: true })];
                     case 1:
                         _a.sent();
-                        return [4 /*yield*/, fs.writeFile(filePath, this.format(raw))];
+                        return [4 /*yield*/, fsp.writeFile(filePath, this.format(raw))];
                     case 2:
                         _a.sent();
-                        return [3 /*break*/, 4];
-                    case 3:
-                        error_1 = _a.sent();
-                        process.stderr.write(error_1 + "\n");
-                        return [3 /*break*/, 4];
-                    case 4: return [2 /*return*/];
+                        return [2 /*return*/];
                 }
             });
         });

package/lib/writer/writer-json.js

@@ -74,7 +74,7 @@ function writeJson(components, options) {
                     return [4 /*yield*/, writer.write(output_path, JSON.stringify(output))];
                 case 1:
                     _a.sent();
-                    process.stdout.write("created \"".concat(options.outFile, "\".\n"));
+                    console.log("created \"".concat(options.outFile, "\".\n"));
                     return [2 /*return*/];
             }
         });

package/lib/writer/writer-markdown.d.ts

@@ -1,7 +1,8 @@
 import { ComponentDocs } from "../rollup-plugin";
 import WriterMarkdown, { AppendType } from "./WriterMarkdown";
 export interface WriteMarkdownOptions {
+    write?: boolean;
     outFile: string;
     onAppend?: (type: AppendType, document: WriterMarkdown, components: ComponentDocs) => void;
 }
-export default function writeMarkdown(components: ComponentDocs, options: WriteMarkdownOptions): Promise<void>;
+export default function writeMarkdown(components: ComponentDocs, options: WriteMarkdownOptions): Promise<string>;

package/lib/writer/writer-markdown.js

@@ -45,7 +45,6 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
 exports.__esModule = true;
-var path = require("path");
 var WriterMarkdown_1 = require("./WriterMarkdown");
 var writer_ts_definitions_1 = require("./writer-ts-definitions");
 var PROP_TABLE_HEADER = "| Prop name | Kind | Reactive | Type | Default value | Description |\n| :- | :- | :- | :- |\n";
@@ -87,11 +86,11 @@ function formatEventDetail(detail) {
 }
 function writeMarkdown(components, options) {
     return __awaiter(this, void 0, void 0, function () {
-        var output_path, document, keys;
+        var write, document, keys;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    output_path = path.join(process.cwd(), options.outFile);
+                    write = (options === null || options === void 0 ? void 0 : options.write) !== false;
                     document = new WriterMarkdown_1["default"]({
                         onAppend: function (type, document) {
                             var _a;
@@ -148,11 +147,13 @@ function writeMarkdown(components, options) {
                             document.append("p", "None.");
                         }
                     });
-                    return [4 /*yield*/, document.write(output_path, document.end())];
+                    if (!write) return [3 /*break*/, 2];
+                    return [4 /*yield*/, document.write(options.outFile, document.end())];
                 case 1:
                     _a.sent();
-                    process.stdout.write("created \"".concat(options.outFile, "\".\n"));
-                    return [2 /*return*/];
+                    console.log("created \"".concat(options.outFile, "\"."));
+                    _a.label = 2;
+                case 2: return [2 /*return*/, document.end()];
             }
         });
     });

package/lib/writer/writer-ts-definitions.js

@@ -84,8 +84,8 @@ function addCommentLine(value, returnValue) {
     return "* ".concat(returnValue || value, "\n");
 }
 function genPropDef(def) {
-    var _a;
-    var props = def.props
+    var _a, _b, _c;
+    var initial_props = def.props
         .filter(function (prop) { return !prop.isFunctionDeclaration && prop.kind !== "const"; })
         .map(function (prop) {
         var _a;
@@ -105,11 +105,22 @@ function genPropDef(def) {
             .join("");
         var prop_value = prop.constant && !prop.isFunction ? prop.value : prop.type;
         return "\n      ".concat(prop_comments.length > 0 ? "/**\n".concat(prop_comments, "*/") : EMPTY_STR, "\n      ").concat(prop.name, "?: ").concat(prop_value, ";");
-    })
-        .join("\n");
+    });
+    if (((_a = def.rest_props) === null || _a === void 0 ? void 0 : _a.type) === "Element") {
+        var elements = (_b = def.rest_props) === null || _b === void 0 ? void 0 : _b.name.split("|").map(function (element) { return element.replace(/\s+/g, ""); });
+        if (elements.includes("a")) {
+            initial_props.push([
+                "\n",
+                "\n          /**\n           * SvelteKit attribute to enable data prefetching\n           * if a link is hovered over or touched on mobile.\n           * @see https://kit.svelte.dev/docs/a-options#sveltekit-prefetch\n           * @default false\n           */\n           \"sveltekit:prefetch\"?: boolean;\n          ",
+                "\n",
+                "\n          /**\n           * SvelteKit attribute to prevent scrolling\n           * after the link is clicked.\n           * @see https://kit.svelte.dev/docs/a-options#sveltekit-prefetch\n           * @default false\n           */\n           \"sveltekit:noscroll\"?: boolean;\n          ",
+            ].join("\n"));
+        }
+    }
+    var props = initial_props.join("\n");
     var props_name = "".concat(def.moduleName, "Props");
     var prop_def = EMPTY_STR;
-    if (((_a = def.rest_props) === null || _a === void 0 ? void 0 : _a.type) === "Element") {
+    if (((_c = def.rest_props) === null || _c === void 0 ? void 0 : _c.type) === "Element") {
         var extend_tag_map = def.rest_props.name
             .split("|")
             .map(function (name) { return "svelte.JSX.HTMLAttributes<HTMLElementTagNameMap[\"".concat(name.trim(), "\"]>"); })
@@ -159,7 +170,7 @@ function genAccessors(def) {
 function genImports(def) {
     if (def["extends"] === undefined)
         return "";
-    return "import { ".concat(def["extends"].interface, " } from ").concat(def["extends"]["import"], ";");
+    return "import type { ".concat(def["extends"].interface, " } from ").concat(def["extends"]["import"], ";");
 }
 function genComponentComment(def) {
     if (!def.componentComment)
@@ -171,15 +182,24 @@ function genComponentComment(def) {
         .map(function (line) { return "* ".concat(line); })
         .join("\n"), "\n*/");
 }
+function genModuleExports(def) {
+    return def.moduleExports
+        .map(function (prop) {
+        var _a;
+        var prop_comments = [addCommentLine((_a = prop.description) === null || _a === void 0 ? void 0 : _a.replace(/\n/g, "\n* "))].filter(Boolean).join("");
+        return "\n      ".concat(prop_comments.length > 0 ? "/**\n".concat(prop_comments, "*/") : EMPTY_STR, "\n      export type ").concat(prop.name, " = ").concat(prop.type || ANY_TYPE, ";");
+    })
+        .join("\n");
+}
 function writeTsDefinition(component) {
-    var moduleName = component.moduleName, typedefs = component.typedefs, props = component.props, slots = component.slots, events = component.events, rest_props = component.rest_props, _extends = component["extends"], componentComment = component.componentComment;
+    var moduleName = component.moduleName, typedefs = component.typedefs, props = component.props, moduleExports = component.moduleExports, slots = component.slots, events = component.events, rest_props = component.rest_props, _extends = component["extends"], componentComment = component.componentComment;
     var _a = genPropDef({
         moduleName: moduleName,
         props: props,
         rest_props: rest_props,
         "extends": _extends
     }), props_name = _a.props_name, prop_def = _a.prop_def;
-    return "\n  /// <reference types=\"svelte\" />\n  import { SvelteComponentTyped } from \"svelte\";\n  ".concat(genImports({ "extends": _extends }), "\n  ").concat(getTypeDefs({ typedefs: typedefs }), "\n  ").concat(prop_def, "\n  ").concat(genComponentComment({ componentComment: componentComment }), "\n  export default class ").concat(moduleName === "default" ? "" : moduleName, " extends SvelteComponentTyped<\n      ").concat(props_name, ",\n      {").concat(genEventDef({ events: events }), "},\n      {").concat(genSlotDef({ slots: slots }), "}\n    > {\n      ").concat(genAccessors({ props: props }), "\n    }");
+    return "\n  /// <reference types=\"svelte\" />\n  import type { SvelteComponentTyped } from \"svelte\";\n  ".concat(genImports({ "extends": _extends }), "\n  ").concat(genModuleExports({ moduleExports: moduleExports }), "\n  ").concat(getTypeDefs({ typedefs: typedefs }), "\n  ").concat(prop_def, "\n  ").concat(genComponentComment({ componentComment: componentComment }), "\n  export default class ").concat(moduleName === "default" ? "" : moduleName, " extends SvelteComponentTyped<\n      ").concat(props_name, ",\n      {").concat(genEventDef({ events: events }), "},\n      {").concat(genSlotDef({ slots: slots }), "}\n    > {\n      ").concat(genAccessors({ props: props }), "\n    }");
 }
 exports.writeTsDefinition = writeTsDefinition;
 function writeTsDefinitions(components, options) {
@@ -192,7 +212,7 @@ function writeTsDefinitions(components, options) {
                 case 0:
                     ts_base_path = path.join(process.cwd(), options.outDir, "index.d.ts");
                     writer = new Writer_1["default"]({ parser: "typescript", printWidth: 80 });
-                    indexDTs = options.preamble + (0, create_exports_1.createExports)(options.exports);
+                    indexDTs = options.preamble + (0, create_exports_1.createExports)(options.exports, components);
                     _c.label = 1;
                 case 1:
                     _c.trys.push([1, 7, 8, 13]);
@@ -228,7 +248,7 @@ function writeTsDefinitions(components, options) {
                 case 13: return [4 /*yield*/, writer.write(ts_base_path, indexDTs)];
                 case 14:
                     _c.sent();
-                    process.stdout.write("created TypeScript definitions.\n");
+                    console.log("created TypeScript definitions.");
                     return [2 /*return*/];
             }
         });

package/package.json

@@ -1,44 +1,43 @@
 {
   "name": "sveld",
-  "version": "0.13.2",
+  "version": "0.14.0",
   "license": "Apache-2.0",
   "description": "Generate TypeScript definitions for your Svelte components.",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "scripts": {
-    "build": "tsc",
-    "build:watch": "tsc -w",
-    "test": "run-p test:*",
-    "test:unit": "tsnd node_modules/tape/bin/tape tests/*.test.ts",
-    "test:integration": "node tests/integration",
-    "format": "prettier --write \"{src,tests}/**/*.{js,ts,svelte}\"",
-    "prepack": "run-s build test"
-  },
-  "peerDependencies": {
-    "svelte": "^3.31.0"
+    "dev": "vite",
+    "build": "vite build",
+    "preview": "vite preview",
+    "test:unit": "vitest",
+    "test:snapshot": "node tests/test-snapshot",
+    "test:integration": "node tests/test-integration",
+    "format": "prettier --write \"{src,tests}/**/*.{js,ts,svelte,md}\"",
+    "prepack": "tsc"
   },
   "dependencies": {
     "@rollup/plugin-node-resolve": "^11.0.1",
-    "acorn": "^8.4.1",
-    "comment-parser": "^0.7.6",
-    "fast-glob": "^3.2.7",
-    "fs-extra": "^9.0.1",
+    "acorn": "^8.7.0",
+    "comment-parser": "^1.3.0",
+    "fast-glob": "^3.2.11",
     "prettier": "^2.5.1",
-    "rollup": "^2.66.0",
+    "rollup": "^2.68.0",
     "rollup-plugin-svelte": "^7.1.0",
-    "svelte": "^3.46.2",
-    "svelte-preprocess": "^4.10.2",
+    "svelte": "^3.46.4",
+    "svelte-preprocess": "^4.10.4",
     "typescript": "^4.5.5"
   },
   "devDependencies": {
-    "@types/fs-extra": "^9.0.12",
-    "@types/node": "^14.14.20",
-    "@types/prettier": "^2.3.2",
-    "@types/tape": "^4.13.2",
-    "npm-run-all": "^4.1.5",
-    "prettier-plugin-svelte": "^2.4.0",
-    "tape": "^5.3.1",
-    "ts-node-dev": "^1.1.1"
+    "@sveltejs/vite-plugin-svelte": "next",
+    "@types/node": "^17.0.21",
+    "@types/prettier": "^2.4.4",
+    "carbon-components-svelte": "^0.61.1",
+    "carbon-preprocess-svelte": "^0.6.0",
+    "codemirror": "^5.65.2",
+    "prettier-plugin-svelte": "^2.6.0",
+    "svelte-highlight": "^5.3.0",
+    "vite": "^2.8.6",
+    "vitest": "^0.6.0"
   },
   "bin": {
     "sveld": "./cli.js"