@player-tools/xlr-converters 0.3.0 → 0.4.0--canary.25.709

package/dist/index.cjs.js

@@ -120,9 +120,6 @@ class TsConverter {
         } else {
           resultingNode = this.tsLiteralToType(variable.initializer);
         }
-        if (resultingNode.type === "function" || resultingNode.type === "ref") {
-          resultingNode = __spreadProps(__spreadValues$1({}, resultingNode), { name: variable.name.getText() });
-        }
         return __spreadValues$1({
           name: variable.name.getText()
         }, resultingNode);
@@ -415,13 +412,7 @@ class TsConverter {
       }
     }
     const functionReturnType = this.context.typeChecker.getTypeAtLocation(functionCall);
-    let syntheticNode = this.context.typeChecker.typeToTypeNode(functionReturnType, document, void 0);
-    if (ts__default["default"].isArrowFunction(functionCall)) {
-      const syntheticWithParameters = __spreadProps(__spreadValues$1({}, syntheticNode), {
-        parameters: functionCall.parameters
-      });
-      syntheticNode = syntheticWithParameters;
-    }
+    const syntheticNode = this.context.typeChecker.typeToTypeNode(functionReturnType, document, void 0);
     if (syntheticNode) {
       if (ts__default["default"].isTypeReferenceNode(syntheticNode) && ts__default["default"].isIdentifier(syntheticNode.typeName)) {
         const { typeName } = syntheticNode;

package/dist/index.esm.js

@@ -112,9 +112,6 @@ class TsConverter {
         } else {
           resultingNode = this.tsLiteralToType(variable.initializer);
         }
-        if (resultingNode.type === "function" || resultingNode.type === "ref") {
-          resultingNode = __spreadProps(__spreadValues$1({}, resultingNode), { name: variable.name.getText() });
-        }
         return __spreadValues$1({
           name: variable.name.getText()
         }, resultingNode);
@@ -407,13 +404,7 @@ class TsConverter {
       }
     }
     const functionReturnType = this.context.typeChecker.getTypeAtLocation(functionCall);
-    let syntheticNode = this.context.typeChecker.typeToTypeNode(functionReturnType, document, void 0);
-    if (ts.isArrowFunction(functionCall)) {
-      const syntheticWithParameters = __spreadProps(__spreadValues$1({}, syntheticNode), {
-        parameters: functionCall.parameters
-      });
-      syntheticNode = syntheticWithParameters;
-    }
+    const syntheticNode = this.context.typeChecker.typeToTypeNode(functionReturnType, document, void 0);
     if (syntheticNode) {
       if (ts.isTypeReferenceNode(syntheticNode) && ts.isIdentifier(syntheticNode.typeName)) {
         const { typeName } = syntheticNode;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@player-tools/xlr-converters",
-  "version": "0.3.0",
+  "version": "0.4.0--canary.25.709",
   "private": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
@@ -9,8 +9,9 @@
     "typescript": "4.8.4"
   },
   "dependencies": {
-    "@player-tools/xlr": "0.3.0",
-    "@player-tools/xlr-utils": "0.3.0",
+    "@player-tools/xlr": "0.4.0--canary.25.709",
+    "@player-tools/xlr-utils": "0.4.0--canary.25.709",
+    "@typescript/vfs": "^1.4.0",
     "@babel/runtime": "7.15.4"
   },
   "main": "dist/index.cjs.js",

package/src/ts-to-xlr.ts

@@ -177,7 +177,6 @@ export class TsConverter {
     const variableDeclarations = node.declarationList.declarations;
     if (variableDeclarations.length === 1) {
       const variable = variableDeclarations[0];
-
       if (variable.initializer) {
         let resultingNode;
         if (
@@ -192,13 +191,6 @@ export class TsConverter {
           resultingNode = this.tsLiteralToType(variable.initializer);
         }
 
-        // If resultingNode is a reference to a function or custom primitive and not a concrete value
-        // we need to update the name to be the name of the exporting variable
-        // not the name of the identifier its aliasing
-        if (resultingNode.type === 'function' || resultingNode.type === 'ref') {
-          resultingNode = { ...resultingNode, name: variable.name.getText() };
-        }
-
         return {
           name: variable.name.getText(),
           ...resultingNode,
@@ -637,22 +629,12 @@ export class TsConverter {
     const functionReturnType =
       this.context.typeChecker.getTypeAtLocation(functionCall);
 
-    let syntheticNode = this.context.typeChecker.typeToTypeNode(
+    const syntheticNode = this.context.typeChecker.typeToTypeNode(
       functionReturnType,
       document,
       undefined
     );
 
-    // Synthetic node loses parameter location information, and text making it unable
-    // to get the parameter name in tsNodeToType
-    if (ts.isArrowFunction(functionCall)) {
-      const syntheticWithParameters = {
-        ...syntheticNode,
-        parameters: functionCall.parameters,
-      };
-      syntheticNode = syntheticWithParameters as unknown as ts.TypeNode;
-    }
-
     if (syntheticNode) {
       if (
         ts.isTypeReferenceNode(syntheticNode) &&