nestjs-trpc 1.3.0 → 1.3.1

package/dist/generators/types/index.ts

@@ -0,0 +1,5 @@
+export type Context = { req: any; auth: { user: string; }; };
+
+export interface ProtectedMiddlewareContext extends Context {
+  ben: number;
+}

package/dist/utils/type.util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"type.util.d.ts","sourceRoot":"","sources":["../../lib/utils/type.util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAClD,OAAO,EAAE,0BAA0B,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAErG,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,SAAS,CAKjE;AAED,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,0BAA0B,GAAG,MAAM,CAarF;AAED,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,EAC7C,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,GACb,MAAM,CA+ER"}
+{"version":3,"file":"type.util.d.ts","sourceRoot":"","sources":["../../lib/utils/type.util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAClD,OAAO,EAAE,0BAA0B,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAErG,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,SAAS,CAKjE;AAED,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,0BAA0B,GAAG,MAAM,CAarF;AAED,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,EAC7C,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,GACb,MAAM,CA2FR"}

package/dist/utils/type.util.js

@@ -24,7 +24,7 @@ function flattenZodSchema(node, importsMap, sourceFile, schema) {
     if (ts_morph_1.Node.isIdentifier(node)) {
         const identifierName = node.getText();
         const identifierDeclaration = sourceFile.getVariableDeclaration(identifierName);
-        if (identifierDeclaration) {
+        if (identifierDeclaration != null) {
             const identifierInitializer = identifierDeclaration.getInitializer();
             if (identifierInitializer != null) {
                 const identifierSchema = flattenZodSchema(identifierInitializer, importsMap, sourceFile, identifierInitializer.getText());
@@ -58,6 +58,12 @@ function flattenZodSchema(node, importsMap, sourceFile, schema) {
         }
     }
     else if (ts_morph_1.Node.isCallExpression(node)) {
+        const expression = node.getExpression();
+        if (ts_morph_1.Node.isPropertyAccessExpression(expression) && !expression.getText().startsWith("z")) {
+            const baseSchema = flattenZodSchema(expression, importsMap, sourceFile, expression.getText());
+            const propertyName = expression.getName();
+            schema = schema.replace(expression.getText(), `${baseSchema}.${propertyName}`);
+        }
         for (const arg of node.getArguments()) {
             const argText = arg.getText();
             schema = schema.replace(argText, flattenZodSchema(arg, importsMap, sourceFile, argText));

package/lib/utils/type.util.ts

@@ -1,5 +1,8 @@
 import { Node, SourceFile, Type } from 'ts-morph';
-import { ProcedureGeneratorMetadata, SourceFileImportsMap } from '../interfaces/generator.interface';
+import {
+  ProcedureGeneratorMetadata,
+  SourceFileImportsMap,
+} from '../interfaces/generator.interface';
 
 export function findCtxOutProperty(type: Type): string | undefined {
   const typeText = type.getText();
@@ -8,9 +11,13 @@ export function findCtxOutProperty(type: Type): string | undefined {
   return ctxOutMatch ? ctxOutMatch[1].trim() : undefined;
 }
 
-export function generateProcedureString(procedure: ProcedureGeneratorMetadata): string {
+export function generateProcedureString(
+  procedure: ProcedureGeneratorMetadata,
+): string {
   const { name, decorators } = procedure;
-  const decorator = decorators.find(d => d.name === 'Mutation' || d.name === 'Query');
+  const decorator = decorators.find(
+    (d) => d.name === 'Mutation' || d.name === 'Query',
+  );
 
   if (!decorator) {
     return '';
@@ -31,25 +38,26 @@ export function flattenZodSchema(
 ): string {
   if (Node.isIdentifier(node)) {
     const identifierName = node.getText();
-    const identifierDeclaration = sourceFile.getVariableDeclaration(identifierName);
+    const identifierDeclaration =
+      sourceFile.getVariableDeclaration(identifierName);
 
-    if (identifierDeclaration) {
+    if (identifierDeclaration != null) {
       const identifierInitializer = identifierDeclaration.getInitializer();
 
-      if(identifierInitializer != null) {
+      if (identifierInitializer != null) {
         const identifierSchema = flattenZodSchema(
           identifierInitializer,
           importsMap,
           sourceFile,
           identifierInitializer.getText(),
         );
-  
+
         schema = schema.replace(identifierName, identifierSchema);
       }
     } else if (importsMap.has(identifierName)) {
       const importedIdentifier = importsMap.get(identifierName);
 
-      if(importedIdentifier != null) {
+      if (importedIdentifier != null) {
         const { initializer } = importedIdentifier;
         const identifierSchema = flattenZodSchema(
           initializer,
@@ -57,10 +65,9 @@ export function flattenZodSchema(
           importedIdentifier.sourceFile,
           initializer.getText(),
         );
-  
+
         schema = schema.replace(identifierName, identifierSchema);
       }
-
     }
   } else if (Node.isObjectLiteralExpression(node)) {
     for (const property of node.getProperties()) {
@@ -68,7 +75,7 @@ export function flattenZodSchema(
         const propertyText = property.getText();
         const propertyInitializer = property.getInitializer();
 
-        if( propertyInitializer != null) {
+        if (propertyInitializer != null) {
           schema = schema.replace(
             propertyText,
             flattenZodSchema(
@@ -90,6 +97,23 @@ export function flattenZodSchema(
       );
     }
   } else if (Node.isCallExpression(node)) {
+    const expression = node.getExpression();
+    if (
+      Node.isPropertyAccessExpression(expression) &&
+      !expression.getText().startsWith('z')
+    ) {
+      const baseSchema = flattenZodSchema(
+        expression,
+        importsMap,
+        sourceFile,
+        expression.getText(),
+      );
+      const propertyName = expression.getName();
+      schema = schema.replace(
+        expression.getText(),
+        `${baseSchema}.${propertyName}`,
+      );
+    }
     for (const arg of node.getArguments()) {
       const argText = arg.getText();
       schema = schema.replace(
@@ -107,4 +131,4 @@ export function flattenZodSchema(
   }
 
   return schema;
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nestjs-trpc",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "homepage": "https://nestjs-trpc.io",
   "main": "./dist/index.js",
   "types": "./lib/index.ts",