@player-tools/xlr-converters 0.3.0-next.2 → 0.3.1-next.0

package/dist/index.cjs.js

@@ -120,6 +120,9 @@ 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);
@@ -302,7 +305,7 @@ class TsConverter {
     }
     if (ts__default["default"].isTypeQueryNode(node)) {
       const effectiveType = this.context.typeChecker.getTypeAtLocation(node);
-      const syntheticType = this.context.typeChecker.typeToTypeNode(effectiveType, node, void 0);
+      const syntheticType = this.context.typeChecker.typeToTypeNode(effectiveType, node, ts__default["default"].NodeBuilderFlags.NoTruncation);
       if (syntheticType) {
         return this.tsNodeToType(syntheticType);
       }

package/dist/index.esm.js

@@ -112,6 +112,9 @@ 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);
@@ -294,7 +297,7 @@ class TsConverter {
     }
     if (ts.isTypeQueryNode(node)) {
       const effectiveType = this.context.typeChecker.getTypeAtLocation(node);
-      const syntheticType = this.context.typeChecker.typeToTypeNode(effectiveType, node, void 0);
+      const syntheticType = this.context.typeChecker.typeToTypeNode(effectiveType, node, ts.NodeBuilderFlags.NoTruncation);
       if (syntheticType) {
         return this.tsNodeToType(syntheticType);
       }

package/package.json

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

package/src/ts-to-xlr.ts

@@ -177,6 +177,7 @@ export class TsConverter {
     const variableDeclarations = node.declarationList.declarations;
     if (variableDeclarations.length === 1) {
       const variable = variableDeclarations[0];
+
       if (variable.initializer) {
         let resultingNode;
         if (
@@ -191,6 +192,13 @@ 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,
@@ -461,7 +469,7 @@ export class TsConverter {
       const syntheticType = this.context.typeChecker.typeToTypeNode(
         effectiveType,
         node,
-        undefined
+        ts.NodeBuilderFlags.NoTruncation
       );
       if (syntheticType) {
         return this.tsNodeToType(syntheticType);