rollup-plugin-dts - npm Package Compare versions

Comparing version 0.6.0 to 0.7.0

dist/rollup-plugin-dts.cjs.js

@@ -7,4 +7,4 @@ 'use strict';
 
+var ts = require('typescript');
 var rollupPluginutils = require('rollup-pluginutils');
-var ts = require('typescript');
 var path = _interopDefault(require('path'));
@@ -69,3 +69,3 @@
         type: "Identifier",
-        name: node.text || String(node.escapedText),
+        name: node.getText(),
     }, {
@@ -130,3 +130,3 @@ start: node.getStart(),
 }
-function withStartEnd(node, range = { start: 0, end: 0 }) {
+function withStartEnd(node, range) {
     return Object.assign(node, {
@@ -185,10 +185,6 @@ start: getStart(range),
         for (const param of node.parameters) {
-            // istanbul ignore else
-            if (param.type) {
-                this.convertTypeNode(param.type);
-            }
+            this.convertTypeNode(param.type);
         }
-        if (node.type) {
-            this.convertTypeNode(node.type);
-        }
+        this.convertTypeParameters(node.typeParameters);
+        this.convertTypeNode(node.type);
     }
@@ -214,5 +210,3 @@ convertHeritageClauses(node) {
             if (ts.isPropertyDeclaration(node) || ts.isPropertySignature(node) || ts.isIndexSignatureDeclaration(node)) {
-                if (node.type) {
-                    this.convertTypeNode(node.type);
-                }
+                this.convertTypeNode(node.type);
                 continue;
@@ -233,3 +227,14 @@ }
     }
+    convertTypeParameters(params) {
+        if (!params) {
+            return;
+        }
+        for (const node of params) {
+            this.convertTypeNode(node.default);
+        }
+    }
     convertTypeNode(node) {
+        if (!node) {
+            return;
+        }
         if (IGNORE_TYPENODES.has(node.kind)) {
@@ -261,12 +266,6 @@ return;
             const { typeParameter, type } = node;
-            // istanbul ignore else
-            if (typeParameter.constraint) {
-                this.convertTypeNode(typeParameter.constraint);
-            }
+            this.convertTypeNode(typeParameter.constraint);
             // TODO: create scopes for the name
             // node.typeParameter.name
-            // istanbul ignore else
-            if (type) {
-                this.convertTypeNode(type);
-            }
+            this.convertTypeNode(type);
             return;
@@ -289,3 +288,7 @@ }
         if (ts.isTypeReferenceNode(node)) {
-            return this.pushReference(this.convertEntityName(node.typeName));
+            this.pushReference(this.convertEntityName(node.typeName));
+            for (const arg of node.typeArguments || []) {
+                this.convertTypeNode(arg);
+            }
+            return;
         }
@@ -405,2 +408,3 @@ else {
         }
+        scope.convertTypeParameters(node.typeParameters);
         scope.convertHeritageClauses(node);
@@ -413,2 +417,3 @@ scope.convertMembers(node.members);
         scope.removeModifier(node);
+        scope.convertTypeParameters(node.typeParameters);
         scope.convertTypeNode(node.type);
@@ -432,5 +437,3 @@ }
             scope.removeModifier(node);
-            if (decl.type) {
-                scope.convertTypeNode(decl.type);
-            }
+            scope.convertTypeNode(decl.type);
         }
@@ -457,3 +460,5 @@ }
                 declaration: null,
-                specifiers: node.exportClause ? node.exportClause.elements.map(e => this.convertExportSpecifier(e)) : [],
+                specifiers: node.exportClause
+                    ? node.exportClause.elements.map(e => this.convertExportSpecifier(e))
+                    : /* istanbul ignore next */ [],
                 source,
@@ -645,3 +650,3 @@ }, node));
 
-const version = "0.6.0";
+const version = "0.7.0";
 
@@ -652,7 +657,7 @@ const TSLIB_ID = "\0tslib";
 // https://github.com/Swatinem/rollup-plugin-dts
-`.trim() + "\n\n";
-function plugin(options = {}) {
+`.trim() + "\n";
+const plugin = (options = {}) => {
     const filter = rollupPluginutils.createFilter(options.include || ["*.ts+(|x)", "**/*.ts+(|x)"], options.exclude || []);
     const tslibFileName = require.resolve("tslib").replace("tslib.js", "tslib.es6.js");
-    const tslib = ts.sys.readFile(tslibFileName, "utf-8");
+    const tslib = ts.sys.readFile(tslibFileName, "utf-8") || null;
     const mode = options.compileMode || exports.CompileMode.Types;
@@ -680,3 +685,3 @@ const compiler = getCachedCompiler({
             // istanbul ignore next
-            return id === TSLIB_ID ? tslib : undefined;
+            return id === TSLIB_ID ? tslib : null;
         },
@@ -691,11 +696,11 @@ async transform(code, id) {
     };
-}
-function dts(options = {}) {
+};
+const dts = (options = {}) => {
     options.compileMode = options.compileMode || exports.CompileMode.Types;
     return plugin(options);
-}
-function js(options = {}) {
+};
+const js = (options = {}) => {
     options.compileMode = options.compileMode || exports.CompileMode.Js;
     return plugin(options);
-}
+};
 
