@player-tools/xlr-converters 0.1.0 → 0.2.0-next.0

package/dist/index.cjs.js

@@ -323,6 +323,7 @@ class TsConverter {
   handleHeritageClauses(clauses, baseObject, typeChecker) {
     let newProperties = {};
     let newAdditionalProperties = false;
+    let extendsType;
     clauses.forEach((heritageClause) => {
       var _a;
       const parent = heritageClause.types[0];
@@ -334,22 +335,26 @@ class TsConverter {
         parentInterface = parentInterface.parent;
       }
       if (parentInterface && xlrUtils.isTopLevelNode(parentInterface)) {
-        const parentInterfaceType = this.convertDeclaration(parentInterface);
-        if (parentInterface.typeParameters && parent.typeArguments) {
-          const filledInInterface = this.solveGenerics(parentInterfaceType, parentInterface.typeParameters, parent.typeArguments);
-          newProperties = filledInInterface.properties;
-          newAdditionalProperties = filledInInterface.additionalProperties;
+        if (this.context.customPrimitives.includes(parentInterface.name.text)) {
+          extendsType = this.makeBasicRefNode(parent);
         } else {
-          if (xlrUtils.isGenericNodeType(baseObject)) {
-            baseObject.genericTokens.push(...(_a = parentInterfaceType.genericTokens) != null ? _a : []);
+          const parentInterfaceType = this.convertDeclaration(parentInterface);
+          if (parentInterface.typeParameters && parent.typeArguments) {
+            const filledInInterface = this.solveGenerics(parentInterfaceType, parentInterface.typeParameters, parent.typeArguments);
+            newProperties = filledInInterface.properties;
+            newAdditionalProperties = filledInInterface.additionalProperties;
+          } else {
+            if (xlrUtils.isGenericNodeType(baseObject)) {
+              baseObject.genericTokens.push(...(_a = parentInterfaceType.genericTokens) != null ? _a : []);
+            }
+            newProperties = parentInterfaceType.properties;
+            newAdditionalProperties = parentInterfaceType.additionalProperties;
           }
-          newProperties = parentInterfaceType.properties;
-          newAdditionalProperties = parentInterfaceType.additionalProperties;
         }
       }
     });
     newAdditionalProperties = baseObject.additionalProperties === false ? newAdditionalProperties : false;
-    return __spreadProps(__spreadValues$1({}, baseObject), {
+    return __spreadProps(__spreadValues$1(__spreadValues$1({}, baseObject), extendsType ? { extends: extendsType } : {}), {
       properties: __spreadValues$1(__spreadValues$1({}, newProperties), baseObject.properties),
       additionalProperties: newAdditionalProperties
     });
@@ -455,9 +460,9 @@ class TsConverter {
       if (typeInfo) {
         const genericType = this.convertDeclaration(typeInfo.declaration);
         const genericParams = typeInfo.declaration.typeParameters;
-        const genericArgs2 = node.typeArguments;
-        if (genericType && genericParams && genericArgs2) {
-          return this.solveGenerics(genericType, genericParams, genericArgs2);
+        const genericArgs = node.typeArguments;
+        if (genericType && genericParams && genericArgs) {
+          return this.solveGenerics(genericType, genericParams, genericArgs);
         }
         if (genericType) {
           return genericType;
@@ -465,6 +470,9 @@ class TsConverter {
       }
       this.context.throwError(`Can't find referenced type ${refName}, is it available in the current package or node_modules?`);
     }
+    return this.makeBasicRefNode(node);
+  }
+  makeBasicRefNode(node) {
     const genericArgs = [];
     if (node.typeArguments) {
       node.typeArguments.forEach((typeArg) => {
@@ -477,7 +485,7 @@ class TsConverter {
         if (convertedNode) {
           genericArgs.push(convertedNode);
         } else {
-          this.context.throwError(`Conversion Error: Couldn't convert type argument in type ${refName}`);
+          this.context.throwError(`Conversion Error: Couldn't convert type argument in type ${node.getText()}`);
         }
       });
     }

package/dist/index.d.ts

@@ -40,6 +40,7 @@ declare class TsConverter {
     private solveGenerics;
     private generateGenerics;
     private resolveRefNode;
+    private makeBasicRefNode;
 }
 
 interface ConvertedType {

package/dist/index.esm.js

@@ -315,6 +315,7 @@ class TsConverter {
   handleHeritageClauses(clauses, baseObject, typeChecker) {
     let newProperties = {};
     let newAdditionalProperties = false;
+    let extendsType;
     clauses.forEach((heritageClause) => {
       var _a;
       const parent = heritageClause.types[0];
@@ -326,22 +327,26 @@ class TsConverter {
         parentInterface = parentInterface.parent;
       }
       if (parentInterface && isTopLevelNode(parentInterface)) {
-        const parentInterfaceType = this.convertDeclaration(parentInterface);
-        if (parentInterface.typeParameters && parent.typeArguments) {
-          const filledInInterface = this.solveGenerics(parentInterfaceType, parentInterface.typeParameters, parent.typeArguments);
-          newProperties = filledInInterface.properties;
-          newAdditionalProperties = filledInInterface.additionalProperties;
+        if (this.context.customPrimitives.includes(parentInterface.name.text)) {
+          extendsType = this.makeBasicRefNode(parent);
         } else {
-          if (isGenericNodeType(baseObject)) {
-            baseObject.genericTokens.push(...(_a = parentInterfaceType.genericTokens) != null ? _a : []);
+          const parentInterfaceType = this.convertDeclaration(parentInterface);
+          if (parentInterface.typeParameters && parent.typeArguments) {
+            const filledInInterface = this.solveGenerics(parentInterfaceType, parentInterface.typeParameters, parent.typeArguments);
+            newProperties = filledInInterface.properties;
+            newAdditionalProperties = filledInInterface.additionalProperties;
+          } else {
+            if (isGenericNodeType(baseObject)) {
+              baseObject.genericTokens.push(...(_a = parentInterfaceType.genericTokens) != null ? _a : []);
+            }
+            newProperties = parentInterfaceType.properties;
+            newAdditionalProperties = parentInterfaceType.additionalProperties;
           }
-          newProperties = parentInterfaceType.properties;
-          newAdditionalProperties = parentInterfaceType.additionalProperties;
         }
       }
     });
     newAdditionalProperties = baseObject.additionalProperties === false ? newAdditionalProperties : false;
-    return __spreadProps(__spreadValues$1({}, baseObject), {
+    return __spreadProps(__spreadValues$1(__spreadValues$1({}, baseObject), extendsType ? { extends: extendsType } : {}), {
       properties: __spreadValues$1(__spreadValues$1({}, newProperties), baseObject.properties),
       additionalProperties: newAdditionalProperties
     });
@@ -447,9 +452,9 @@ class TsConverter {
       if (typeInfo) {
         const genericType = this.convertDeclaration(typeInfo.declaration);
         const genericParams = typeInfo.declaration.typeParameters;
-        const genericArgs2 = node.typeArguments;
-        if (genericType && genericParams && genericArgs2) {
-          return this.solveGenerics(genericType, genericParams, genericArgs2);
+        const genericArgs = node.typeArguments;
+        if (genericType && genericParams && genericArgs) {
+          return this.solveGenerics(genericType, genericParams, genericArgs);
         }
         if (genericType) {
           return genericType;
@@ -457,6 +462,9 @@ class TsConverter {
       }
       this.context.throwError(`Can't find referenced type ${refName}, is it available in the current package or node_modules?`);
     }
+    return this.makeBasicRefNode(node);
+  }
+  makeBasicRefNode(node) {
     const genericArgs = [];
     if (node.typeArguments) {
       node.typeArguments.forEach((typeArg) => {
@@ -469,7 +477,7 @@ class TsConverter {
         if (convertedNode) {
           genericArgs.push(convertedNode);
         } else {
-          this.context.throwError(`Conversion Error: Couldn't convert type argument in type ${refName}`);
+          this.context.throwError(`Conversion Error: Couldn't convert type argument in type ${node.getText()}`);
         }
       });
     }

package/package.json

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

package/src/ts-to-xlr.ts

@@ -11,6 +11,7 @@ import type {
   AnyType,
   ParamTypeNode,
   ConditionalType,
+  RefType,
 } from '@player-tools/xlr';
 import type { TopLevelDeclaration } from '@player-tools/xlr-utils';
 import {
@@ -481,6 +482,7 @@ export class TsConverter {
   ): ObjectType {
     let newProperties: { [x: string]: ObjectProperty } = {};
     let newAdditionalProperties: NodeType | false = false;
+    let extendsType: RefType | undefined;
 
     clauses.forEach((heritageClause) => {
       const parent = heritageClause.types[0];
@@ -499,25 +501,29 @@ export class TsConverter {
       }
 
       if (parentInterface && isTopLevelNode(parentInterface)) {
-        const parentInterfaceType = this.convertDeclaration(parentInterface);
-        if (parentInterface.typeParameters && parent.typeArguments) {
-          const filledInInterface = this.solveGenerics(
-            parentInterfaceType as NodeTypeWithGenerics,
-            parentInterface.typeParameters,
-            parent.typeArguments
-          ) as NamedType<ObjectType>;
-          newProperties = filledInInterface.properties;
-          newAdditionalProperties = filledInInterface.additionalProperties;
+        if (this.context.customPrimitives.includes(parentInterface.name.text)) {
+          extendsType = this.makeBasicRefNode(parent);
         } else {
-          if (isGenericNodeType(baseObject)) {
-            baseObject.genericTokens.push(
-              ...((parentInterfaceType as NodeTypeWithGenerics).genericTokens ??
-                [])
-            );
+          const parentInterfaceType = this.convertDeclaration(parentInterface);
+          if (parentInterface.typeParameters && parent.typeArguments) {
+            const filledInInterface = this.solveGenerics(
+              parentInterfaceType as NodeTypeWithGenerics,
+              parentInterface.typeParameters,
+              parent.typeArguments
+            ) as NamedType<ObjectType>;
+            newProperties = filledInInterface.properties;
+            newAdditionalProperties = filledInInterface.additionalProperties;
+          } else {
+            if (isGenericNodeType(baseObject)) {
+              baseObject.genericTokens.push(
+                ...((parentInterfaceType as NodeTypeWithGenerics)
+                  .genericTokens ?? [])
+              );
+            }
+
+            newProperties = parentInterfaceType.properties;
+            newAdditionalProperties = parentInterfaceType.additionalProperties;
           }
-
-          newProperties = parentInterfaceType.properties;
-          newAdditionalProperties = parentInterfaceType.additionalProperties;
         }
       }
     });
@@ -527,6 +533,7 @@ export class TsConverter {
         : false;
     return {
       ...baseObject,
+      ...(extendsType ? { extends: extendsType } : {}),
       properties: { ...newProperties, ...baseObject.properties },
       additionalProperties: newAdditionalProperties,
     };
@@ -695,6 +702,10 @@ export class TsConverter {
       );
     }
 
+    return this.makeBasicRefNode(node);
+  }
+
+  private makeBasicRefNode(node: ts.NodeWithTypeArguments): RefType {
     const genericArgs: Array<NodeType | NamedType<ObjectType>> = [];
     if (node.typeArguments) {
       node.typeArguments.forEach((typeArg) => {
@@ -709,7 +720,7 @@ export class TsConverter {
           genericArgs.push(convertedNode);
         } else {
           this.context.throwError(
-            `Conversion Error: Couldn't convert type argument in type ${refName}`
+            `Conversion Error: Couldn't convert type argument in type ${node.getText()}`
           );
         }
       });