wrec 0.36.1 → 0.36.2

package/dist/wrec-ssr.d.ts

@@ -1,5 +1,3 @@
-declare type AnyClass = new (...args: any[]) => any;
-
 declare type ChangeCallback = (change: StateChange) => void;
 
 export declare function createElement(name: string, attributes: StringToString, innerHTML: string): HTMLElement;
@@ -19,12 +17,14 @@ declare type PropertyConfig<T = any> = {
     computed?: string;
     dispatch?: boolean;
     required?: boolean;
-    type: AnyClass;
+    type: PropertyType;
     usedBy?: string | string[];
     value?: T;
     values?: T extends string ? string[] : never;
 };
 
+declare type PropertyType = typeof Array | typeof Boolean | typeof Number | typeof Object | typeof String;
+
 declare type StateChange = {
     state: WrecState;
     statePath: string;

package/dist/wrec.d.ts

@@ -1,5 +1,3 @@
-declare type AnyClass = new (...args: any[]) => any;
-
 declare type ChangeCallback = (change: StateChange) => void;
 
 export declare function createElement(name: string, attributes: StringToString, innerHTML: string): HTMLElement;
@@ -19,12 +17,14 @@ declare type PropertyConfig<T = any> = {
     computed?: string;
     dispatch?: boolean;
     required?: boolean;
-    type: AnyClass;
+    type: PropertyType;
     usedBy?: string | string[];
     value?: T;
     values?: T extends string ? string[] : never;
 };
 
+declare type PropertyType = typeof Array | typeof Boolean | typeof Number | typeof Object | typeof String;
+
 declare type StateChange = {
     state: WrecState;
     statePath: string;

package/package.json

@@ -2,7 +2,7 @@
   "name": "wrec",
   "description": "a library that greatly simplifies building web components",
   "author": "R. Mark Volkmann",
-  "version": "0.36.1",
+  "version": "0.36.2",
   "license": "MIT",
   "repository": {
     "type": "git",

package/scripts/declare.js

@@ -41,7 +41,9 @@ function analyzeSourceFile(sourceFile) {
       if (!ts.isPropertyAssignment(property)) continue;
 
       const propName = getMemberName(property);
-      if (!propName || !/^[A-Za-z_$][A-Za-z0-9_$]*$/.test(propName)) continue;
+      if (!propName || !/^[A-Za-z_$][A-Za-z0-9_$]*$/.test(propName)) {
+        continue;
+      }
 
       const declareType = getDeclareType(property.initializer);
       if (!declareType) continue;

package/scripts/lint.js

@@ -1180,6 +1180,15 @@ function getPropertyConfigTypeName(typeName) {
   }
 }
 
+// Gets the base constructor name from a generic-looking type expression.
+function getPropertyTypeGenericBaseName(sourceFile, expression) {
+  if (!expression) return undefined;
+
+  const text = expression.getText(sourceFile).trim();
+  const match = text.match(/^([A-Za-z_$][\w$]*)\s*<[\s\S]+>$/);
+  return match?.[1];
+}
+
 // Derives a readable property type string from syntax or the type checker.
 function getPropertyTypeText(checker, sourceFile, expression) {
   const typeText = getTypeSyntaxText(sourceFile, expression);
@@ -1982,6 +1991,16 @@ function validatePropertyConfigs(
       findings.missingTypeProperties.push(
         `property "${propName}" does not specify a type`
       );
+    } else if (
+      SUPPORTED_PROPERTY_TYPE_NAMES.has(
+        getPropertyTypeGenericBaseName(sourceFile, typeExpression)
+      )
+    ) {
+      findings.invalidTypeProperties.push(
+        `property "${propName}" type cannot use generic syntax like ` +
+          `"${typeExpression.getText(sourceFile).trim()}"; use ` +
+          `"${getPropertyTypeGenericBaseName(sourceFile, typeExpression)}" instead`
+      );
     } else if (
       !SUPPORTED_PROPERTY_TYPE_NAMES.has(typeExpressionKind(typeExpression))
     ) {