@@ -702,0 +707,0 @@ exports.plugin = plugin;

dist/rollup-plugin-dts.d.ts

 
-// FILE GENERATED BY `rollup-plugin-dts@0.6.0`
+// FILE GENERATED BY `rollup-plugin-dts@0.7.0`
 // https://github.com/Swatinem/rollup-plugin-dts
 
-
-import { Plugin } from 'rollup';
 import { CompilerOptions } from 'typescript';
+import { PluginImpl } from 'rollup';
 
@@ -21,7 +20,7 @@ declare enum CompileMode {
 }
-declare function plugin(options?: Options): Plugin;
-declare function dts(options?: Options): Plugin;
-declare function js(options?: Options): Plugin;
+declare const plugin: PluginImpl<Options>;
+declare const dts: PluginImpl<Options>;
+declare const js: PluginImpl<Options>;
 
 export default plugin;
 export { CompileMode, plugin, dts, js, js as ts };

dist/rollup-plugin-dts.esm.js

@@ -0,3 +1,3 @@
+import { idText, isLiteralExpression, isIdentifier, getCombinedModifierFlags, getJSDocTags, SyntaxKind, isPropertyDeclaration, isPropertySignature, isIndexSignatureDeclaration, isMethodDeclaration, isMethodSignature, isConstructorDeclaration, isConstructSignatureDeclaration, isParenthesizedTypeNode, isTypeOperatorNode, isArrayTypeNode, isTupleTypeNode, isUnionTypeNode, isIntersectionTypeNode, isTypeLiteralNode, isMappedTypeNode, isConditionalTypeNode, isIndexedAccessTypeNode, isTypeReferenceNode, ModifierFlags, isEnumDeclaration, isFunctionDeclaration, isInterfaceDeclaration, isClassDeclaration, isTypeAliasDeclaration, isVariableStatement, isExportDeclaration, isExportAssignment, isImportDeclaration, isNamedImports, ModuleKind, nodeModuleNameResolver, sys, createSourceFile, ScriptTarget, createProgram, findConfigFile, getParsedCommandLineOfConfigFile } from 'typescript';
 import { createFilter } from 'rollup-pluginutils';
-import { sys, ModuleKind, findConfigFile, getParsedCommandLineOfConfigFile, createProgram, nodeModuleNameResolver, createSourceFile, ScriptTarget, ModifierFlags, isEnumDeclaration, isFunctionDeclaration, isInterfaceDeclaration, isClassDeclaration, isTypeAliasDeclaration, isVariableStatement, isExportDeclaration, isExportAssignment, isImportDeclaration, SyntaxKind, isIdentifier, isNamedImports, idText, isLiteralExpression, getCombinedModifierFlags, getJSDocTags, isPropertyDeclaration, isPropertySignature, isIndexSignatureDeclaration, isMethodDeclaration, isMethodSignature, isConstructorDeclaration, isConstructSignatureDeclaration, isParenthesizedTypeNode, isTypeOperatorNode, isArrayTypeNode, isTupleTypeNode, isUnionTypeNode, isIntersectionTypeNode, isTypeLiteralNode, isMappedTypeNode, isConditionalTypeNode, isIndexedAccessTypeNode, isTypeReferenceNode } from 'typescript';
 import path from 'path';
@@ -62,3 +62,3 @@
         type: "Identifier",
-        name: node.text || String(node.escapedText),
+        name: node.getText(),
     }, {
@@ -123,3 +123,3 @@ start: node.getStart(),
 }
