Computed Indexed Access Types | TypeBox 0.28.1

sinclairzx81 · Apr 20, 2023 · ecefc7c · ecefc7c
1 parent b717629
commit ecefc7c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -28,7 +28,7 @@
     "@types/prettier": "^2.7.2"
   },
   "dependencies": {
-    "@sinclair/typebox": "^0.27.8",
+    "@sinclair/typebox": "^0.28.1",
     "prettier": "^2.8.7",
     "typescript": "^5.0.4"
   },

diff --git a/src/typescript/typescript-to-typebox.ts b/src/typescript/typescript-to-typebox.ts
@@ -303,8 +303,8 @@ export namespace TypeScriptToTypeBox {
   }
   function* IndexedAccessType(node: ts.IndexedAccessTypeNode): IterableIterator<string> {
     const obj = node.objectType.getText()
-    const key = node.indexType.getText()
-    yield `${obj}.properties[${key}]`
+    const key = Collect(node.indexType)
+    yield `Type.Index(${obj}, ${key})`
   }
   function* ExpressionWithTypeArguments(node: ts.ExpressionWithTypeArguments): IterableIterator<string> {
     const name = Collect(node.expression)
@@ -465,6 +465,7 @@ export namespace TypeScriptToTypeBox {
     typeNames.clear()
     useImports = false
     useGenerics = false
+    useTypeClone = false
     const source = ts.createSourceFile('types.ts', typescriptCode, ts.ScriptTarget.ESNext, true)
     const declarations = Formatter.Format([...Visit(source)].join('\n\n'))
     const imports = ImportStatement(options)