feature: add constraint in generator

mistlog · Feb 16, 2021 · d8e4771 · d8e4771
1 parent 7445ed9
commit d8e4771
Show file tree

Hide file tree

Showing 8 changed files with 197 additions and 3 deletions.
diff --git a/src/generator/generator.ts b/src/generator/generator.ts
@@ -20,9 +20,11 @@ export type ITypeType = ITypeExpression
 export function TSTypeAliasDeclarationWithParams(ast: ITypeFunctionDeclaration): t.TSTypeAliasDeclaration | t.ExportNamedDeclaration {
     const _type = TSTypeAliasDeclaration(ast);
     const type = t.isExportNamedDeclaration(_type) ? _type.declaration as t.TSTypeAliasDeclaration : _type;
-    const params = ast.declarator.initializer.params.map((param) =>
-        t.tSTypeParameter(null, null, (param as ITypeReference).typeName.name)
-    );
+    const params = ast.declarator.initializer.params.map((param) => {
+        const constraint = param.constraint ? TSType(param.constraint) : null;
+        const tsParam = t.tSTypeParameter(constraint , /* TODO */null, (param as ITypeReference).typeName.name)
+        return tsParam;
+    });
 
     type.typeParameters = t.tsTypeParameterDeclaration(params);
     return _type;

diff --git a/test/__snapshots__/generator.test.ts.snap b/test/__snapshots__/generator.test.ts.snap
@@ -74,6 +74,8 @@ exports[`examples parseUserInfo 1`] = `
 };"
 `;
 
+exports[`examples pick 1`] = `"export type pick<T, Keys extends keyof T> = { [K in Keys]: T[K] };"`;
+
 exports[`ts-type ArrayType 1`] = `"string[]"`;
 
 exports[`ts-type ArrayType: deep 1`] = `"string[][]"`;

diff --git a/test/__snapshots__/parser.test.tsx.snap b/test/__snapshots__/parser.test.tsx.snap
@@ -2919,3 +2919,90 @@ Object {
   "kind": "TypeFunctionDeclaration",
 }
 `;
+
+exports[`examples pick 1`] = `
+Object {
+  "declarator": Object {
+    "initializer": Object {
+      "body": Object {
+        "body": Object {
+          "as": Object {
+            "kind": "TypeReference",
+            "typeName": Object {
+              "kind": "Identifier",
+              "name": "K",
+            },
+          },
+          "key": Object {
+            "kind": "Identifier",
+            "name": "K",
+          },
+          "keys": Object {
+            "kind": "TypeReference",
+            "typeName": Object {
+              "kind": "Identifier",
+              "name": "Keys",
+            },
+          },
+          "kind": "TypeForInStatement",
+          "value": Object {
+            "head": Object {
+              "kind": "TypeReference",
+              "typeName": Object {
+                "kind": "Identifier",
+                "name": "T",
+              },
+            },
+            "kind": "IndexType",
+            "members": Array [
+              Object {
+                "kind": "TypeReference",
+                "typeName": Object {
+                  "kind": "Identifier",
+                  "name": "K",
+                },
+              },
+            ],
+          },
+        },
+        "kind": "MappedTypeExpression",
+      },
+      "kind": "TypeArrowFunctionExpression",
+      "params": Array [
+        Object {
+          "constraint": null,
+          "kind": "TypeReference",
+          "typeName": Object {
+            "kind": "Identifier",
+            "name": "T",
+          },
+        },
+        Object {
+          "constraint": Object {
+            "kind": "KeyOfType",
+            "operand": Object {
+              "kind": "TypeReference",
+              "typeName": Object {
+                "kind": "Identifier",
+                "name": "T",
+              },
+            },
+          },
+          "kind": "TypeReference",
+          "typeName": Object {
+            "kind": "Identifier",
+            "name": "Keys",
+          },
+        },
+      ],
+    },
+    "kind": "TypeFunctionDeclarator",
+    "name": Object {
+      "kind": "Identifier",
+      "name": "pick",
+    },
+  },
+  "export": true,
+  "kind": "TypeFunctionDeclaration",
+}
+`;
diff --git a/test/assets/ast/Example-pick.json b/test/assets/ast/Example-pick.json
@@ -0,0 +1,84 @@
+{
+    "kind": "TypeFunctionDeclaration",
+    "declarator": {
+        "kind": "TypeFunctionDeclarator",
+        "name": {
+            "kind": "Identifier",
+            "name": "pick"
+        },
+        "initializer": {
+            "kind": "TypeArrowFunctionExpression",
+            "params": [
+                {
+                    "kind": "TypeReference",
+                    "typeName": {
+                        "kind": "Identifier",
+                        "name": "T"
+                    },
+                    "constraint": null
+                },
+                {
+                    "kind": "TypeReference",
+                    "typeName": {
+                        "kind": "Identifier",
+                        "name": "Keys"
+                    },
+                    "constraint": {
+                        "kind": "KeyOfType",
+                        "operand": {
+                            "kind": "TypeReference",
+                            "typeName": {
+                                "kind": "Identifier",
+                                "name": "T"
+                            }
+                        }
+                    }
+                }
+            ],
+            "body": {
+                "kind": "MappedTypeExpression",
+                "body": {
+                    "kind": "TypeForInStatement",
+                    "key": {
+                        "kind": "Identifier",
+                        "name": "K"
+                    },
+                    "keys": {
+                        "kind": "TypeReference",
+                        "typeName": {
+                            "kind": "Identifier",
+                            "name": "Keys"
+                        }
+                    },
+                    "as": {
+                        "kind": "TypeReference",
+                        "typeName": {
+                            "kind": "Identifier",
+                            "name": "K"
+                        }
+                    },
+                    "value": {
+                        "kind": "IndexType",
+                        "head": {
+                            "kind": "TypeReference",
+                            "typeName": {
+                                "kind": "Identifier",
+                                "name": "T"
+                            }
+                        },
+                        "members": [
+                            {
+                                "kind": "TypeReference",
+                                "typeName": {
+                                    "kind": "Identifier",
+                                    "name": "K"
+                                }
+                            }
+                        ]
+                    }
+                }
+            }
+        }
+    },
+    "export": true
+}
diff --git a/test/assets/ts-type/Example-pick b/test/assets/ts-type/Example-pick
@@ -0,0 +1 @@
+export type pick<T, Keys extends keyof T> = { [K in Keys]: T[K] };
diff --git a/test/assets/typetype/Example-pick b/test/assets/typetype/Example-pick
@@ -0,0 +1,8 @@
+export type function pick = (T, Keys extends keyof T) => ^{
+    for(K in Keys) {
+        return {
+            key: K,
+            value: T[K]
+        }
+    }
+}
diff --git a/test/generator.test.ts b/test/generator.test.ts
@@ -173,6 +173,11 @@ describe("examples", () => {
         return code;
     }
 
+    test("pick", () => {
+        const name = "Example-pick";
+        expect(toCode(name)).toMatchSnapshot();
+    })
+
     test("parseURL", () => {
         const name = "Example-parseURL";
         expect(toCode(name)).toMatchSnapshot();

diff --git a/test/parser.test.tsx b/test/parser.test.tsx
@@ -577,6 +577,11 @@ describe("examples", () => {
         return ast;
     }
 
+    test("pick", () => {
+        const name = "Example-pick";
+        expect(toAST(name)).toMatchSnapshot();
+    })
+
     test("parseURL", () => {
         const name = "Example-parseURL";
         expect(toAST(name)).toMatchSnapshot();