package-lock, deps, prettier

Author: agubler

package-lock.json

@@ -13,7 +13,7 @@
 		"release": "npm run package && dojo-release"
 	},
 	"peerDependencies": {
-		"@dojo/framework": "~7.0.0"
+		"@dojo/framework": "8.0.0-rc.1"
 	},
 	"dependencies": {
 		"@fortawesome/fontawesome-free": "5.15.3",
@@ -31,17 +31,17 @@
 		"unified": "8.4.1"
 	},
 	"devDependencies": {
-		"@dojo/cli": "~7.0.0",
-		"@dojo/cli-build-app": "~7.0.0",
-		"@dojo/cli-build-widget": "~7.0.0",
-		"@dojo/framework": "~7.0.0",
+		"@dojo/cli": "8.0.0-rc.1",
+		"@dojo/cli-build-app": "8.0.0-rc.1",
+		"@dojo/cli-build-widget": "8.0.0-rc.1",
+		"@dojo/framework": "8.0.0-rc.1",
 		"@dojo/scripts": "^4.0.2",
 		"@types/node": "~9.6.5",
 		"intern": "^4.6.0",
 		"prettier": "^1.19.1",
 		"shx": "^0.3.2",
 		"tailwindcss": "^1.1.4",
-		"typescript": "~3.4.5"
+		"typescript": "~3.5.3"
 	},
 	"prettier": {
 		"singleQuote": true,

package.json

@@ -35,16 +35,16 @@ export default factory(function InterfaceTable({ properties }) {
 							<th classes="px-4 py-2 border-r border-b border-gray-400 text-sm font-semibold text-gray-700 p-2 bg-gray-100 rounded-tl-lg">
 								Name
 							</th>
-							{showTypes &&
-							<th classes="px-4 py-2 border-r border-b border-gray-400 text-sm font-semibold text-gray-700 p-2 bg-gray-100">
-								Type
-							</th>
-							}
-							{showComments &&
+							{showTypes && (
+								<th classes="px-4 py-2 border-r border-b border-gray-400 text-sm font-semibold text-gray-700 p-2 bg-gray-100">
+									Type
+								</th>
+							)}
+							{showComments && (
 								<th classes="px-4 py-2 border-b border-gray-400 text-sm font-semibold text-gray-700 p-2 bg-gray-100 rounded-tr-lg">
 									{descriptionLabel}
 								</th>
-							}
+							)}
 						</tr>
 					</thead>
 					<tbody>
@@ -55,7 +55,9 @@ export default factory(function InterfaceTable({ properties }) {
 										prop.optional ? '?' : ''
 									}`}</td>
 									{showTypes && <td classes="px-4 py-2 text-sm">{prop.type}</td>}
-									{showComments && <td classes="px-4 py-2 text-sm">{prop.description}</td>}
+									{showComments && (
+										<td classes="px-4 py-2 text-sm">{prop.description}</td>
+									)}
 								</tr>
 							);
 						})}

src/InterfaceTable.tsx

@@ -85,7 +85,7 @@ export default factory(function SideBar({ properties, middleware: { theme } }) {
 						<div classes="inline-block relative w-4/5">
 							<select
 								onchange={(e) => {
-									const themeName = (e.target as HTMLInputElement).value;
+									const themeName = (e.target as HTMLSelectElement).value;
 									onThemeChange(themeName);
 								}}
 								classes="select block appearance-none w-full bg-white border border-gray-400 hover:border-gray-500 px-4 py-2 pr-8 rounded shadow leading-tight focus:outline-none focus:shadow-outline"

src/SideMenu.tsx

@@ -15,9 +15,13 @@ export interface FunctionChild {
 }
 
 const factory = create({ theme, i18n }).children<ButtonChildren | RenderResult | FunctionChild>();
-export const NamedButton = factory(function NamedButton({ properties, children, middleware: { theme, i18n } }) {
+export const NamedButton = factory(function NamedButton({
+	properties,
+	children,
+	middleware: { theme, i18n }
+}) {
 	const [labelChild] = children();
-	const label = (labelChild && (labelChild as any).label) ? (labelChild as any).label : labelChild;
+	const label = labelChild && (labelChild as any).label ? (labelChild as any).label : labelChild;
 	const { messages } = i18n.localize(bundle);
 	const themedCss = theme.classes(css);
 	return <button classes={[themedCss.root]}>{`${label} - ${messages.message}`}</button>;

src/example/NamedButton/NamedButton.tsx

@@ -42,7 +42,7 @@ export interface Config {
 }
 
 export default ({ config }: { config: Config }) => {
-	const { themes, tests } = config;
+	const { tests } = config;
 	if (global.intern && tests && tests.keys) {
 		const url = new URL(window.location.href);
 		const params = url.searchParams;

src/index.tsx

@@ -34,16 +34,19 @@ function format(prop: MethodSignature | PropertySignature | PropertyAssignment):
 		name: prop.getName(),
 		type: prop.getType().getText(prop),
 		optional: prop.hasQuestionToken() || false,
-		description: (prop as PropertySignature).getJsDocs ? (
-			(prop as PropertySignature).getJsDocs()[0] && (prop as PropertySignature).getJsDocs()[0].getComment()
-		) : (
-			(prop as PropertyAssignment).getInitializerIfKind(SyntaxKind.StringLiteral) &&
-			(prop as PropertyAssignment).getInitializerIfKind(SyntaxKind.StringLiteral)!.getLiteralValue()
-		)
+		description: (prop as PropertySignature).getJsDocs
+			? (prop as PropertySignature).getJsDocs()[0] &&
+			  (prop as PropertySignature).getJsDocs()[0].getComment()
+			: (prop as PropertyAssignment).getInitializerIfKind(SyntaxKind.StringLiteral) &&
+			  (prop as PropertyAssignment)
+					.getInitializerIfKind(SyntaxKind.StringLiteral)!
+					.getLiteralValue()
 	};
 }
 
-function isSignatureOrAssignment(node: any): node is MethodSignature | PropertySignature | PropertyAssignment {
+function isSignatureOrAssignment(
+	node: any
+): node is MethodSignature | PropertySignature | PropertyAssignment {
 	return Boolean(node && node.getName && node.getType && node.hasQuestionToken);
 }
 
@@ -80,27 +83,33 @@ function getTypeFromFactory(factory: CallExpression, children = false) {
 
 function parseI18n(node: CallExpression) {
 	const propertyAccess = node.getChildAtIndex(0);
-	const functionSymbol = propertyAccess &&
+	const functionSymbol =
+		propertyAccess &&
 		propertyAccess.getKind() === SyntaxKind.PropertyAccessExpression &&
 		propertyAccess.getSymbol();
 	const functionType = functionSymbol && functionSymbol.getTypeAtLocation(node);
 	const callType = functionType && functionType.getCallSignatures()[0];
-	const argument = callType && callType.getParameters()[0]
+	const argument = callType && callType.getParameters()[0];
 	const parameterType = argument && argument.getTypeAtLocation(node);
 	const parameterSymbol = parameterType && parameterType.getSymbol();
 	const parameterSymbolName = parameterSymbol && parameterSymbol.getName();
 	const returnType = callType && callType.getReturnType();
 	const returnAliasSymbol = returnType && returnType.getAliasSymbol();
 	const returnAliasName = returnAliasSymbol && returnAliasSymbol.getName();
-	if (parameterType && parameterSymbolName === 'Bundle' && returnAliasName === 'LocalizedMessages') {
-		const argument = node.getArguments()[0]
+	if (
+		parameterType &&
+		parameterSymbolName === 'Bundle' &&
+		returnAliasName === 'LocalizedMessages'
+	) {
+		const argument = node.getArguments()[0];
 		const argumentType = argument && argument.getType();
 		const messages = argumentType && argumentType.getProperty('messages');
 		const locales = argumentType && argumentType.getProperty('locales');
 		const messageProps = messages && messages.getTypeAtLocation(node);
 		const localeProps = locales && locales.getTypeAtLocation(node);
 		return {
-			messages: messageProps && getPropertyDetails(messageProps), locales: localeProps && getPropertyDetails(localeProps)
+			messages: messageProps && getPropertyDetails(messageProps),
+			locales: localeProps && getPropertyDetails(localeProps)
 		};
 	}
 
@@ -164,7 +173,8 @@ export default function(config: { [index: string]: string }) {
 
 						if (typeArguments.length) {
 							const widgetSymbol = typeArguments[0].getChildAtIndex(0).getSymbol();
-							const widgetChildrenSymbol = typeArguments[1] && typeArguments[1].getChildAtIndex(0).getSymbol();
+							const widgetChildrenSymbol =
+								typeArguments[1] && typeArguments[1].getChildAtIndex(0).getSymbol();
 
 							if (widgetSymbol) {
 								propsType = widgetSymbol.getDeclaredType();
@@ -179,19 +189,19 @@ export default function(config: { [index: string]: string }) {
 			} else if (node.getKind() === SyntaxKind.ExportAssignment) {
 				initializer = (node as ExportAssignment).getExpression();
 			} else if (node.getKind() === SyntaxKind.CallExpression) {
-				const parsedI18n = parseI18n(node as CallExpression)
+				const parsedI18n = parseI18n(node as CallExpression);
 				if (parsedI18n.messages) {
 					messages.push(...parsedI18n.messages);
 				}
 
-				if(parsedI18n.locales) {
+				if (parsedI18n.locales) {
 					locales = parsedI18n.locales;
 				}
 			}
 
 			if (initializer && initializer.getKind() === SyntaxKind.CallExpression) {
 				propsType = getTypeFromFactory(initializer);
-				childrenType  = getTypeFromFactory(initializer, true);
+				childrenType = getTypeFromFactory(initializer, true);
 			}
 		});
 
@@ -247,30 +257,35 @@ export default function(config: { [index: string]: string }) {
 		if (unionTypes && unionTypes.length) {
 			unionTypes.forEach((unionType) => {
 				const unionProperties = getPropertyDetails(unionType);
-				unionProperties.forEach(type => parseUnionType(type, properties));
+				unionProperties.forEach((type) => parseUnionType(type, properties));
 			});
 		}
 		childUnionTypes.forEach((unionType) => {
 			const text = unionType.getText(undefined, TypeFormatFlags.None);
-			if (unionType.isArray() || !unionType.isObject() || (
-				text && (text.startsWith('WNode') || text.startsWith('VNode') || text.startsWith('DNode'))
-			)) {
+			if (
+				unionType.isArray() ||
+				!unionType.isObject() ||
+				(text &&
+					(text.startsWith('WNode') ||
+						text.startsWith('VNode') ||
+						text.startsWith('DNode')))
+			) {
 				children.push({
 					name: '----',
 					type: text,
 					optional: false
 				});
 			} else {
 				const callSignatures = unionType.getCallSignatures();
-				callSignatures.forEach(signature => {
+				callSignatures.forEach((signature) => {
 					children.push({
 						name: '----',
 						type: signature.getDeclaration().getFullText(),
 						optional: false
 					});
 				});
 				const unionProperties = getPropertyDetails(unionType);
-				unionProperties.forEach(type => parseUnionType(type, children));
+				unionProperties.forEach((type) => parseUnionType(type, children));
 			}
 		});
 

src/interfaces.block.ts

@@ -13,6 +13,7 @@
 			"es2015.symbol",
 			"es2015.symbol.wellknown"
 		],
+		"skipLibCheck": true,
 		"module": "commonjs",
 		"moduleResolution": "node",
 		"noUnusedLocals": true,