@sdk-it/generic 0.8.1 → 0.8.2

package/dist/index.js

@@ -128,13 +128,19 @@ async function analyze(tsconfigPath, config) {
     commonZodImport: config.commonZodImport,
     onOperation: config.onOperation
   });
+  const responseAnalyzer2 = config.responseAnalyzer;
+  if (typeof responseAnalyzer2 !== "function") {
+    throw new Error(
+      `responseAnalyzer must be a function, got ${typeof config.responseAnalyzer}`
+    );
+  }
   for (const sourceFile of program.getSourceFiles()) {
     logger(`Analyzing ${sourceFile.fileName}`);
     if (!sourceFile.isDeclarationFile) {
       logger(`Visiting ${sourceFile.fileName}`);
       visit(
         sourceFile,
-        (handler) => config.responseAnalyzer(handler, typeDeriver),
+        (handler) => responseAnalyzer2(handler, typeDeriver),
         paths
       );
     }
@@ -153,7 +159,7 @@ async function analyze(tsconfigPath, config) {
 
 // packages/generic/src/lib/response-analyzer.ts
 import ts2 from "typescript";
-var visitor = (callback) => {
+var handlerVisitor = (callback) => {
   return (node) => {
     if (ts2.isReturnStatement(node) && node.expression) {
       if (ts2.isCallExpression(node.expression) && ts2.isPropertyAccessExpression(node.expression.expression)) {
@@ -172,12 +178,12 @@ var visitor = (callback) => {
         }
       }
     }
-    return ts2.forEachChild(node, visitor(callback));
+    return ts2.forEachChild(node, handlerVisitor(callback));
   };
 };
 function toResponses(handler, deriver) {
   const responsesList = [];
-  const visit2 = visitor((node, statusCode, headers, contentType) => {
+  const visit2 = handlerVisitor((node, statusCode, headers, contentType) => {
     responsesList.push({
       headers: headers ? Object.keys(deriver.serializeNode(headers)) : [],
       contentType,

package/dist/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/lib/generic.ts", "../src/lib/response-analyzer.ts"],
-  "sourcesContent": ["import debug from 'debug';\nimport type { ComponentsObject } from 'openapi3-ts/oas31';\nimport { camelcase } from 'stringcase';\nimport ts from 'typescript';\n\nimport {\n  type OnOperation,\n  Paths,\n  type ResponseItem,\n  type Selector,\n  type SemanticSource,\n  TypeDeriver,\n  getProgram,\n  isCallExpression,\n  isHttpMethod,\n  toSchema,\n} from '@sdk-it/core';\n\nconst logger = debug('@sdk-it/generic');\n\nconst jsDocsTags = ['openapi', 'tags', 'description'];\n\nfunction parseJSDocComment(node: ts.Node) {\n  let tags: string[] = [];\n  let name = '';\n  let description = '';\n  for (const tag of ts.getAllJSDocTags(node, (tag): tag is ts.JSDocTag =>\n    jsDocsTags.includes(tag.tagName.text),\n  )) {\n    if (typeof tag.comment !== 'string') {\n      continue;\n    }\n    switch (tag.tagName.text) {\n      case 'openapi':\n        name = tag.comment;\n        break;\n      case 'tags':\n        tags = tag.comment.split(',').map((tag) => tag.trim());\n        break;\n      case 'description':\n        description = tag.comment;\n        break;\n    }\n  }\n  return {\n    name,\n    tags,\n    description,\n  };\n}\n\nfunction visit(\n  node: ts.Node,\n  responseAnalyzer: (handler: ts.ArrowFunction) => ResponseItem[],\n  paths: Paths,\n) {\n  if (!ts.isCallExpression(node) || node.arguments.length < 2) {\n    return moveOn();\n  }\n  if (\n    !ts.isPropertyAccessExpression(node.expression) ||\n    !ts.isIdentifier(node.expression.name) ||\n    !isHttpMethod(node.expression.name.text)\n  ) {\n    return moveOn();\n  }\n\n  const [pathNode] = node.arguments;\n  if (!ts.isStringLiteral(pathNode)) {\n    return moveOn();\n  }\n  const method = node.expression.name.text;\n  const path = pathNode.text;\n  const validate = node.arguments.find((arg) =>\n    isCallExpression(arg, 'validate'),\n  );\n  if (!validate) {\n    return moveOn();\n  }\n  const handler = node.arguments.at(-1);\n  if (!handler || !ts.isArrowFunction(handler)) {\n    return moveOn();\n  }\n\n  const metadata = parseJSDocComment(node.parent);\n  const operationName =\n    metadata.name ||\n    camelcase(`${method} ${path.replace(/[^a-zA-Z0-9]/g, '')}`);\n  const selector = validate.arguments.find((arg) => ts.isArrowFunction(arg));\n  if (\n    !selector ||\n    !ts.isParenthesizedExpression(selector.body) ||\n    !ts.isObjectLiteralExpression(selector.body.expression)\n  ) {\n    return moveOn();\n  }\n  const props = selector.body.expression.properties.filter(\n    ts.isPropertyAssignment,\n  );\n\n  const sourceFile = node.getSourceFile();\n  paths.addPath(\n    operationName,\n    path,\n    method,\n    toSelectors(props),\n    responseAnalyzer(handler),\n    sourceFile.fileName,\n    metadata.tags,\n    metadata.description,\n  );\n\n  function moveOn() {\n    ts.forEachChild(node, (node) => visit(node, responseAnalyzer, paths));\n  }\n}\n\nfunction toSelectors(props: ts.PropertyAssignment[]) {\n  const selectors: Selector[] = [];\n  for (const prop of props) {\n    if (!ts.isObjectLiteralExpression(prop.initializer)) {\n      continue;\n    }\n    const name = prop.name.getText();\n    const select = prop.initializer.properties\n      .filter(ts.isPropertyAssignment)\n      .find((prop) => prop.name.getText() === 'select');\n    if (!select) {\n      console.warn(`No select found in ${name}`);\n      continue;\n    }\n    const against = prop.initializer.properties\n      .filter(ts.isPropertyAssignment)\n      .find((prop) => prop.name.getText() === 'against');\n    if (!against) {\n      console.warn(`No against found in ${name}`);\n      continue;\n    }\n    const [, source, selectText] = select.initializer.getText().split('.');\n    selectors.push({\n      name,\n      nullable: against.initializer.getText().includes('nullable'),\n      required: !against.initializer.getText().includes('optional'),\n      select: selectText,\n      against: against.initializer.getText(),\n      source: source as SemanticSource,\n    });\n  }\n  return selectors;\n}\n\nexport async function analyze(\n  tsconfigPath: string,\n  config: {\n    /**\n     * Additional code to inject before resolving zod schemas\n     */\n    commonZodImport?: string;\n    responseAnalyzer: (\n      handler: ts.ArrowFunction,\n      deriver: TypeDeriver,\n    ) => ResponseItem[];\n    onOperation?: OnOperation;\n  },\n) {\n  logger(`Parsing tsconfig`);\n  const program = getProgram(tsconfigPath);\n  logger(`Program created`);\n  const typeChecker = program.getTypeChecker();\n  logger(`Type checker created`);\n  const typeDeriver = new TypeDeriver(typeChecker);\n  const paths = new Paths({\n    commonZodImport: config.commonZodImport,\n    onOperation: config.onOperation,\n  });\n  for (const sourceFile of program.getSourceFiles()) {\n    logger(`Analyzing ${sourceFile.fileName}`);\n    if (!sourceFile.isDeclarationFile) {\n      logger(`Visiting ${sourceFile.fileName}`);\n      visit(\n        sourceFile,\n        (handler) => config.responseAnalyzer(handler, typeDeriver),\n        paths,\n      );\n    }\n  }\n  // const file = program.getSourceFile(\n  //   'apps/api/src/app/features/projects/get-secrets.route.ts',\n  // );\n  // visit(\n  //   file!,\n  //   (handler) => config.responseAnalyzer(handler, typeDeriver),\n  //   paths,\n  // );\n\n  const components: ComponentsObject = {\n    schemas: Object.entries(typeDeriver.collector).reduce(\n      (acc, [key, value]) => ({ ...acc, [key]: toSchema(value) }),\n      {},\n    ),\n  };\n\n  return {\n    paths: await paths.getPaths(),\n    components,\n  };\n}\n\nexport type Serialized = ReturnType<typeof analyze>;\n", "import ts from 'typescript';\n\nimport type { ResponseItem, TypeDeriver } from '@sdk-it/core';\n\nconst visitor: (\n  on: (\n    node: ts.Node,\n    statusCode: ts.Node | undefined,\n    headers: ts.Node | undefined,\n    contentType: string,\n  ) => void,\n) => ts.Visitor = (callback) => {\n  return (node: ts.Node) => {\n    if (ts.isReturnStatement(node) && node.expression) {\n      if (\n        ts.isCallExpression(node.expression) &&\n        ts.isPropertyAccessExpression(node.expression.expression)\n      ) {\n        const propAccess = node.expression.expression;\n        if (\n          ts.isIdentifier(propAccess.expression) &&\n          propAccess.expression.text === 'output'\n        ) {\n          let contentType = 'application/json';\n          const callerMethod = propAccess.name.text;\n          const [body, statusCode, headers] = node.expression.arguments;\n          if (callerMethod === 'attachment') {\n            contentType = 'application/octet-stream';\n          }\n          if (!body) {\n            contentType = 'empty';\n          }\n          callback(body, statusCode, headers, contentType);\n        }\n      }\n    }\n    return ts.forEachChild(node, visitor(callback));\n  };\n};\n\nfunction toResponses(handler: ts.ArrowFunction, deriver: TypeDeriver) {\n  const responsesList: ResponseItem[] = [];\n  const visit = visitor((node, statusCode, headers, contentType) => {\n    responsesList.push({\n      headers: headers ? Object.keys(deriver.serializeNode(headers)) : [],\n      contentType,\n      statusCode: statusCode ? resolveStatusCode(statusCode) : '200',\n      response: node ? deriver.serializeNode(node) : undefined,\n    });\n  });\n  visit(handler.body);\n  return responsesList;\n}\n\nfunction resolveStatusCode(node: ts.Node) {\n  if (ts.isNumericLiteral(node)) {\n    return node.text;\n  }\n  throw new Error(`Could not resolve status code`);\n}\n\nexport function responseAnalyzer(\n  handler: ts.ArrowFunction,\n  deriver: TypeDeriver,\n) {\n  try {\n    return toResponses(handler, deriver);\n  } catch (error) {\n    console.error('Error analyzing response\\n', handler.getText());\n    throw error;\n  }\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import debug from 'debug';\nimport type { ComponentsObject } from 'openapi3-ts/oas31';\nimport { camelcase } from 'stringcase';\nimport ts from 'typescript';\n\nimport {\n  type OnOperation,\n  Paths,\n  type ResponseItem,\n  type Selector,\n  type SemanticSource,\n  TypeDeriver,\n  getProgram,\n  isCallExpression,\n  isHttpMethod,\n  toSchema,\n} from '@sdk-it/core';\n\nconst logger = debug('@sdk-it/generic');\n\nconst jsDocsTags = ['openapi', 'tags', 'description'];\n\nfunction parseJSDocComment(node: ts.Node) {\n  let tags: string[] = [];\n  let name = '';\n  let description = '';\n  for (const tag of ts.getAllJSDocTags(node, (tag): tag is ts.JSDocTag =>\n    jsDocsTags.includes(tag.tagName.text),\n  )) {\n    if (typeof tag.comment !== 'string') {\n      continue;\n    }\n    switch (tag.tagName.text) {\n      case 'openapi':\n        name = tag.comment;\n        break;\n      case 'tags':\n        tags = tag.comment.split(',').map((tag) => tag.trim());\n        break;\n      case 'description':\n        description = tag.comment;\n        break;\n    }\n  }\n  return {\n    name,\n    tags,\n    description,\n  };\n}\n\nfunction visit(\n  node: ts.Node,\n  responseAnalyzer: (handler: ts.ArrowFunction) => ResponseItem[],\n  paths: Paths,\n) {\n  if (!ts.isCallExpression(node) || node.arguments.length < 2) {\n    return moveOn();\n  }\n  if (\n    !ts.isPropertyAccessExpression(node.expression) ||\n    !ts.isIdentifier(node.expression.name) ||\n    !isHttpMethod(node.expression.name.text)\n  ) {\n    return moveOn();\n  }\n\n  const [pathNode] = node.arguments;\n  if (!ts.isStringLiteral(pathNode)) {\n    return moveOn();\n  }\n  const method = node.expression.name.text;\n  const path = pathNode.text;\n  const validate = node.arguments.find((arg) =>\n    isCallExpression(arg, 'validate'),\n  );\n  if (!validate) {\n    return moveOn();\n  }\n  const handler = node.arguments.at(-1);\n  if (!handler || !ts.isArrowFunction(handler)) {\n    return moveOn();\n  }\n\n  const metadata = parseJSDocComment(node.parent);\n  const operationName =\n    metadata.name ||\n    camelcase(`${method} ${path.replace(/[^a-zA-Z0-9]/g, '')}`);\n  const selector = validate.arguments.find((arg) => ts.isArrowFunction(arg));\n  if (\n    !selector ||\n    !ts.isParenthesizedExpression(selector.body) ||\n    !ts.isObjectLiteralExpression(selector.body.expression)\n  ) {\n    return moveOn();\n  }\n  const props = selector.body.expression.properties.filter(\n    ts.isPropertyAssignment,\n  );\n\n  const sourceFile = node.getSourceFile();\n  paths.addPath(\n    operationName,\n    path,\n    method,\n    toSelectors(props),\n    responseAnalyzer(handler),\n    sourceFile.fileName,\n    metadata.tags,\n    metadata.description,\n  );\n\n  function moveOn() {\n    ts.forEachChild(node, (node) => visit(node, responseAnalyzer, paths));\n  }\n}\n\nfunction toSelectors(props: ts.PropertyAssignment[]) {\n  const selectors: Selector[] = [];\n  for (const prop of props) {\n    if (!ts.isObjectLiteralExpression(prop.initializer)) {\n      continue;\n    }\n    const name = prop.name.getText();\n    const select = prop.initializer.properties\n      .filter(ts.isPropertyAssignment)\n      .find((prop) => prop.name.getText() === 'select');\n    if (!select) {\n      console.warn(`No select found in ${name}`);\n      continue;\n    }\n    const against = prop.initializer.properties\n      .filter(ts.isPropertyAssignment)\n      .find((prop) => prop.name.getText() === 'against');\n    if (!against) {\n      console.warn(`No against found in ${name}`);\n      continue;\n    }\n    const [, source, selectText] = select.initializer.getText().split('.');\n    selectors.push({\n      name,\n      nullable: against.initializer.getText().includes('nullable'),\n      required: !against.initializer.getText().includes('optional'),\n      select: selectText,\n      against: against.initializer.getText(),\n      source: source as SemanticSource,\n    });\n  }\n  return selectors;\n}\ntype NaunceResponseAnalyzer = Record<string, ts.Node>;\n\ntype ResponseAnalyzer = (\n  handler: ts.ArrowFunction,\n  deriver: TypeDeriver,\n) => ResponseItem[];\n\nexport async function analyze(\n  tsconfigPath: string,\n  config: {\n    /**\n     * Additional code to inject before resolving zod schemas\n     */\n    commonZodImport?: string;\n    responseAnalyzer: ResponseAnalyzer | NaunceResponseAnalyzer;\n    onOperation?: OnOperation;\n  },\n) {\n  logger(`Parsing tsconfig`);\n  const program = getProgram(tsconfigPath);\n  logger(`Program created`);\n  const typeChecker = program.getTypeChecker();\n  logger(`Type checker created`);\n  const typeDeriver = new TypeDeriver(typeChecker);\n  const paths = new Paths({\n    commonZodImport: config.commonZodImport,\n    onOperation: config.onOperation,\n  });\n  const responseAnalyzer = config.responseAnalyzer;\n  if (typeof responseAnalyzer !== 'function') {\n    throw new Error(\n      `responseAnalyzer must be a function, got ${typeof config.responseAnalyzer}`,\n    );\n  }\n  for (const sourceFile of program.getSourceFiles()) {\n    logger(`Analyzing ${sourceFile.fileName}`);\n    if (!sourceFile.isDeclarationFile) {\n      logger(`Visiting ${sourceFile.fileName}`);\n      visit(\n        sourceFile,\n        (handler) => responseAnalyzer(handler, typeDeriver),\n        paths,\n      );\n    }\n  }\n\n  const components: ComponentsObject = {\n    schemas: Object.entries(typeDeriver.collector).reduce(\n      (acc, [key, value]) => ({ ...acc, [key]: toSchema(value) }),\n      {},\n    ),\n  };\n\n  return {\n    paths: await paths.getPaths(),\n    components,\n  };\n}\n\nexport type Serialized = ReturnType<typeof analyze>;\n", "import ts from 'typescript';\n\nimport type { ResponseItem, TypeDeriver } from '@sdk-it/core';\n\nconst handlerVisitor: (\n  on: (\n    node: ts.Node | undefined,\n    statusCode: ts.Node | undefined,\n    headers: ts.Node | undefined,\n    contentType: string,\n  ) => void,\n) => ts.Visitor = (callback) => {\n  return (node: ts.Node) => {\n    if (ts.isReturnStatement(node) && node.expression) {\n      if (\n        ts.isCallExpression(node.expression) &&\n        ts.isPropertyAccessExpression(node.expression.expression)\n      ) {\n        const propAccess = node.expression.expression;\n        if (\n          ts.isIdentifier(propAccess.expression) &&\n          propAccess.expression.text === 'output'\n        ) {\n          let contentType = 'application/json';\n          const callerMethod = propAccess.name.text;\n          const [body, statusCode, headers] = node.expression.arguments;\n          if (callerMethod === 'attachment') {\n            contentType = 'application/octet-stream';\n          }\n          if (!body) {\n            contentType = 'empty';\n          }\n          callback(body, statusCode, headers, contentType);\n        }\n      }\n    }\n    return ts.forEachChild(node, handlerVisitor(callback));\n  };\n};\n\nfunction toResponses(handler: ts.ArrowFunction, deriver: TypeDeriver) {\n  const responsesList: ResponseItem[] = [];\n  const visit = handlerVisitor((node, statusCode, headers, contentType) => {\n    responsesList.push({\n      headers: headers ? Object.keys(deriver.serializeNode(headers)) : [],\n      contentType,\n      statusCode: statusCode ? resolveStatusCode(statusCode) : '200',\n      response: node ? deriver.serializeNode(node) : undefined,\n    });\n  });\n  visit(handler.body);\n  return responsesList;\n}\n\nfunction resolveStatusCode(node: ts.Node) {\n  if (ts.isNumericLiteral(node)) {\n    return node.text;\n  }\n  throw new Error(`Could not resolve status code`);\n}\n\nexport function responseAnalyzer(\n  handler: ts.ArrowFunction,\n  deriver: TypeDeriver,\n) {\n  try {\n    return toResponses(handler, deriver);\n  } catch (error) {\n    console.error('Error analyzing response\\n', handler.getText());\n    throw error;\n  }\n}\n"],
+  "mappings": "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",
   "names": ["tag", "responseAnalyzer", "node", "prop", "ts", "visit"]
 }

package/dist/lib/generic.d.ts

@@ -1,16 +1,19 @@
 import type { ComponentsObject } from 'openapi3-ts/oas31';
 import ts from 'typescript';
 import { type OnOperation, type ResponseItem, TypeDeriver } from '@sdk-it/core';
+type NaunceResponseAnalyzer = Record<string, ts.Node>;
+type ResponseAnalyzer = (handler: ts.ArrowFunction, deriver: TypeDeriver) => ResponseItem[];
 export declare function analyze(tsconfigPath: string, config: {
     /**
      * Additional code to inject before resolving zod schemas
      */
     commonZodImport?: string;
-    responseAnalyzer: (handler: ts.ArrowFunction, deriver: TypeDeriver) => ResponseItem[];
+    responseAnalyzer: ResponseAnalyzer | NaunceResponseAnalyzer;
     onOperation?: OnOperation;
 }): Promise<{
     paths: import("openapi3-ts/oas31").PathsObject;
     components: ComponentsObject;
 }>;
 export type Serialized = ReturnType<typeof analyze>;
+export {};
 //# sourceMappingURL=generic.d.ts.map

package/dist/lib/generic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generic.d.ts","sourceRoot":"","sources":["../../src/lib/generic.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAE1D,OAAO,EAAE,MAAM,YAAY,CAAC;AAE5B,OAAO,EACL,KAAK,WAAW,EAEhB,KAAK,YAAY,EAGjB,WAAW,EAKZ,MAAM,cAAc,CAAC;AAuItB,wBAAsB,OAAO,CAC3B,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE;IACN;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAE,CAChB,OAAO,EAAE,EAAE,CAAC,aAAa,EACzB,OAAO,EAAE,WAAW,KACjB,YAAY,EAAE,CAAC;IACpB,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B;;;GA2CF;AAED,MAAM,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,OAAO,CAAC,CAAC"}
+{"version":3,"file":"generic.d.ts","sourceRoot":"","sources":["../../src/lib/generic.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAE1D,OAAO,EAAE,MAAM,YAAY,CAAC;AAE5B,OAAO,EACL,KAAK,WAAW,EAEhB,KAAK,YAAY,EAGjB,WAAW,EAKZ,MAAM,cAAc,CAAC;AAsItB,KAAK,sBAAsB,GAAG,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;AAEtD,KAAK,gBAAgB,GAAG,CACtB,OAAO,EAAE,EAAE,CAAC,aAAa,EACzB,OAAO,EAAE,WAAW,KACjB,YAAY,EAAE,CAAC;AAEpB,wBAAsB,OAAO,CAC3B,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE;IACN;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAE,gBAAgB,GAAG,sBAAsB,CAAC;IAC5D,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B;;;GAyCF;AAED,MAAM,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,OAAO,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sdk-it/generic",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -21,7 +21,7 @@
     "!**/*.tsbuildinfo"
   ],
   "dependencies": {
-    "@sdk-it/core": "0.8.1",
+    "@sdk-it/core": "0.8.2",
     "stringcase": "^4.3.1",
     "typescript": "^5.7.2",
     "debug": "^4.4.0",