@travetto/transformer 3.0.0-rc.16 → 3.0.0-rc.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/transformer",
-  "version": "3.0.0-rc.16",
+  "version": "3.0.0-rc.18",
   "description": "Functionality for AST transformations, with transformer registration, and general utils",
   "keywords": [
     "typescript",
@@ -24,7 +24,7 @@
     "directory": "module/transformer"
   },
   "dependencies": {
-    "@travetto/manifest": "^3.0.0-rc.13",
+    "@travetto/manifest": "^3.0.0-rc.14",
     "tslib": "^2.5.0",
     "typescript": "^4.9.5"
   },

package/src/importer.ts

@@ -26,7 +26,7 @@ export class ImportManager {
   constructor(public source: ts.SourceFile, public factory: ts.NodeFactory, resolver: TransformResolver) {
     this.#imports = ImportUtil.collectImports(source);
     this.#resolver = resolver;
-    this.#importName = this.#resolver.getImportName(source.fileName);
+    this.#importName = this.#resolver.getFileImportName(source.fileName);
   }
 
   #getImportFile(spec?: ts.Expression): string | undefined {
@@ -101,7 +101,7 @@ export class ImportManager {
    * Import a file if needed, and record it's identifier
    */
   importFile(file: string, name?: string): Import {
-    file = this.#resolver.getImportName(file);
+    file = this.#resolver.getFileImportName(file);
 
     // Allow for node classes to be imported directly
     if (/@types\/node/.test(file)) {

package/src/resolver/builder.ts

@@ -145,7 +145,7 @@ export const TypeBuilder: {
   external: {
     build: (resolver, type) => {
       const name = CoreUtil.getSymbol(type)?.getName();
-      const importName = resolver.getImportName(type);
+      const importName = resolver.getTypeImportName(type)!;
       const tsTypeArguments = resolver.getAllTypeArguments(type);
       return { key: 'external', name, importName, tsTypeArguments };
     }
@@ -180,9 +180,14 @@ export const TypeBuilder: {
     build: (resolver, type, alias?) => {
       const tsFieldTypes: Record<string, ts.Type> = {};
       const name = CoreUtil.getSymbol(alias ?? type)?.getName();
-      const importName = resolver.getImportName(type);
+      const importName = resolver.getTypeImportName(type) ?? '<unknown>';
       const tsTypeArguments = resolver.getAllTypeArguments(type);
-      for (const member of resolver.getPropertiesOfType(type)) {
+      const props = resolver.getPropertiesOfType(type);
+      if (props.length === 0) {
+        return { key: 'unknown', name, importName };
+      }
+
+      for (const member of props) {
         const dec = DeclarationUtil.getPrimaryDeclarationNode(member);
         if (DeclarationUtil.isPublic(dec)) { // If public
           const memberType = resolver.getType(dec);
@@ -215,10 +220,10 @@ export const TypeBuilder: {
             ?.getSourceFile().fileName ?? '';
 
           if (importName === '.') {
-            importName = resolver.getImportName(rawSourceFile);
+            importName = resolver.getFileImportName(rawSourceFile);
           } else {
             const base = path.dirname(rawSourceFile);
-            importName = resolver.getImportName(path.resolve(base, importName));
+            importName = resolver.getFileImportName(path.resolve(base, importName));
           }
         }
         return { key: 'external', name, importName };

package/src/resolver/service.ts

@@ -29,11 +29,10 @@ export class SimpleResolver implements TransformResolver {
   }
 
   /**
-   * Resolve an import name (e.g. @module/path/file) for a given input or type
+   * Resolve an import name (e.g. @module/path/file) for a file
    */
-  getImportName(fileOrType: string | ts.Type, removeExt?: boolean): string {
-    const ogSource = typeof fileOrType === 'string' ? fileOrType : DeclarationUtil.getPrimaryDeclarationNode(fileOrType).getSourceFile().fileName;
-    let sourceFile = path.toPosix(ogSource);
+  getFileImportName(file: string, removeExt?: boolean): string {
+    let sourceFile = path.toPosix(file);
 
     if (!sourceFile.endsWith('.js') && !sourceFile.endsWith('.ts')) {
       sourceFile = `${sourceFile}.ts`;
@@ -42,11 +41,19 @@ export class SimpleResolver implements TransformResolver {
     const imp =
       this.#manifestIndex.getEntry(/[.]ts$/.test(sourceFile) ? sourceFile : `${sourceFile}.js`)?.import ??
       this.#manifestIndex.getFromImport(sourceFile.replace(/^.*node_modules\//, '').replace(/[.]ts$/, ''))?.import ??
-      ogSource;
+      file;
 
     return removeExt ? imp.replace(/[.]js$/, '') : imp;
   }
 
+  /**
+   * Resolve an import name (e.g. @module/path/file) for a type
+   */
+  getTypeImportName(type: ts.Type, removeExt?: boolean): string | undefined {
+    const ogSource = DeclarationUtil.getPrimaryDeclarationNode(type)?.getSourceFile()?.fileName;
+    return ogSource ? this.getFileImportName(ogSource, removeExt) : undefined;
+  }
+
   /**
    * Is the file/import known to the index, helpful for determine ownership
    */
@@ -97,7 +104,7 @@ export class SimpleResolver implements TransformResolver {
   /**
    * Resolve an `AnyType` from a `ts.Type` or a `ts.Node`
    */
-  resolveType(node: ts.Type | ts.Node): AnyType {
+  resolveType(node: ts.Type | ts.Node, importName: string): AnyType {
     const visited = new VisitCache();
     const resolve = (resType: ts.Type, alias?: ts.Symbol, depth = 0): AnyType => {
 
@@ -149,7 +156,7 @@ export class SimpleResolver implements TransformResolver {
       if (!(err instanceof Error)) {
         throw err;
       }
-      console.error('Unable to resolve type', err.stack);
+      console.error(`Unable to resolve type in ${importName}`, err.stack);
       return { key: 'literal', ctor: Object, name: 'object' };
     }
   }

package/src/resolver/types.ts

@@ -153,7 +153,8 @@ export type AnyType = TupleType | ShapeType | UnionType | LiteralType | External
  */
 export interface TransformResolver {
   isKnownFile(file: string): boolean;
-  getImportName(fileOrType: string | ts.Type, removeExt?: boolean): string;
+  getFileImportName(file: string, removeExt?: boolean): string;
+  getTypeImportName(type: ts.Type, removeExt?: boolean): string | undefined;
   getAllTypeArguments(type: ts.Type): ts.Type[];
   getPropertiesOfType(type: ts.Type): ts.Symbol[];
   getTypeAsString(type: ts.Type): string | undefined;

package/src/state.ts

@@ -47,7 +47,7 @@ export class TransformerState implements State {
     this.#imports = new ImportManager(source, factory, this.#resolver);
     this.file = path.toPosix(this.source.fileName);
 
-    this.importName = this.#resolver.getImportName(this.file, true);
+    this.importName = this.#resolver.getFileImportName(this.file, true);
   }
 
   /**
@@ -68,7 +68,7 @@ export class TransformerState implements State {
    * Resolve an `AnyType` from a `ts.Type` or `ts.Node`
    */
   resolveType(node: ts.Type | ts.Node): AnyType {
-    const resolved = this.#resolver.resolveType(node);
+    const resolved = this.#resolver.resolveType(node, this.importName);
     this.#imports.importFromResolved(resolved);
     return resolved;
   }
@@ -80,7 +80,7 @@ export class TransformerState implements State {
     const resolved = this.resolveType(node);
     if (resolved.key !== 'external') {
       const file = node.getSourceFile().fileName;
-      const src = this.#resolver.getImportName(file);
+      const src = this.#resolver.getFileImportName(file);
       throw new Error(`Unable to import non-external type: ${node.getText()} ${resolved.key}: ${src}`);
     }
     return resolved;
@@ -147,7 +147,7 @@ export class TransformerState implements State {
       this.#resolver.getType(ident)
     );
     const src = decl?.getSourceFile().fileName;
-    const mod = src ? this.#resolver.getImportName(src, true) : undefined;
+    const mod = src ? this.#resolver.getFileImportName(src, true) : undefined;
     const file = this.#manifestIndex.getFromImport(mod ?? '')?.outputFile;
     const targets = DocUtil.readAugments(this.#resolver.getType(ident));
     const module = file ? mod : undefined;
@@ -266,7 +266,7 @@ export class TransformerState implements State {
     if (this.#fileIdent === undefined) {
       this.#fileIdent = this.createIdentifier('ᚕf');
       const decl = this.factory.createVariableDeclaration(this.#fileIdent, undefined, undefined,
-        this.fromLiteral(this.#resolver.getImportName(this.source.fileName) ?? this.source.fileName)
+        this.fromLiteral(this.#resolver.getFileImportName(this.source.fileName) ?? this.source.fileName)
       );
       this.addStatements([
         this.factory.createVariableStatement([], this.factory.createVariableDeclarationList([decl]))