@ciderjs/gasnuki 0.3.1 → 0.3.3

package/README.ja.md

@@ -1,7 +1,8 @@
-# gasnuki
+# @ciderjs/gasnuki
 
-[![Test Coverage](https://img.shields.io/badge/test%20coverage-90.91%25-brightgreen)](https://github.com/luthpg/gasnuki)
-[![License](https://img.shields.io/badge/license-ISC-blue.svg)](LICENSE)
+[![README-en](https://img.shields.io/badge/English-blue?logo=ReadMe)](./README.md)
+[![Test Coverage](https://img.shields.io/badge/test%20coverage-95.15%25-brightgreen)](https://github.com/luthpg/gasnuki)
+[![License](https://img.shields.io/badge/license-MIT-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)
 
@@ -9,8 +10,16 @@ Google Apps Script クライアントサイドAPIの型定義・ユーティリ
 
 ## 概要
 
-`gasnuki`は、Google Apps Script のクライアントサイドAPIをTypeScriptで安全に扱うための型定義とユーティリティを提供します。
-Apps Scriptとフロントエンド間の型安全な通信をサポートします。
+`gasnuki`は、サーバーサイドのGoogle Apps Script関数から型定義を自動で抽出し、クライアントサイドで利用する`google.script.run` APIに完全な型付けを提供します。これにより、Apps Scriptバックエンドとモダンなフロントエンド開発との間のギャップを埋め、自動補完と堅牢な型チェックを実現します。
+
+## `gasnuki`が実現する開発体験
+
+`gasnuki`は、Google Apps Scriptを用いたWebアプリケーション開発における、もどかしい開発体験を劇的に改善します。
+
+- **完全な型安全性**: `google.script.run`の引数や戻り値に型が付き、エディタの自動補完が効くため、推測に頼るコーディングは不要になります。
+- **モダンな非同期処理**: `async/await`構文を利用して、コールバック地獄に陥ることなく、サーバーサイド関数をシンプルかつ直感的に呼び出せます。
+- **高速な開発サイクル**: フロントエンドの変更を試すたびに`clasp push`する必要はありません。モック機能を使えば、オフラインで迅速なUI開発が可能です。
+- **シームレスな統合**: Vite開発サーバーと連携し、サーバーサイドのコードを変更・保存するだけで、クライアントサイドの型定義が自動的に更新されます。
 
 ## インストール
 
@@ -101,16 +110,19 @@ google.script.run
   .getContent('Sheet1');
 ```
 
-## 機能
+## 主な機能
+
+`gasnuki`は、優れた開発体験を実現するために、以下の機能を提供します。
+
+### サーバーサイド関数の型定義を自動生成
 
-- Google Apps Script クライアントAPIの型定義
-- サーバーサイド関数の戻り値型をvoidに変換するユーティリティ型
+`gasnuki`コマンドを実行すると、指定されたApps Scriptプロジェクト内の `.ts` ファイルを解析し、公開されているすべてのサーバーサイド関数のシグネチャを抽出します。そして、クライアントサイドの`google.script.run`から安全に呼び出せる型定義ファイルを生成します。
 
-### Promiseベースのラッパー
+### PromiseベースのモダンなAPIラッパー
 
-`@ciderjs/gasnuki/promise` を利用すると、`google.script.run` をPromiseを返す型安全なラッパーとして使用できます。これにより、`async/await` を使ったモダンな非同期処理を記述できます。
+`@ciderjs/gasnuki/promise`は、従来のコールバックベースのAPIを、`async/await`で利用可能なPromiseベースの型安全なラッパーに変換します。
 
-1. まず、`gasnuki` で生成した型定義 (`ServerScripts`) と、`getPromisedServerScripts` 関数をインポートします。
+1. `getPromisedServerScripts`関数をインポートし、`gasnuki`が生成した型`ServerScripts`を渡します。
 
     ```ts:lib/gas.ts
     import { getPromisedServerScripts } from '@ciderjs/gasnuki/promise';
@@ -120,7 +132,7 @@ google.script.run
     export const gas = getPromisedServerScripts<ServerScripts>();
     ```
 
-2. 作成した `gas` オブジェクトを使って、サーバーサイド関数を `async/await` で呼び出します。
+2. これで、サーバーサイド関数を `async/await` で呼び出せます。
 
     ```ts:components/MyComponent.tsx
     import { gas } from '../lib/gas';
@@ -136,9 +148,9 @@ google.script.run
     }
     ```
 
-#### モックアップによる開発
+### フロントエンド開発を加速するモック機能
 
-`getPromisedServerScripts` にモック関数を渡すことで、`clasp push` をせずともフロントエンド開発を進めることができます。
+`getPromisedServerScripts`にモック用のオブジェクトを渡すことで、`clasp push`をせずともフロントエンド開発を進めることができます。これにより、バックエンドのロジックに依存せず、UIの挙動確認やデバッグを迅速に行えます。
 
 ```ts:lib/gas.ts
 import {

package/README.md

@@ -1,7 +1,8 @@
 # @ciderjs/gasnuki
 
-[![Test Coverage](https://img.shields.io/badge/test%20coverage-90.91%25-brightgreen)](https://github.com/luthpg/gasnuki)
-[![License](https://img.shields.io/badge/license-ISC-blue.svg)](LICENSE)
+[![README-ja](https://img.shields.io/badge/日本語-blue?logo=ReadMe)](./README.ja.md)
+[![Test Coverage](https://img.shields.io/badge/test%20coverage-95.15%25-brightgreen)](https://github.com/luthpg/gasnuki)
+[![License](https://img.shields.io/badge/license-MIT-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)
 
@@ -9,7 +10,16 @@ Type definitions and utilities for Google Apps Script client-side API
 
 ## Overview
 
-`gasnuki` provides TypeScript type definitions and utilities for safely using the Google Apps Script client-side API. It helps ensure type-safe communication between Apps Script and your frontend.
+`gasnuki` automatically extracts type definitions from your server-side Google Apps Script functions, providing a fully type-safe `google.script.run` API for your client-side code. This bridges the gap between your Apps Script backend and modern frontend development with autocompletion and robust type-checking.
+
+## The developer experience gasnuki Delivers
+
+`gasnuki` dramatically improves the often-frustrating developer experience of building web applications with Google Apps Script.
+
+- **Full Type Safety**: Say goodbye to guesswork. With typed arguments and return values for `google.script.run`, you get full autocompletion and compile-time checks in your editor.
+- **Modern Async Syntax**: Write clean, intuitive code using `async/await` for your server-side calls, freeing you from callback hell.
+- **Rapid Development Cycles**: No more waiting for `clasp push` every time you want to test a frontend change. The mocking feature allows you to develop your UI swiftly and offline.
+- **Seamless Integration**: With the Vite plugin, your client-side types are automatically regenerated whenever you save a change in your server-side code, creating a truly seamless workflow.
 
 ## Installation
 
@@ -100,16 +110,19 @@ google.script.run
   .getContent('Sheet1');
 ```
 
-## Features
+## Core Features
+
+`gasnuki` provides the following features to deliver a superior developer experience.
 
-- Type definitions for Google Apps Script client-side API
-- Utility type to convert server-side function return types to void
+### Automatic Type Generation for Server Functions
 
-### Promise-based Wrapper
+Running the `gasnuki` command parses the `.ts` files in your Apps Script project, extracts the signatures of all your published server-side functions, and generates a type definition file. This file makes your functions safely callable from the client-side `google.script.run`.
 
-For a more modern asynchronous approach, you can use the type-safe Promise-based wrapper for `google.script.run`. This allows you to write clean code with `async/await`.
+### Modern, Promise-Based API Wrapper
 
-1. First, import the type definitions (`ServerScripts`) generated by `gasnuki` and the `getPromisedServerScripts` function.
+`@ciderjs/gasnuki/promise` transforms the traditional callback-based API into a type-safe, Promise-based wrapper that supports `async/await`.
+
+1. Import the `getPromisedServerScripts` function and pass it the `ServerScripts` type generated by `gasnuki`.
 
     ```ts:lib/gas.ts
     import { getPromisedServerScripts } from '@ciderjs/gasnuki/promise';
@@ -135,9 +148,9 @@ For a more modern asynchronous approach, you can use the type-safe Promise-based
     }
     ```
 
-#### Development with Mockups
+### Mocking for Accelerated Frontend Development
 
-By passing mockup functions to `getPromisedServerScripts`, you can proceed with frontend development without needing to `clasp push` every time.
+By passing a mock object to `getPromisedServerScripts`, you can develop your frontend without needing to `clasp push`. This allows for rapid testing and debugging of your UI without any dependency on the live backend logic.
 
 ```ts:lib/gas.ts
 import {
@@ -159,8 +172,6 @@ const mockup: PartialScriptType<ServerScripts> = {
 export const gas = getPromisedServerScripts<ServerScripts>(mockup);
 ```
 
----
-
 ## Contributing
 
 Bug reports and pull requests are welcome. Please use the `issues` or `pull requests` section.

package/dist/cli.cjs

@@ -4,7 +4,7 @@
 const path = require('node:path');
 const commander = require('commander');
 const index = require('./index.cjs');
-const config = require('./shared/gasnuki.Cbwq1CES.cjs');
+const config = require('./shared/gasnuki.D8w16Lbm.cjs');
 require('chokidar');
 require('consola');
 require('node:fs');
@@ -25,7 +25,7 @@ function _interopNamespaceCompat(e) {
 
 const path__namespace = /*#__PURE__*/_interopNamespaceCompat(path);
 
-const version = "0.3.1";
+const version = "0.3.3";
 
 const parseArgs = async (command) => {
   const cliOpts = command.opts();
@@ -51,7 +51,7 @@ const parseArgs = async (command) => {
   };
   await index.generateTypes(finalOptions);
 };
-const cli = async () => {
+const runCli = async () => {
   const program = new commander.Command();
   program.name("gasnuki").description(
     "Generate type definitions and utilities for Google Apps Script client-side API"
@@ -72,7 +72,10 @@ const cli = async () => {
   ).option("-f, --outputFile <file>", "Output file name", "appsscript.ts").option("-w, --watch", "Watch for changes and re-generate types", false);
   await program.parseAsync(process.argv);
 };
-cli();
+const isMainModule = typeof require !== "undefined" && require.main === module;
+if (isMainModule || process.argv[1] === undefined) {
+  runCli();
+}
 
-exports.cli = cli;
 exports.parseArgs = parseArgs;
+exports.runCli = runCli;

package/dist/cli.d.cts

@@ -2,6 +2,6 @@
 import { Command } from 'commander';
 
 declare const parseArgs: (command: Command) => Promise<void>;
-declare const cli: () => Promise<void>;
+declare const runCli: () => Promise<void>;
 
-export { cli, parseArgs };
+export { parseArgs, runCli };

package/dist/cli.d.mts

@@ -2,6 +2,6 @@
 import { Command } from 'commander';
 
 declare const parseArgs: (command: Command) => Promise<void>;
-declare const cli: () => Promise<void>;
+declare const runCli: () => Promise<void>;
 
-export { cli, parseArgs };
+export { parseArgs, runCli };

package/dist/cli.d.ts

@@ -2,6 +2,6 @@
 import { Command } from 'commander';
 
 declare const parseArgs: (command: Command) => Promise<void>;
-declare const cli: () => Promise<void>;
+declare const runCli: () => Promise<void>;
 
-export { cli, parseArgs };
+export { parseArgs, runCli };

package/dist/cli.mjs

@@ -2,14 +2,14 @@
 import * as path from 'node:path';
 import { Command } from 'commander';
 import { generateTypes } from './index.mjs';
-import { l as loadConfig } from './shared/gasnuki.Bcijv2Ub.mjs';
+import { l as loadConfig } from './shared/gasnuki.D1fp3Uiw.mjs';
 import 'chokidar';
 import 'consola';
 import 'node:fs';
 import 'ts-morph';
 import 'jiti';
 
-const version = "0.3.1";
+const version = "0.3.3";
 
 const parseArgs = async (command) => {
   const cliOpts = command.opts();
@@ -35,7 +35,7 @@ const parseArgs = async (command) => {
   };
   await generateTypes(finalOptions);
 };
-const cli = async () => {
+const runCli = async () => {
   const program = new Command();
   program.name("gasnuki").description(
     "Generate type definitions and utilities for Google Apps Script client-side API"
@@ -56,6 +56,9 @@ const cli = async () => {
   ).option("-f, --outputFile <file>", "Output file name", "appsscript.ts").option("-w, --watch", "Watch for changes and re-generate types", false);
   await program.parseAsync(process.argv);
 };
-cli();
+const isMainModule = typeof require !== "undefined" && require.main === module;
+if (isMainModule || process.argv[1] === import.meta.filename) {
+  runCli();
+}
 
-export { cli, parseArgs };
+export { parseArgs, runCli };

package/dist/index.cjs

@@ -3,7 +3,7 @@
 const path = require('node:path');
 const chokidar = require('chokidar');
 const consola = require('consola');
-const config = require('./shared/gasnuki.Cbwq1CES.cjs');
+const config = require('./shared/gasnuki.D8w16Lbm.cjs');
 require('node:fs');
 require('ts-morph');
 require('jiti');

package/dist/index.mjs

@@ -1,8 +1,8 @@
 import * as path from 'node:path';
 import * as chokidar from 'chokidar';
 import { consola } from 'consola';
-import { g as generateAppsScriptTypes } from './shared/gasnuki.Bcijv2Ub.mjs';
-export { d as defineConfig } from './shared/gasnuki.Bcijv2Ub.mjs';
+import { g as generateAppsScriptTypes } from './shared/gasnuki.D1fp3Uiw.mjs';
+export { d as defineConfig } from './shared/gasnuki.D1fp3Uiw.mjs';
 import 'node:fs';
 import 'ts-morph';
 import 'jiti';

package/dist/shared/{gasnuki.Bcijv2Ub.mjs → gasnuki.D1fp3Uiw.mjs}

@@ -51,11 +51,34 @@ const SIMPLE_TRIGGER_FUNCTION_NAMES = [
   "doGet",
   "doPost"
 ];
+const getPackageNameFromNodeModulesPath_ = (filePath) => {
+  const normalizedPath = filePath.replace(/\\/g, "/");
+  const nodeModulesIndex = normalizedPath.lastIndexOf("node_modules/");
+  if (nodeModulesIndex === -1) {
+    return null;
+  }
+  const afterNodeModules = normalizedPath.slice(
+    nodeModulesIndex + "node_modules/".length
+  );
+  const parts = afterNodeModules.split("/");
+  if (parts.length === 0) {
+    return null;
+  }
+  if (parts[0].startsWith("@") && parts.length >= 2) {
+    const scopedName = `${parts[0]}/${parts[1]}`;
+    if (parts[0] === "@types") {
+      return parts[1];
+    }
+    return scopedName;
+  }
+  return parts[0];
+};
 const generateAppsScriptTypes = async ({
   project: projectPath,
   srcDir,
   outDir,
-  outputFile
+  outputFile,
+  projectInstance
 }) => {
   const absoluteSrcDir = path.resolve(projectPath, srcDir);
   const absoluteOutDir = path.resolve(projectPath, outDir);
@@ -63,7 +86,7 @@ const generateAppsScriptTypes = async ({
   consola.info("Starting AppsScript type generation with gasnuki...");
   consola.info(`  AppsScript Source Directory: ${absoluteSrcDir}`);
   consola.info(`  Output File: ${absoluteOutputFile}`);
-  const project = new Project({
+  const project = projectInstance ?? new Project({
     tsConfigFilePath: path.resolve(projectPath, "tsconfig.json"),
     skipAddingFilesFromTsConfig: true
   });
@@ -75,7 +98,6 @@ const generateAppsScriptTypes = async ({
   const methodDefinitions = [];
   const exportedDeclarations = [];
   const exportedDeclarationNames = /* @__PURE__ */ new Set();
-  const exportedFunctions = [];
   for (const sourceFile of sourceFiles) {
     const filePath = sourceFile.getFilePath().replace(/\\/g, "/");
     const srcPath = absoluteSrcDir.replace(/\\/g, "/");
@@ -101,7 +123,6 @@ const generateAppsScriptTypes = async ({
         exportedDeclarations.push(func);
         exportedDeclarationNames.add(name);
         methodDefinitions.push(getInterfaceMethodDefinition_(name, func));
-        exportedFunctions.push(func);
       }
     }
     for (const varStmt of sourceFile.getVariableStatements()) {
@@ -113,7 +134,6 @@ const generateAppsScriptTypes = async ({
           exportedDeclarations.push(varDecl);
           exportedDeclarationNames.add(name);
           methodDefinitions.push(getInterfaceMethodDefinition_(name, funcExpr));
-          exportedFunctions.push(funcExpr);
         }
       }
     }
@@ -145,38 +165,21 @@ const generateAppsScriptTypes = async ({
       }
     }
   };
-  const returnValueSymbols = /* @__PURE__ */ new Set();
-  for (const func of exportedFunctions) {
-    collectSymbolsFromType(func.getReturnType(), returnValueSymbols);
-  }
+  const functionSignatureSymbols = /* @__PURE__ */ new Set();
   const symbolsToProcess = /* @__PURE__ */ new Set();
   for (const decl of exportedDeclarations) {
     if (decl.getKind() === SyntaxKind.FunctionDeclaration || decl.getKind() === SyntaxKind.VariableDeclaration && (decl.getInitializer()?.getKind() === SyntaxKind.ArrowFunction || decl.getInitializer()?.getKind() === SyntaxKind.FunctionExpression)) {
       const func = decl.getKind() === SyntaxKind.FunctionDeclaration ? decl : decl.getInitializer();
       const parameters = func.getParameters();
       for (const param of parameters) {
-        const typeRefs = param.getDescendantsOfKind(SyntaxKind.TypeReference);
-        for (const typeRef of typeRefs) {
-          const symbol = typeRef.getType().getAliasSymbol() ?? typeRef.getType().getSymbol();
-          if (symbol) symbolsToProcess.add(symbol);
-        }
-      }
-      const returnTypeNode = func.getReturnTypeNode();
-      if (returnTypeNode) {
-        const typeRefs = returnTypeNode.getDescendantsOfKind(
-          SyntaxKind.TypeReference
-        );
-        for (const typeRef of typeRefs) {
-          const symbol = typeRef.getType().getAliasSymbol() ?? typeRef.getType().getSymbol();
-          if (symbol) symbolsToProcess.add(symbol);
-        }
+        collectSymbolsFromType(param.getType(), functionSignatureSymbols);
+        collectSymbolsFromType(param.getType(), symbolsToProcess);
       }
+      const returnType = func.getReturnType();
+      collectSymbolsFromType(returnType, functionSignatureSymbols);
+      collectSymbolsFromType(returnType, symbolsToProcess);
     } else if (decl.getKind() === SyntaxKind.InterfaceDeclaration || decl.getKind() === SyntaxKind.TypeAliasDeclaration) {
-      const typeRefs = decl.getDescendantsOfKind(SyntaxKind.TypeReference);
-      for (const typeRef of typeRefs) {
-        const symbol = typeRef.getType().getAliasSymbol() ?? typeRef.getType().getSymbol();
-        if (symbol) symbolsToProcess.add(symbol);
-      }
+      collectSymbolsFromType(decl.getType(), symbolsToProcess);
     }
   }
   const importsMap = /* @__PURE__ */ new Map();
@@ -198,9 +201,25 @@ const generateAppsScriptTypes = async ({
     if (!declaration) {
       continue;
     }
+    if (declaration.getKind() === SyntaxKind.MethodSignature || declaration.getKind() === SyntaxKind.PropertySignature || declaration.getKind() === SyntaxKind.MethodDeclaration || declaration.getKind() === SyntaxKind.PropertyDeclaration) {
+      continue;
+    }
     const sourceFile = declaration.getSourceFile();
     const sourceFilePath = sourceFile.getFilePath();
+    if (/[/\\]typescript[/\\]lib[/\\]/.test(sourceFilePath)) {
+      continue;
+    }
     if (sourceFilePath.includes("node_modules")) {
+      if (functionSignatureSymbols.has(symbol)) {
+        const packageName = getPackageNameFromNodeModulesPath_(sourceFilePath);
+        if (packageName) {
+          processedSymbols.add(symbolName);
+          if (!importsMap.has(packageName)) {
+            importsMap.set(packageName, /* @__PURE__ */ new Set());
+          }
+          importsMap.get(packageName)?.add(symbolName);
+        }
+      }
       continue;
     }
     processedSymbols.add(symbolName);

package/dist/shared/{gasnuki.Cbwq1CES.cjs → gasnuki.D8w16Lbm.cjs}

@@ -68,11 +68,34 @@ const SIMPLE_TRIGGER_FUNCTION_NAMES = [
   "doGet",
   "doPost"
 ];
+const getPackageNameFromNodeModulesPath_ = (filePath) => {
+  const normalizedPath = filePath.replace(/\\/g, "/");
+  const nodeModulesIndex = normalizedPath.lastIndexOf("node_modules/");
+  if (nodeModulesIndex === -1) {
+    return null;
+  }
+  const afterNodeModules = normalizedPath.slice(
+    nodeModulesIndex + "node_modules/".length
+  );
+  const parts = afterNodeModules.split("/");
+  if (parts.length === 0) {
+    return null;
+  }
+  if (parts[0].startsWith("@") && parts.length >= 2) {
+    const scopedName = `${parts[0]}/${parts[1]}`;
+    if (parts[0] === "@types") {
+      return parts[1];
+    }
+    return scopedName;
+  }
+  return parts[0];
+};
 const generateAppsScriptTypes = async ({
   project: projectPath,
   srcDir,
   outDir,
-  outputFile
+  outputFile,
+  projectInstance
 }) => {
   const absoluteSrcDir = path__namespace.resolve(projectPath, srcDir);
   const absoluteOutDir = path__namespace.resolve(projectPath, outDir);
@@ -80,7 +103,7 @@ const generateAppsScriptTypes = async ({
   consola.consola.info("Starting AppsScript type generation with gasnuki...");
   consola.consola.info(`  AppsScript Source Directory: ${absoluteSrcDir}`);
   consola.consola.info(`  Output File: ${absoluteOutputFile}`);
-  const project = new tsMorph.Project({
+  const project = projectInstance ?? new tsMorph.Project({
     tsConfigFilePath: path__namespace.resolve(projectPath, "tsconfig.json"),
     skipAddingFilesFromTsConfig: true
   });
@@ -92,7 +115,6 @@ const generateAppsScriptTypes = async ({
   const methodDefinitions = [];
   const exportedDeclarations = [];
   const exportedDeclarationNames = /* @__PURE__ */ new Set();
-  const exportedFunctions = [];
   for (const sourceFile of sourceFiles) {
     const filePath = sourceFile.getFilePath().replace(/\\/g, "/");
     const srcPath = absoluteSrcDir.replace(/\\/g, "/");
@@ -118,7 +140,6 @@ const generateAppsScriptTypes = async ({
         exportedDeclarations.push(func);
         exportedDeclarationNames.add(name);
         methodDefinitions.push(getInterfaceMethodDefinition_(name, func));
-        exportedFunctions.push(func);
       }
     }
     for (const varStmt of sourceFile.getVariableStatements()) {
@@ -130,7 +151,6 @@ const generateAppsScriptTypes = async ({
           exportedDeclarations.push(varDecl);
           exportedDeclarationNames.add(name);
           methodDefinitions.push(getInterfaceMethodDefinition_(name, funcExpr));
-          exportedFunctions.push(funcExpr);
         }
       }
     }
@@ -162,38 +182,21 @@ const generateAppsScriptTypes = async ({
       }
     }
   };
-  const returnValueSymbols = /* @__PURE__ */ new Set();
-  for (const func of exportedFunctions) {
-    collectSymbolsFromType(func.getReturnType(), returnValueSymbols);
-  }
+  const functionSignatureSymbols = /* @__PURE__ */ new Set();
   const symbolsToProcess = /* @__PURE__ */ new Set();
   for (const decl of exportedDeclarations) {
     if (decl.getKind() === tsMorph.SyntaxKind.FunctionDeclaration || decl.getKind() === tsMorph.SyntaxKind.VariableDeclaration && (decl.getInitializer()?.getKind() === tsMorph.SyntaxKind.ArrowFunction || decl.getInitializer()?.getKind() === tsMorph.SyntaxKind.FunctionExpression)) {
       const func = decl.getKind() === tsMorph.SyntaxKind.FunctionDeclaration ? decl : decl.getInitializer();
       const parameters = func.getParameters();
       for (const param of parameters) {
-        const typeRefs = param.getDescendantsOfKind(tsMorph.SyntaxKind.TypeReference);
-        for (const typeRef of typeRefs) {
-          const symbol = typeRef.getType().getAliasSymbol() ?? typeRef.getType().getSymbol();
-          if (symbol) symbolsToProcess.add(symbol);
-        }
-      }
-      const returnTypeNode = func.getReturnTypeNode();
-      if (returnTypeNode) {
-        const typeRefs = returnTypeNode.getDescendantsOfKind(
-          tsMorph.SyntaxKind.TypeReference
-        );
-        for (const typeRef of typeRefs) {
-          const symbol = typeRef.getType().getAliasSymbol() ?? typeRef.getType().getSymbol();
-          if (symbol) symbolsToProcess.add(symbol);
-        }
+        collectSymbolsFromType(param.getType(), functionSignatureSymbols);
+        collectSymbolsFromType(param.getType(), symbolsToProcess);
       }
+      const returnType = func.getReturnType();
+      collectSymbolsFromType(returnType, functionSignatureSymbols);
+      collectSymbolsFromType(returnType, symbolsToProcess);
     } else if (decl.getKind() === tsMorph.SyntaxKind.InterfaceDeclaration || decl.getKind() === tsMorph.SyntaxKind.TypeAliasDeclaration) {
-      const typeRefs = decl.getDescendantsOfKind(tsMorph.SyntaxKind.TypeReference);
-      for (const typeRef of typeRefs) {
-        const symbol = typeRef.getType().getAliasSymbol() ?? typeRef.getType().getSymbol();
-        if (symbol) symbolsToProcess.add(symbol);
-      }
+      collectSymbolsFromType(decl.getType(), symbolsToProcess);
     }
   }
   const importsMap = /* @__PURE__ */ new Map();
@@ -215,9 +218,25 @@ const generateAppsScriptTypes = async ({
     if (!declaration) {
       continue;
     }
+    if (declaration.getKind() === tsMorph.SyntaxKind.MethodSignature || declaration.getKind() === tsMorph.SyntaxKind.PropertySignature || declaration.getKind() === tsMorph.SyntaxKind.MethodDeclaration || declaration.getKind() === tsMorph.SyntaxKind.PropertyDeclaration) {
+      continue;
+    }
     const sourceFile = declaration.getSourceFile();
     const sourceFilePath = sourceFile.getFilePath();
+    if (/[/\\]typescript[/\\]lib[/\\]/.test(sourceFilePath)) {
+      continue;
+    }
     if (sourceFilePath.includes("node_modules")) {
+      if (functionSignatureSymbols.has(symbol)) {
+        const packageName = getPackageNameFromNodeModulesPath_(sourceFilePath);
+        if (packageName) {
+          processedSymbols.add(symbolName);
+          if (!importsMap.has(packageName)) {
+            importsMap.set(packageName, /* @__PURE__ */ new Set());
+          }
+          importsMap.get(packageName)?.add(symbolName);
+        }
+      }
       continue;
     }
     processedSymbols.add(symbolName);

package/dist/vite.cjs

@@ -2,7 +2,7 @@
 
 const path = require('node:path');
 const consola = require('consola');
-const config = require('./shared/gasnuki.Cbwq1CES.cjs');
+const config = require('./shared/gasnuki.D8w16Lbm.cjs');
 require('node:fs');
 require('ts-morph');
 require('jiti');

package/dist/vite.mjs

@@ -1,6 +1,6 @@
 import * as path from 'node:path';
 import { consola } from 'consola';
-import { l as loadConfig, g as generateAppsScriptTypes } from './shared/gasnuki.Bcijv2Ub.mjs';
+import { l as loadConfig, g as generateAppsScriptTypes } from './shared/gasnuki.D1fp3Uiw.mjs';
 import 'node:fs';
 import 'ts-morph';
 import 'jiti';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ciderjs/gasnuki",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "Type definitions and utilities for Google Apps Script client-side API",
   "main": "dist/index.mjs",
   "types": "dist/index.d.ts",
@@ -30,8 +30,8 @@
     "start": "node dist/cli.mjs -p playground/react -s src/server",
     "check": "biome check --write",
     "build": "unbuild",
-    "test": "vitest run",
-    "test:coverage": "vitest run --coverage",
+    "test": "vitest run --silent",
+    "test:coverage": "vitest run --coverage --silent",
     "update-coverage-badge": "jiti scripts/update-coverage-badge.ts README.md README.ja.md",
     "test:coverage:update": "pnpm test:coverage && pnpm update-coverage-badge",
     "prepublish": "pnpm run generate && pnpm run check && pnpm run test:coverage:update && pnpm run build",
@@ -55,20 +55,20 @@
   },
   "packageManager": "pnpm@10.18.3",
   "dependencies": {
-    "chokidar": "^4.0.3",
-    "commander": "^14.0.1",
+    "chokidar": "^5.0.0",
+    "commander": "^14.0.2",
     "consola": "^3.4.2",
     "jiti": "^2.6.1",
     "ts-morph": "^27.0.2"
   },
   "devDependencies": {
-    "@biomejs/biome": "^2.2.6",
-    "@types/node": "^24.8.0",
-    "@vitest/coverage-v8": "3.2.4",
+    "@biomejs/biome": "^2.3.8",
+    "@types/node": "^25.0.1",
+    "@vitest/coverage-v8": "4.0.15",
     "typescript": "^5.9.3",
     "unbuild": "^3.6.1",
-    "vite": "^7.1.10",
-    "vitest": "3.2.4"
+    "vite": "^7.2.7",
+    "vitest": "4.0.15"
   },
   "peerDependencies": {
     "vite": "^7"

package/.vscode/settings.json

@@ -1,3 +0,0 @@
-{
-  "cSpell.words": ["gasnuki"]
-}