@ciderjs/gasnuki 0.2.4 → 0.2.6

package/README.ja.md

@@ -1,6 +1,6 @@
 # gasnuki
 
-[![Test Coverage](https://img.shields.io/badge/test%20coverage-87.76%25-green)](https://github.com/luthpg/gasnuki)
+[![Test Coverage](https://img.shields.io/badge/test%20coverage-77.03%25-yellowgreen)](https://github.com/luthpg/gasnuki)
 [![License](https://img.shields.io/badge/license-ISC-blue.svg)](LICENSE)
 [![npm version](https://img.shields.io/npm/v/@ciderjs/gasnuki.svg)](https://www.npmjs.com/package/@ciderjs/gasnuki)
 [![GitHub issues](https://img.shields.io/github/issues/luthpg/gasnuki.svg)](https://github.com/luthpg/gasnuki/issues)

package/README.md

@@ -1,6 +1,6 @@
 # @ciderjs/gasnuki
 
-[![Test Coverage](https://img.shields.io/badge/test%20coverage-87.76%25-green)](https://github.com/luthpg/gasnuki)
+[![Test Coverage](https://img.shields.io/badge/test%20coverage-77.03%25-yellowgreen)](https://github.com/luthpg/gasnuki)
 [![License](https://img.shields.io/badge/license-ISC-blue.svg)](LICENSE)
 [![npm version](https://img.shields.io/npm/v/@ciderjs/gasnuki.svg)](https://www.npmjs.com/package/@ciderjs/gasnuki)
 [![GitHub issues](https://img.shields.io/github/issues/luthpg/gasnuki.svg)](https://github.com/luthpg/gasnuki/issues)

package/dist/cli.cjs

@@ -3,7 +3,7 @@
 
 const path = require('node:path');
 const commander = require('commander');
-const index = require('./shared/gasnuki.CYh0jbl5.cjs');
+const index = require('./shared/gasnuki.DH8w-v3n.cjs');
 require('chokidar');
 require('consola');
 require('node:fs');
@@ -24,7 +24,7 @@ function _interopNamespaceCompat(e) {
 
 const path__namespace = /*#__PURE__*/_interopNamespaceCompat(path);
 
-const version = "0.2.4";
+const version = "0.2.6";
 
 const parseArgs = async (command) => {
   const cliOpts = command.opts();

package/dist/cli.mjs

@@ -1,14 +1,14 @@
 #! /usr/bin/env  node
 import * as path from 'node:path';
 import { Command } from 'commander';
-import { l as loadConfig, g as generateTypes } from './shared/gasnuki.DvpVGJ1U.mjs';
+import { l as loadConfig, g as generateTypes } from './shared/gasnuki.DgQBiLxg.mjs';
 import 'chokidar';
 import 'consola';
 import 'node:fs';
 import 'ts-morph';
 import 'jiti';
 
-const version = "0.2.4";
+const version = "0.2.6";
 
 const parseArgs = async (command) => {
   const cliOpts = command.opts();

package/dist/index.cjs

@@ -3,7 +3,7 @@
 require('node:path');
 require('chokidar');
 require('consola');
-const index = require('./shared/gasnuki.CYh0jbl5.cjs');
+const index = require('./shared/gasnuki.DH8w-v3n.cjs');
 require('node:fs');
 require('ts-morph');
 require('jiti');

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import 'node:path';
 import 'chokidar';
 import 'consola';
-export { d as defineConfig, g as generateTypes } from './shared/gasnuki.DvpVGJ1U.mjs';
+export { d as defineConfig, g as generateTypes } from './shared/gasnuki.DgQBiLxg.mjs';
 import 'node:fs';
 import 'ts-morph';
 import 'jiti';

package/dist/shared/{gasnuki.CYh0jbl5.cjs → gasnuki.DH8w-v3n.cjs}

@@ -47,29 +47,17 @@ const getInterfaceMethodDefinition_ = (name, node) => {
     }
   }
   let jsDocString = "";
-  const jsDocOwner = "getJsDocs" in node ? node : "getParantOrThrow" in node && // @ts-expect-error variable declaration
+  const jsDocOwner = "getJsDocs" in node ? node : "getParentOrThrow" in node && // @ts-expect-error variable declaration
   node.getParentOrThrow().getKind() === tsMorph.SyntaxKind.VariableDeclaration ? (
     // @ts-expect-error variable declaration
     node.getParentOrThrow()
   ) : null;
   if (jsDocOwner != null) {
-    const jsDocs = "getJsDocs" in jsDocOwner ? jsDocOwner.getJsDocs() : null;
-    if (jsDocs != null && jsDocs.length > 0) {
-      const rawConmmentText = jsDocs.map((doc) => doc.getFullText()).join("\n");
-      if (rawConmmentText.includes("@deprecated")) {
-        const deprecatedDoc = jsDocs.find(
-          (doc) => doc.getFullText().includes("@deprecated")
-        );
-        jsDocString = `${deprecatedDoc != null ? deprecatedDoc.getFullText().trim() : "/**\n * @deprecated\n */"}
-`;
-      } else {
-        const firstDoc = jsDocs[0];
-        const description = firstDoc.getDescription().trim();
-        if (description != null || firstDoc.getTags().length > 0) {
-          jsDocString = `${firstDoc.getFullText().trim()}
+    const jsDocs = "getJsDocs" in jsDocOwner ? jsDocOwner.getJsDocs() : [];
+    if (jsDocs.length > 0) {
+      const firstDoc = jsDocs[0];
+      jsDocString = `${firstDoc.getFullText().trim()}
 `;
-        }
-      }
     }
   }
   return `${jsDocString}${name}${typeParamsString}(${parameters}): ${returnType};`;
@@ -98,80 +86,154 @@ const generateAppsScriptTypes = async ({
     tsConfigFilePath: path__namespace.resolve(projectPath, "tsconfig.json"),
     skipAddingFilesFromTsConfig: true
   });
-  project.addSourceFilesAtPaths(
-    path__namespace.join(absoluteSrcDir, "**/*.ts").replace(/\\/g, "/")
-  );
-  const methodDefinitions = [];
-  const globalTypeDefinitions = [];
-  const importStatements = /* @__PURE__ */ new Set();
+  const sourceFilesPattern = path__namespace.join(absoluteSrcDir, "**/*.ts").replace(/\\/g, "/");
+  const testFilesPattern = `!${path__namespace.join(absoluteSrcDir, "**/*.{test,spec}.ts").replace(/\\/g, "/")}`;
+  project.addSourceFilesAtPaths([sourceFilesPattern, testFilesPattern]);
   const sourceFiles = project.getSourceFiles();
   consola.consola.info(`Found ${sourceFiles.length} source file(s).`);
+  const methodDefinitions = [];
+  const exportedDeclarations = [];
+  const exportedDeclarationNames = /* @__PURE__ */ new Set();
+  const exportedFunctions = [];
   for (const sourceFile of sourceFiles) {
-    const importDeclarations = sourceFile.getImportDeclarations?.();
-    if (importDeclarations != null && importDeclarations.length > 0) {
-      for (const importDeclaration of importDeclarations) {
-        const moduleSpecifier = importDeclaration.getModuleSpecifierSourceFile();
-        if (moduleSpecifier) {
-          const importedFilePath = moduleSpecifier.getFilePath();
-          let relativePath = path__namespace.relative(path__namespace.dirname(absoluteOutputFile), importedFilePath).replace(/\\/g, "/");
-          relativePath = relativePath.replace(/\.(ts|tsx|d\.ts)$/, "");
-          if (!relativePath.startsWith(".") && !relativePath.startsWith("..")) {
-            relativePath = `./${relativePath}`;
-          }
-          const originalText = importDeclaration.getText();
-          const newImportText = originalText.replace(
-            importDeclaration.getModuleSpecifierValue(),
-            relativePath
-          );
-          importStatements.add(newImportText);
-        } else {
-          importStatements.add(importDeclaration.getText());
-        }
-      }
-    }
     for (const iface of sourceFile.getInterfaces()) {
-      const name = iface?.getName?.();
-      if (name == null || name.endsWith("_")) {
-        continue;
+      if (iface.isExported() && !iface.getName()?.endsWith("_")) {
+        exportedDeclarations.push(iface);
+        exportedDeclarationNames.add(iface.getName());
       }
-      globalTypeDefinitions.push(iface.getText());
     }
     for (const typeAlias of sourceFile.getTypeAliases()) {
-      const name = typeAlias?.getName?.();
-      if (name == null || name.endsWith("_")) {
-        continue;
+      if (typeAlias.isExported() && !typeAlias.getName().endsWith("_")) {
+        exportedDeclarations.push(typeAlias);
+        exportedDeclarationNames.add(typeAlias.getName());
       }
-      globalTypeDefinitions.push(typeAlias.getText());
     }
-    for (const statement of sourceFile.getStatements()) {
-      if (statement.getKind() === tsMorph.SyntaxKind.ModuleDeclaration) {
-        globalTypeDefinitions.push(statement.getText());
+    for (const func of sourceFile.getFunctions()) {
+      const name = func.getName();
+      if (func.isExported() && name && !name.endsWith("_") && !SIMPLE_TRIGGER_FUNCTION_NAMES.includes(name)) {
+        exportedDeclarations.push(func);
+        exportedDeclarationNames.add(name);
+        methodDefinitions.push(getInterfaceMethodDefinition_(name, func));
+        exportedFunctions.push(func);
       }
     }
-    for (const funcDecl of sourceFile.getFunctions()) {
-      if (!funcDecl.isAmbient()) {
-        const name = funcDecl.getName();
-        if (name != null && !name.endsWith("_") && !SIMPLE_TRIGGER_FUNCTION_NAMES.includes(name)) {
-          methodDefinitions.push(getInterfaceMethodDefinition_(name, funcDecl));
+    for (const varStmt of sourceFile.getVariableStatements()) {
+      if (!varStmt.isExported()) continue;
+      for (const varDecl of varStmt.getDeclarations()) {
+        const name = varDecl.getName();
+        const initializer = varDecl.getInitializer();
+        if (!name.endsWith("_") && !SIMPLE_TRIGGER_FUNCTION_NAMES.includes(name) && initializer && (initializer.getKind() === tsMorph.SyntaxKind.ArrowFunction || initializer.getKind() === tsMorph.SyntaxKind.FunctionExpression)) {
+          const funcExpr = initializer;
+          exportedDeclarations.push(varDecl);
+          exportedDeclarationNames.add(name);
+          methodDefinitions.push(getInterfaceMethodDefinition_(name, funcExpr));
+          exportedFunctions.push(funcExpr);
         }
       }
     }
-    for (const varStmt of sourceFile.getVariableStatements()) {
-      if (!varStmt.isAmbient()) {
-        for (const varDecl of varStmt.getDeclarations()) {
-          const initializer = varDecl.getInitializer();
-          const varName = varDecl.getName();
-          if (initializer != null && (initializer.getKind() === tsMorph.SyntaxKind.ArrowFunction || initializer.getKind() === tsMorph.SyntaxKind.FunctionExpression) && !varName.endsWith("_") && !SIMPLE_TRIGGER_FUNCTION_NAMES.includes(varName)) {
-            methodDefinitions.push(
-              getInterfaceMethodDefinition_(
-                varName,
-                initializer
-              )
-            );
+  }
+  const collectSymbolsFromType = (type, foundSymbols) => {
+    const symbol = type.getAliasSymbol() ?? type.getSymbol();
+    if (symbol && !foundSymbols.has(symbol)) {
+      foundSymbols.add(symbol);
+      if (type.isObject()) {
+        for (const prop of type.getProperties()) {
+          const propDecl = prop.getDeclarations()[0];
+          if (propDecl) {
+            collectSymbolsFromType(propDecl.getType(), foundSymbols);
           }
         }
       }
     }
+    for (const typeArg of type.getTypeArguments()) {
+      collectSymbolsFromType(typeArg, foundSymbols);
+    }
+    if (type.isUnion()) {
+      for (const unionType of type.getUnionTypes()) {
+        collectSymbolsFromType(unionType, foundSymbols);
+      }
+    }
+    if (type.isIntersection()) {
+      for (const intersectionType of type.getIntersectionTypes()) {
+        collectSymbolsFromType(intersectionType, foundSymbols);
+      }
+    }
+  };
+  const returnValueSymbols = /* @__PURE__ */ new Set();
+  for (const func of exportedFunctions) {
+    collectSymbolsFromType(func.getReturnType(), returnValueSymbols);
+  }
+  const importsMap = /* @__PURE__ */ new Map();
+  const inlineDefinitions = /* @__PURE__ */ new Map();
+  const symbolsToProcess = /* @__PURE__ */ new Set();
+  const processedSymbols = /* @__PURE__ */ new Set();
+  for (const decl of exportedDeclarations) {
+    for (const descendant of decl.getDescendantsOfKind(
+      tsMorph.SyntaxKind.TypeReference
+    )) {
+      const symbol = descendant.getType().getAliasSymbol() ?? descendant.getType().getSymbol();
+      if (symbol) {
+        symbolsToProcess.add(symbol);
+      }
+    }
+  }
+  while (symbolsToProcess.size > 0) {
+    const symbol = symbolsToProcess.values().next().value;
+    if (!symbol) continue;
+    symbolsToProcess.delete(symbol);
+    const symbolName = symbol.getName();
+    if (processedSymbols.has(symbolName) || exportedDeclarationNames.has(symbolName) || symbolName === "__type") {
+      continue;
+    }
+    const symbolFlags = symbol.getFlags();
+    if (symbolFlags & tsMorph.SymbolFlags.TypeParameter) {
+      continue;
+    }
+    const declaration = symbol.getDeclarations()[0];
+    if (!declaration) {
+      continue;
+    }
+    const sourceFile = declaration.getSourceFile();
+    if (sourceFile.getFilePath().includes("node_modules")) {
+      continue;
+    }
+    processedSymbols.add(symbolName);
+    const isLocalDefinition = declaration.getParent()?.getKind() !== tsMorph.SyntaxKind.SourceFile;
+    if (isLocalDefinition) {
+      if (returnValueSymbols.has(symbol)) {
+        const declText = declaration.getText();
+        inlineDefinitions.set(symbolName, declText);
+        const tempSourceFile = project.createSourceFile(
+          `__temp_${symbolName}.ts`,
+          declText
+        );
+        for (const descendant of tempSourceFile.getDescendantsOfKind(
+          tsMorph.SyntaxKind.TypeReference
+        )) {
+          const newSymbol = descendant.getType().getAliasSymbol() ?? descendant.getType().getSymbol();
+          if (newSymbol) {
+            symbolsToProcess.add(newSymbol);
+          }
+        }
+        tempSourceFile.delete();
+      }
+    } else {
+      let modulePath = path__namespace.relative(absoluteOutDir, sourceFile.getFilePath()).replace(/\\/g, "/");
+      modulePath = modulePath.replace(/\.(d\.)?ts$/, "");
+      if (modulePath.endsWith("/index")) {
+        modulePath = modulePath.slice(0, -6);
+      }
+      if (modulePath === "index" || modulePath === "") {
+        modulePath = ".";
+      }
+      if (!modulePath.startsWith(".")) {
+        modulePath = `./${modulePath}`;
+      }
+      if (!importsMap.has(modulePath)) {
+        importsMap.set(modulePath, /* @__PURE__ */ new Set());
+      }
+      importsMap.get(modulePath)?.add(symbolName);
+    }
   }
   if (!fs__namespace.existsSync(absoluteOutDir)) {
     fs__namespace.mkdirSync(absoluteOutDir, { recursive: true });
@@ -180,14 +242,34 @@ const generateAppsScriptTypes = async ({
   const generatorName = "gasnuki";
   let outputContent = `// Auto-generated by ${generatorName}
 // Do NOT edit this file manually.
+
 `;
-  if (importStatements.size > 0) {
-    outputContent += `${[...importStatements].join("\n")}
+  const sortedModulePaths = [...importsMap.keys()].sort((a, b) => {
+    const aIsRelative = a.startsWith(".");
+    const bIsRelative = b.startsWith(".");
+    if (aIsRelative !== bIsRelative) return aIsRelative ? 1 : -1;
+    return a.localeCompare(b);
+  });
+  if (sortedModulePaths.length > 0) {
+    const importStatements = sortedModulePaths.map((modulePath) => {
+      const imports = [...importsMap.get(modulePath) ?? []].sort();
+      const finalModulePath = modulePath === "." ? "./index" : modulePath;
+      return `import type { ${imports.join(", ")} } from '${finalModulePath}';`;
+    });
+    outputContent += `${importStatements.join("\n")}
+
+`;
+  }
+  if (inlineDefinitions.size > 0) {
+    outputContent += `${[...inlineDefinitions.values()].join("\n\n")}
 
 `;
   }
-  if (globalTypeDefinitions.length > 0) {
-    outputContent += `${globalTypeDefinitions.join("\n\n")}
+  const exportedTypeDefinitions = exportedDeclarations.filter(
+    (d) => d.getKind() === tsMorph.SyntaxKind.InterfaceDeclaration || d.getKind() === tsMorph.SyntaxKind.TypeAliasDeclaration
+  ).map((decl) => decl.getText());
+  if (exportedTypeDefinitions.length > 0) {
+    outputContent += `${exportedTypeDefinitions.join("\n\n")}
 
 `;
   }
@@ -200,7 +282,7 @@ ${formattedMethods}
 }
 `;
     consola.consola.info(
-      `Interface 'ServerScript' type definitions written to ${absoluteOutputFile} (${methodDefinitions.length} function(s), ${globalTypeDefinitions.length} type(s)).`
+      `Interface 'ServerScript' type definitions written to ${absoluteOutputFile} (${methodDefinitions.length} function(s), ${exportedTypeDefinitions.length + inlineDefinitions.size} type(s)).`
     );
   } else {
     outputContent += "export type ServerScripts = {}\n";

package/dist/shared/{gasnuki.DvpVGJ1U.mjs → gasnuki.DgQBiLxg.mjs}

@@ -2,7 +2,7 @@ import * as path from 'node:path';
 import * as chokidar from 'chokidar';
 import { consola } from 'consola';
 import * as fs from 'node:fs';
-import { Project, SyntaxKind } from 'ts-morph';
+import { Project, SyntaxKind, SymbolFlags } from 'ts-morph';
 import { createJiti } from 'jiti';
 
 const text = "export type RemoveReturnType<T> = {\n  [P in keyof T]: T[P] extends (...args: infer A) => any\n    ? (...args: A) => void\n    : T[P];\n};\n\ntype _AppsScriptRun = RemoveReturnType<ServerScripts> & {\n  [key: string]: (...args: any[]) => any;\n  withSuccessHandler: <T = string | number | boolean | undefined, U = any>(\n    callback: (returnValues: T, userObject?: U) => void,\n  ) => _AppsScriptRun;\n  withFailureHandler: <U = any>(\n    callback: (error: Error, userObject?: U) => void,\n  ) => _AppsScriptRun;\n  withUserObject: <U = any>(userObject: U) => _AppsScriptRun;\n};\n\ntype _AppsScriptHistoryFunction = (\n  stateObject: object,\n  params: object,\n  hash: string,\n) => void;\n\ninterface _WebAppLovacationType {\n  hash: string;\n  parameter: Record<string, string>;\n  parameters: Record<string, string[]>;\n}\n\nexport declare interface GoogleClientSideApi {\n  script: {\n    run: _AppsScriptRun;\n    url: {\n      getLocation: (\n        callback: (location: _WebAppLovacationType) => void,\n      ) => void;\n    };\n    history: {\n      push: _AppsScriptHistoryFunction;\n      replace: _AppsScriptHistoryFunction;\n      setChangeHandler: (\n        callback: (e: {\n          state: object;\n          location: _WebAppLovacationType;\n        }) => void,\n      ) => void;\n    };\n  };\n}\n\ndeclare global {\n  const google: GoogleClientSideApi;\n}\n";
@@ -29,29 +29,17 @@ const getInterfaceMethodDefinition_ = (name, node) => {
     }
   }
   let jsDocString = "";
-  const jsDocOwner = "getJsDocs" in node ? node : "getParantOrThrow" in node && // @ts-expect-error variable declaration
+  const jsDocOwner = "getJsDocs" in node ? node : "getParentOrThrow" in node && // @ts-expect-error variable declaration
   node.getParentOrThrow().getKind() === SyntaxKind.VariableDeclaration ? (
     // @ts-expect-error variable declaration
     node.getParentOrThrow()
   ) : null;
   if (jsDocOwner != null) {
-    const jsDocs = "getJsDocs" in jsDocOwner ? jsDocOwner.getJsDocs() : null;
-    if (jsDocs != null && jsDocs.length > 0) {
-      const rawConmmentText = jsDocs.map((doc) => doc.getFullText()).join("\n");
-      if (rawConmmentText.includes("@deprecated")) {
-        const deprecatedDoc = jsDocs.find(
-          (doc) => doc.getFullText().includes("@deprecated")
-        );
-        jsDocString = `${deprecatedDoc != null ? deprecatedDoc.getFullText().trim() : "/**\n * @deprecated\n */"}
-`;
-      } else {
-        const firstDoc = jsDocs[0];
-        const description = firstDoc.getDescription().trim();
-        if (description != null || firstDoc.getTags().length > 0) {
-          jsDocString = `${firstDoc.getFullText().trim()}
+    const jsDocs = "getJsDocs" in jsDocOwner ? jsDocOwner.getJsDocs() : [];
+    if (jsDocs.length > 0) {
+      const firstDoc = jsDocs[0];
+      jsDocString = `${firstDoc.getFullText().trim()}
 `;
-        }
-      }
     }
   }
   return `${jsDocString}${name}${typeParamsString}(${parameters}): ${returnType};`;
@@ -80,80 +68,154 @@ const generateAppsScriptTypes = async ({
     tsConfigFilePath: path.resolve(projectPath, "tsconfig.json"),
     skipAddingFilesFromTsConfig: true
   });
-  project.addSourceFilesAtPaths(
-    path.join(absoluteSrcDir, "**/*.ts").replace(/\\/g, "/")
-  );
-  const methodDefinitions = [];
-  const globalTypeDefinitions = [];
-  const importStatements = /* @__PURE__ */ new Set();
+  const sourceFilesPattern = path.join(absoluteSrcDir, "**/*.ts").replace(/\\/g, "/");
+  const testFilesPattern = `!${path.join(absoluteSrcDir, "**/*.{test,spec}.ts").replace(/\\/g, "/")}`;
+  project.addSourceFilesAtPaths([sourceFilesPattern, testFilesPattern]);
   const sourceFiles = project.getSourceFiles();
   consola.info(`Found ${sourceFiles.length} source file(s).`);
+  const methodDefinitions = [];
+  const exportedDeclarations = [];
+  const exportedDeclarationNames = /* @__PURE__ */ new Set();
+  const exportedFunctions = [];
   for (const sourceFile of sourceFiles) {
-    const importDeclarations = sourceFile.getImportDeclarations?.();
-    if (importDeclarations != null && importDeclarations.length > 0) {
-      for (const importDeclaration of importDeclarations) {
-        const moduleSpecifier = importDeclaration.getModuleSpecifierSourceFile();
-        if (moduleSpecifier) {
-          const importedFilePath = moduleSpecifier.getFilePath();
-          let relativePath = path.relative(path.dirname(absoluteOutputFile), importedFilePath).replace(/\\/g, "/");
-          relativePath = relativePath.replace(/\.(ts|tsx|d\.ts)$/, "");
-          if (!relativePath.startsWith(".") && !relativePath.startsWith("..")) {
-            relativePath = `./${relativePath}`;
-          }
-          const originalText = importDeclaration.getText();
-          const newImportText = originalText.replace(
-            importDeclaration.getModuleSpecifierValue(),
-            relativePath
-          );
-          importStatements.add(newImportText);
-        } else {
-          importStatements.add(importDeclaration.getText());
-        }
-      }
-    }
     for (const iface of sourceFile.getInterfaces()) {
-      const name = iface?.getName?.();
-      if (name == null || name.endsWith("_")) {
-        continue;
+      if (iface.isExported() && !iface.getName()?.endsWith("_")) {
+        exportedDeclarations.push(iface);
+        exportedDeclarationNames.add(iface.getName());
       }
-      globalTypeDefinitions.push(iface.getText());
     }
     for (const typeAlias of sourceFile.getTypeAliases()) {
-      const name = typeAlias?.getName?.();
-      if (name == null || name.endsWith("_")) {
-        continue;
+      if (typeAlias.isExported() && !typeAlias.getName().endsWith("_")) {
+        exportedDeclarations.push(typeAlias);
+        exportedDeclarationNames.add(typeAlias.getName());
       }
-      globalTypeDefinitions.push(typeAlias.getText());
     }
-    for (const statement of sourceFile.getStatements()) {
-      if (statement.getKind() === SyntaxKind.ModuleDeclaration) {
-        globalTypeDefinitions.push(statement.getText());
+    for (const func of sourceFile.getFunctions()) {
+      const name = func.getName();
+      if (func.isExported() && name && !name.endsWith("_") && !SIMPLE_TRIGGER_FUNCTION_NAMES.includes(name)) {
+        exportedDeclarations.push(func);
+        exportedDeclarationNames.add(name);
+        methodDefinitions.push(getInterfaceMethodDefinition_(name, func));
+        exportedFunctions.push(func);
       }
     }
-    for (const funcDecl of sourceFile.getFunctions()) {
-      if (!funcDecl.isAmbient()) {
-        const name = funcDecl.getName();
-        if (name != null && !name.endsWith("_") && !SIMPLE_TRIGGER_FUNCTION_NAMES.includes(name)) {
-          methodDefinitions.push(getInterfaceMethodDefinition_(name, funcDecl));
+    for (const varStmt of sourceFile.getVariableStatements()) {
+      if (!varStmt.isExported()) continue;
+      for (const varDecl of varStmt.getDeclarations()) {
+        const name = varDecl.getName();
+        const initializer = varDecl.getInitializer();
+        if (!name.endsWith("_") && !SIMPLE_TRIGGER_FUNCTION_NAMES.includes(name) && initializer && (initializer.getKind() === SyntaxKind.ArrowFunction || initializer.getKind() === SyntaxKind.FunctionExpression)) {
+          const funcExpr = initializer;
+          exportedDeclarations.push(varDecl);
+          exportedDeclarationNames.add(name);
+          methodDefinitions.push(getInterfaceMethodDefinition_(name, funcExpr));
+          exportedFunctions.push(funcExpr);
         }
       }
     }
-    for (const varStmt of sourceFile.getVariableStatements()) {
-      if (!varStmt.isAmbient()) {
-        for (const varDecl of varStmt.getDeclarations()) {
-          const initializer = varDecl.getInitializer();
-          const varName = varDecl.getName();
-          if (initializer != null && (initializer.getKind() === SyntaxKind.ArrowFunction || initializer.getKind() === SyntaxKind.FunctionExpression) && !varName.endsWith("_") && !SIMPLE_TRIGGER_FUNCTION_NAMES.includes(varName)) {
-            methodDefinitions.push(
-              getInterfaceMethodDefinition_(
-                varName,
-                initializer
-              )
-            );
+  }
+  const collectSymbolsFromType = (type, foundSymbols) => {
+    const symbol = type.getAliasSymbol() ?? type.getSymbol();
+    if (symbol && !foundSymbols.has(symbol)) {
+      foundSymbols.add(symbol);
+      if (type.isObject()) {
+        for (const prop of type.getProperties()) {
+          const propDecl = prop.getDeclarations()[0];
+          if (propDecl) {
+            collectSymbolsFromType(propDecl.getType(), foundSymbols);
           }
         }
       }
     }
+    for (const typeArg of type.getTypeArguments()) {
+      collectSymbolsFromType(typeArg, foundSymbols);
+    }
+    if (type.isUnion()) {
+      for (const unionType of type.getUnionTypes()) {
+        collectSymbolsFromType(unionType, foundSymbols);
+      }
+    }
+    if (type.isIntersection()) {
+      for (const intersectionType of type.getIntersectionTypes()) {
+        collectSymbolsFromType(intersectionType, foundSymbols);
+      }
+    }
+  };
+  const returnValueSymbols = /* @__PURE__ */ new Set();
+  for (const func of exportedFunctions) {
+    collectSymbolsFromType(func.getReturnType(), returnValueSymbols);
+  }
+  const importsMap = /* @__PURE__ */ new Map();
+  const inlineDefinitions = /* @__PURE__ */ new Map();
+  const symbolsToProcess = /* @__PURE__ */ new Set();
+  const processedSymbols = /* @__PURE__ */ new Set();
+  for (const decl of exportedDeclarations) {
+    for (const descendant of decl.getDescendantsOfKind(
+      SyntaxKind.TypeReference
+    )) {
+      const symbol = descendant.getType().getAliasSymbol() ?? descendant.getType().getSymbol();
+      if (symbol) {
+        symbolsToProcess.add(symbol);
+      }
+    }
+  }
+  while (symbolsToProcess.size > 0) {
+    const symbol = symbolsToProcess.values().next().value;
+    if (!symbol) continue;
+    symbolsToProcess.delete(symbol);
+    const symbolName = symbol.getName();
+    if (processedSymbols.has(symbolName) || exportedDeclarationNames.has(symbolName) || symbolName === "__type") {
+      continue;
+    }
+    const symbolFlags = symbol.getFlags();
+    if (symbolFlags & SymbolFlags.TypeParameter) {
+      continue;
+    }
+    const declaration = symbol.getDeclarations()[0];
+    if (!declaration) {
+      continue;
+    }
+    const sourceFile = declaration.getSourceFile();
+    if (sourceFile.getFilePath().includes("node_modules")) {
+      continue;
+    }
+    processedSymbols.add(symbolName);
+    const isLocalDefinition = declaration.getParent()?.getKind() !== SyntaxKind.SourceFile;
+    if (isLocalDefinition) {
+      if (returnValueSymbols.has(symbol)) {
+        const declText = declaration.getText();
+        inlineDefinitions.set(symbolName, declText);
+        const tempSourceFile = project.createSourceFile(
+          `__temp_${symbolName}.ts`,
+          declText
+        );
+        for (const descendant of tempSourceFile.getDescendantsOfKind(
+          SyntaxKind.TypeReference
+        )) {
+          const newSymbol = descendant.getType().getAliasSymbol() ?? descendant.getType().getSymbol();
+          if (newSymbol) {
+            symbolsToProcess.add(newSymbol);
+          }
+        }
+        tempSourceFile.delete();
+      }
+    } else {
+      let modulePath = path.relative(absoluteOutDir, sourceFile.getFilePath()).replace(/\\/g, "/");
+      modulePath = modulePath.replace(/\.(d\.)?ts$/, "");
+      if (modulePath.endsWith("/index")) {
+        modulePath = modulePath.slice(0, -6);
+      }
+      if (modulePath === "index" || modulePath === "") {
+        modulePath = ".";
+      }
+      if (!modulePath.startsWith(".")) {
+        modulePath = `./${modulePath}`;
+      }
+      if (!importsMap.has(modulePath)) {
+        importsMap.set(modulePath, /* @__PURE__ */ new Set());
+      }
+      importsMap.get(modulePath)?.add(symbolName);
+    }
   }
   if (!fs.existsSync(absoluteOutDir)) {
     fs.mkdirSync(absoluteOutDir, { recursive: true });
@@ -162,14 +224,34 @@ const generateAppsScriptTypes = async ({
   const generatorName = "gasnuki";
   let outputContent = `// Auto-generated by ${generatorName}
 // Do NOT edit this file manually.
+
 `;
-  if (importStatements.size > 0) {
-    outputContent += `${[...importStatements].join("\n")}
+  const sortedModulePaths = [...importsMap.keys()].sort((a, b) => {
+    const aIsRelative = a.startsWith(".");
+    const bIsRelative = b.startsWith(".");
+    if (aIsRelative !== bIsRelative) return aIsRelative ? 1 : -1;
+    return a.localeCompare(b);
+  });
+  if (sortedModulePaths.length > 0) {
+    const importStatements = sortedModulePaths.map((modulePath) => {
+      const imports = [...importsMap.get(modulePath) ?? []].sort();
+      const finalModulePath = modulePath === "." ? "./index" : modulePath;
+      return `import type { ${imports.join(", ")} } from '${finalModulePath}';`;
+    });
+    outputContent += `${importStatements.join("\n")}
+
+`;
+  }
+  if (inlineDefinitions.size > 0) {
+    outputContent += `${[...inlineDefinitions.values()].join("\n\n")}
 
 `;
   }
-  if (globalTypeDefinitions.length > 0) {
-    outputContent += `${globalTypeDefinitions.join("\n\n")}
+  const exportedTypeDefinitions = exportedDeclarations.filter(
+    (d) => d.getKind() === SyntaxKind.InterfaceDeclaration || d.getKind() === SyntaxKind.TypeAliasDeclaration
+  ).map((decl) => decl.getText());
+  if (exportedTypeDefinitions.length > 0) {
+    outputContent += `${exportedTypeDefinitions.join("\n\n")}
 
 `;
   }
@@ -182,7 +264,7 @@ ${formattedMethods}
 }
 `;
     consola.info(
-      `Interface 'ServerScript' type definitions written to ${absoluteOutputFile} (${methodDefinitions.length} function(s), ${globalTypeDefinitions.length} type(s)).`
+      `Interface 'ServerScript' type definitions written to ${absoluteOutputFile} (${methodDefinitions.length} function(s), ${exportedTypeDefinitions.length + inlineDefinitions.size} type(s)).`
     );
   } else {
     outputContent += "export type ServerScripts = {}\n";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ciderjs/gasnuki",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "description": "Type definitions and utilities for Google Apps Script client-side API",
   "main": "dist/index.mjs",
   "types": "dist/index.d.ts",
@@ -21,7 +21,7 @@
   },
   "scripts": {
     "generate": "jiti .bin/generate.ts",
-    "dev": "pnpm prebuild && jiti src/cli.ts -p playground/react -s src/server",
+    "dev": "pnpm run generate && jiti src/cli.ts -p playground/react -s src/server",
     "start": "node dist/cli.mjs -p playground/react -s src/server",
     "check": "biome check --write",
     "build": "unbuild",