-function withStartEnd(node, range = { start: 0, end: 0 }) {
+function withStartEnd(node, range) {
     return Object.assign(node, {
@@ -178,10 +178,6 @@ start: getStart(range),
         for (const param of node.parameters) {
-            // istanbul ignore else
-            if (param.type) {
-                this.convertTypeNode(param.type);
-            }
+            this.convertTypeNode(param.type);
         }
-        if (node.type) {
-            this.convertTypeNode(node.type);
-        }
+        this.convertTypeParameters(node.typeParameters);
+        this.convertTypeNode(node.type);
     }
@@ -207,5 +203,3 @@ convertHeritageClauses(node) {
             if (isPropertyDeclaration(node) || isPropertySignature(node) || isIndexSignatureDeclaration(node)) {
-                if (node.type) {
-                    this.convertTypeNode(node.type);
-                }
+                this.convertTypeNode(node.type);
                 continue;
@@ -226,3 +220,14 @@ }
     }
+    convertTypeParameters(params) {
+        if (!params) {
+            return;
+        }
+        for (const node of params) {
+            this.convertTypeNode(node.default);
+        }
+    }
     convertTypeNode(node) {
+        if (!node) {
+            return;
+        }
         if (IGNORE_TYPENODES.has(node.kind)) {
@@ -254,12 +259,6 @@ return;
             const { typeParameter, type } = node;
-            // istanbul ignore else
-            if (typeParameter.constraint) {
-                this.convertTypeNode(typeParameter.constraint);
-            }
+            this.convertTypeNode(typeParameter.constraint);
             // TODO: create scopes for the name
             // node.typeParameter.name
-            // istanbul ignore else
-            if (type) {
-                this.convertTypeNode(type);
-            }
+            this.convertTypeNode(type);
             return;
@@ -282,3 +281,7 @@ }
         if (isTypeReferenceNode(node)) {
-            return this.pushReference(this.convertEntityName(node.typeName));
+            this.pushReference(this.convertEntityName(node.typeName));
+            for (const arg of node.typeArguments || []) {
+                this.convertTypeNode(arg);
+            }
+            return;
         }
@@ -398,2 +401,3 @@ else {
         }
+        scope.convertTypeParameters(node.typeParameters);
         scope.convertHeritageClauses(node);
@@ -406,2 +410,3 @@ scope.convertMembers(node.members);
         scope.removeModifier(node);
+        scope.convertTypeParameters(node.typeParameters);
         scope.convertTypeNode(node.type);
@@ -425,5 +430,3 @@ }
             scope.removeModifier(node);
-            if (decl.type) {
-                scope.convertTypeNode(decl.type);
-            }
+            scope.convertTypeNode(decl.type);
         }
@@ -450,3 +453,5 @@ }
                 declaration: null,
-                specifiers: node.exportClause ? node.exportClause.elements.map(e => this.convertExportSpecifier(e)) : [],
+                specifiers: node.exportClause
+                    ? node.exportClause.elements.map(e => this.convertExportSpecifier(e))
+                    : /* istanbul ignore next */ [],
                 source,
@@ -639,3 +644,3 @@ }, node));
 
-const version = "0.6.0";
+const version = "0.7.0";
 
@@ -646,7 +651,7 @@ const TSLIB_ID = "\0tslib";
 // https://github.com/Swatinem/rollup-plugin-dts
-`.trim() + "\n\n";
-function plugin(options = {}) {
+`.trim() + "\n";
+const plugin = (options = {}) => {
     const filter = createFilter(options.include || ["*.ts+(|x)", "**/*.ts+(|x)"], options.exclude || []);
     const tslibFileName = require.resolve("tslib").replace("tslib.js", "tslib.es6.js");
-    const tslib = sys.readFile(tslibFileName, "utf-8");
+    const tslib = sys.readFile(tslibFileName, "utf-8") || null;
     const mode = options.compileMode || CompileMode.Types;
@@ -674,3 +679,3 @@ const compiler = getCachedCompiler({
             // istanbul ignore next
-            return id === TSLIB_ID ? tslib : undefined;
+            return id === TSLIB_ID ? tslib : null;
         },
@@ -685,13 +690,13 @@ async transform(code, id) {
     };
-}
-function dts(options = {}) {
+};
+const dts = (options = {}) => {
     options.compileMode = options.compileMode || CompileMode.Types;
     return plugin(options);
-}
-function js(options = {}) {
+};
+const js = (options = {}) => {
     options.compileMode = options.compileMode || CompileMode.Js;
     return plugin(options);
-}
+};
 
 export default plugin;
 export { CompileMode, plugin, dts, js, js as ts };

package.json

 {
   "name": "rollup-plugin-dts",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "An experiment to generate .d.ts rollup files",
@@ -59,14 +59,14 @@ "keywords": [
     "@types/fs-extra": "^5.0.4",
-    "@types/jest": "^23.3.9",
-    "@types/node": "^10.12.10",
+    "@types/jest": "^23.3.10",
+    "@types/node": "^10.12.18",
     "fs-extra": "^7.0.1",
     "jest": "^23.6.0",
-    "prettier": "^1.15.2",
-    "rollup": "^0.67.3",
+    "prettier": "^1.15.3",
+    "rollup": "^1.0.0",
     "rollup-plugin-json": "^3.1.0",
-    "rollup-plugin-node-resolve": "^3.4.0",
-    "ts-jest": "^23.10.4",
+    "rollup-plugin-node-resolve": "^4.0.0",
+    "ts-jest": "^23.10.5",
     "ts-node": "^7.0.1",
     "tslib": "^1.9.3",
-    "typescript": "3.1.6"
+    "typescript": "3.2.2"
   },
@@ -73,0 +73,0 @@ "peerDependencies": {

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

57228

increased by0.57%

Lines of code

1388

increased by0.73%

No dependency changes