@ciderjs/gasnuki 0.5.1 → 0.5.3

package/README.ja.md

@@ -1,7 +1,7 @@
 # @ciderjs/gasnuki
 
 [![README-en](https://img.shields.io/badge/English-blue?logo=ReadMe)](./README.md)
-[![Test Coverage](https://img.shields.io/badge/test%20coverage-92.76%25-brightgreen)](https://github.com/luthpg/gasnuki)
+[![Test Coverage](https://img.shields.io/badge/test%20coverage-89.02%25-green)](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)
 ![NPM Downloads](https://img.shields.io/npm/dw/@ciderjs/gasnuki)

package/README.md

@@ -1,7 +1,7 @@
 # @ciderjs/gasnuki
 
 [![README-ja](https://img.shields.io/badge/日本語-blue?logo=ReadMe)](./README.ja.md)
-[![Test Coverage](https://img.shields.io/badge/test%20coverage-92.76%25-brightgreen)](https://github.com/luthpg/gasnuki)
+[![Test Coverage](https://img.shields.io/badge/test%20coverage-89.02%25-green)](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)
 ![NPM Downloads](https://img.shields.io/npm/dw/@ciderjs/gasnuki)

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.Co0-wxJi.cjs');
+const config = require('./shared/gasnuki.CDe7f-cZ.cjs');
 require('chokidar');
 require('consola');
 require('node:crypto');
@@ -26,7 +26,7 @@ function _interopNamespaceCompat(e) {
 
 const path__namespace = /*#__PURE__*/_interopNamespaceCompat(path);
 
-const version = "0.5.1";
+const version = "0.5.3";
 
 const parseArgs = async (command) => {
   const cliOpts = command.opts();

package/dist/cli.mjs

@@ -2,7 +2,7 @@
 import * as path from 'node:path';
 import { Command } from 'commander';
 import { generateTypes } from './index.mjs';
-import { l as loadConfig } from './shared/gasnuki.DePJgSg9.mjs';
+import { l as loadConfig } from './shared/gasnuki.BAmTBfMa.mjs';
 import 'chokidar';
 import 'consola';
 import 'node:crypto';
@@ -10,7 +10,7 @@ import 'node:fs';
 import 'ts-morph';
 import 'jiti';
 
-const version = "0.5.1";
+const version = "0.5.3";
 
 const parseArgs = async (command) => {
   const cliOpts = command.opts();

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.Co0-wxJi.cjs');
+const config = require('./shared/gasnuki.CDe7f-cZ.cjs');
 require('node:crypto');
 require('node:fs');
 require('ts-morph');

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.DePJgSg9.mjs';
-export { d as defineConfig } from './shared/gasnuki.DePJgSg9.mjs';
+import { g as generateAppsScriptTypes } from './shared/gasnuki.BAmTBfMa.mjs';
+export { d as defineConfig } from './shared/gasnuki.BAmTBfMa.mjs';
 import 'node:crypto';
 import 'node:fs';
 import 'ts-morph';

package/dist/shared/{gasnuki.DePJgSg9.mjs → gasnuki.BAmTBfMa.mjs}

@@ -2,7 +2,7 @@ import * as crypto from 'node:crypto';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 import { consola } from 'consola';
-import { Project, SyntaxKind, SymbolFlags } from 'ts-morph';
+import { Project, SyntaxKind, SymbolFlags, Node } 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 _WebAppLocationType {\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: (callback: (location: _WebAppLocationType) => void) => void;\n    };\n    history: {\n      push: _AppsScriptHistoryFunction;\n      replace: _AppsScriptHistoryFunction;\n      setChangeHandler: (\n        callback: (e: { state: object; location: _WebAppLocationType }) => void,\n      ) => void;\n    };\n  };\n}\n\ndeclare global {\n  const google: GoogleClientSideApi;\n}\n";
@@ -72,27 +72,86 @@ 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 packageJsonCache = /* @__PURE__ */ new Map();
+const findPackageJson_ = (startDir) => {
+  let currentDir = startDir;
+  while (true) {
+    if (packageJsonCache.has(currentDir)) {
+      return packageJsonCache.get(currentDir);
+    }
+    const pkgPath = path.join(currentDir, "package.json");
+    if (fs.existsSync(pkgPath)) {
+      try {
+        const content = JSON.parse(fs.readFileSync(pkgPath, "utf-8"));
+        const result = { path: pkgPath, content };
+        packageJsonCache.set(currentDir, result);
+        if (currentDir !== startDir) {
+          packageJsonCache.set(startDir, result);
+        }
+        return result;
+      } catch {
+      }
+    }
+    const parentDir = path.dirname(currentDir);
+    if (parentDir === currentDir) {
+      packageJsonCache.set(currentDir, null);
+      if (currentDir !== startDir) {
+        packageJsonCache.set(startDir, null);
+      }
+      break;
+    }
+    currentDir = parentDir;
   }
-  const afterNodeModules = normalizedPath.slice(
-    nodeModulesIndex + "node_modules/".length
-  );
-  const parts = afterNodeModules.split("/");
-  if (parts.length === 0) {
-    return null;
+  return null;
+};
+const matchesExportValue_ = (node, targetPath) => {
+  if (typeof node === "string") {
+    return node === targetPath || node === targetPath.replace(/\.d\.ts$/, ".js");
   }
-  if (parts[0].startsWith("@") && parts.length >= 2) {
-    const scopedName = `${parts[0]}/${parts[1]}`;
-    if (parts[0] === "@types") {
-      return parts[1];
+  if (typeof node === "object" && node !== null) {
+    if (node.types && node.types === targetPath) {
+      return true;
+    }
+    for (const key in node) {
+      if (matchesExportValue_(node[key], targetPath)) {
+        return true;
+      }
     }
-    return scopedName;
   }
-  return parts[0];
+  return false;
+};
+const resolveNodeModuleSpecifier_ = (filePath) => {
+  const pkg = findPackageJson_(path.dirname(filePath));
+  if (!pkg) return null;
+  let packageName = pkg.content.name;
+  if (packageName.startsWith("@types/")) {
+    packageName = packageName.slice(7);
+  }
+  const packageRoot = path.dirname(pkg.path);
+  let relativePath = path.relative(packageRoot, filePath).replace(/\\/g, "/");
+  if (!relativePath.startsWith(".")) {
+    relativePath = `./${relativePath}`;
+  }
+  if (pkg.content.exports) {
+    for (const key in pkg.content.exports) {
+      const exportValue = pkg.content.exports[key];
+      if (matchesExportValue_(exportValue, relativePath)) {
+        if (key === ".") return packageName;
+        return path.posix.join(packageName, key);
+      }
+    }
+  }
+  const mainTypes = pkg.content.types || pkg.content.typings;
+  if (mainTypes) {
+    let normalizedMain = mainTypes.replace(/\\/g, "/");
+    if (!normalizedMain.startsWith(".")) {
+      normalizedMain = `./${normalizedMain}`;
+    }
+    if (normalizedMain === relativePath) {
+      return packageName;
+    }
+  }
+  return packageName;
 };
 const generateAppsScriptTypes = async ({
   project: projectPath,
@@ -109,8 +168,12 @@ const generateAppsScriptTypes = async ({
   consola.info("Starting AppsScript type generation with gasnuki...");
   consola.info(`  AppsScript Source Directory: ${absoluteSrcDir}`);
   consola.info(`  Output File: ${absoluteOutputFile}`);
+  let tsConfigFilePath = path.resolve(projectPath, "tsconfig.json");
+  if (fs.existsSync(path.resolve(projectPath, "tsconfig.app.json"))) {
+    tsConfigFilePath = path.resolve(projectPath, "tsconfig.app.json");
+  }
   const project = projectInstance ?? new Project({
-    tsConfigFilePath: path.resolve(projectPath, "tsconfig.json"),
+    tsConfigFilePath,
     skipAddingFilesFromTsConfig: true
   });
   const sourceFilesPattern = path.join(absoluteSrcDir, "**/*.ts").replace(/\\/g, "/");
@@ -407,7 +470,17 @@ const generateAppsScriptTypes = async ({
         if (!functionSignatureSymbols.has(symbol)) {
           continue;
         }
-        const packageName = getPackageNameFromNodeModulesPath_(sourceFilePath);
+        const hasExportModifier = sourceFile.getStatements().some((stmt) => {
+          if (Node.isExportable(stmt)) {
+            return stmt.isExported();
+          }
+          return false;
+        });
+        const isGlobal = sourceFile.getImportDeclarations().length === 0 && sourceFile.getExportDeclarations().length === 0 && sourceFile.getExportAssignments().length === 0 && !hasExportModifier;
+        if (isGlobal) {
+          continue;
+        }
+        const packageName = resolveNodeModuleSpecifier_(sourceFilePath);
         if (packageName) {
           processedSymbols.add(symbolName);
           if (!importsMap.has(packageName)) {

package/dist/shared/{gasnuki.Co0-wxJi.cjs → gasnuki.CDe7f-cZ.cjs}

@@ -90,27 +90,86 @@ 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 packageJsonCache = /* @__PURE__ */ new Map();
+const findPackageJson_ = (startDir) => {
+  let currentDir = startDir;
+  while (true) {
+    if (packageJsonCache.has(currentDir)) {
+      return packageJsonCache.get(currentDir);
+    }
+    const pkgPath = path__namespace.join(currentDir, "package.json");
+    if (fs__namespace.existsSync(pkgPath)) {
+      try {
+        const content = JSON.parse(fs__namespace.readFileSync(pkgPath, "utf-8"));
+        const result = { path: pkgPath, content };
+        packageJsonCache.set(currentDir, result);
+        if (currentDir !== startDir) {
+          packageJsonCache.set(startDir, result);
+        }
+        return result;
+      } catch {
+      }
+    }
+    const parentDir = path__namespace.dirname(currentDir);
+    if (parentDir === currentDir) {
+      packageJsonCache.set(currentDir, null);
+      if (currentDir !== startDir) {
+        packageJsonCache.set(startDir, null);
+      }
+      break;
+    }
+    currentDir = parentDir;
   }
-  const afterNodeModules = normalizedPath.slice(
-    nodeModulesIndex + "node_modules/".length
-  );
-  const parts = afterNodeModules.split("/");
-  if (parts.length === 0) {
-    return null;
+  return null;
+};
+const matchesExportValue_ = (node, targetPath) => {
+  if (typeof node === "string") {
+    return node === targetPath || node === targetPath.replace(/\.d\.ts$/, ".js");
   }
-  if (parts[0].startsWith("@") && parts.length >= 2) {
-    const scopedName = `${parts[0]}/${parts[1]}`;
-    if (parts[0] === "@types") {
-      return parts[1];
+  if (typeof node === "object" && node !== null) {
+    if (node.types && node.types === targetPath) {
+      return true;
+    }
+    for (const key in node) {
+      if (matchesExportValue_(node[key], targetPath)) {
+        return true;
+      }
     }
-    return scopedName;
   }
-  return parts[0];
+  return false;
+};
+const resolveNodeModuleSpecifier_ = (filePath) => {
+  const pkg = findPackageJson_(path__namespace.dirname(filePath));
+  if (!pkg) return null;
+  let packageName = pkg.content.name;
+  if (packageName.startsWith("@types/")) {
+    packageName = packageName.slice(7);
+  }
+  const packageRoot = path__namespace.dirname(pkg.path);
+  let relativePath = path__namespace.relative(packageRoot, filePath).replace(/\\/g, "/");
+  if (!relativePath.startsWith(".")) {
+    relativePath = `./${relativePath}`;
+  }
+  if (pkg.content.exports) {
+    for (const key in pkg.content.exports) {
+      const exportValue = pkg.content.exports[key];
+      if (matchesExportValue_(exportValue, relativePath)) {
+        if (key === ".") return packageName;
+        return path__namespace.posix.join(packageName, key);
+      }
+    }
+  }
+  const mainTypes = pkg.content.types || pkg.content.typings;
+  if (mainTypes) {
+    let normalizedMain = mainTypes.replace(/\\/g, "/");
+    if (!normalizedMain.startsWith(".")) {
+      normalizedMain = `./${normalizedMain}`;
+    }
+    if (normalizedMain === relativePath) {
+      return packageName;
+    }
+  }
+  return packageName;
 };
 const generateAppsScriptTypes = async ({
   project: projectPath,
@@ -127,8 +186,12 @@ 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}`);
+  let tsConfigFilePath = path__namespace.resolve(projectPath, "tsconfig.json");
+  if (fs__namespace.existsSync(path__namespace.resolve(projectPath, "tsconfig.app.json"))) {
+    tsConfigFilePath = path__namespace.resolve(projectPath, "tsconfig.app.json");
+  }
   const project = projectInstance ?? new tsMorph.Project({
-    tsConfigFilePath: path__namespace.resolve(projectPath, "tsconfig.json"),
+    tsConfigFilePath,
     skipAddingFilesFromTsConfig: true
   });
   const sourceFilesPattern = path__namespace.join(absoluteSrcDir, "**/*.ts").replace(/\\/g, "/");
@@ -425,7 +488,17 @@ const generateAppsScriptTypes = async ({
         if (!functionSignatureSymbols.has(symbol)) {
           continue;
         }
-        const packageName = getPackageNameFromNodeModulesPath_(sourceFilePath);
+        const hasExportModifier = sourceFile.getStatements().some((stmt) => {
+          if (tsMorph.Node.isExportable(stmt)) {
+            return stmt.isExported();
+          }
+          return false;
+        });
+        const isGlobal = sourceFile.getImportDeclarations().length === 0 && sourceFile.getExportDeclarations().length === 0 && sourceFile.getExportAssignments().length === 0 && !hasExportModifier;
+        if (isGlobal) {
+          continue;
+        }
+        const packageName = resolveNodeModuleSpecifier_(sourceFilePath);
         if (packageName) {
           processedSymbols.add(symbolName);
           if (!importsMap.has(packageName)) {

package/dist/vite.cjs

@@ -2,7 +2,7 @@
 
 const path = require('node:path');
 const consola = require('consola');
-const config = require('./shared/gasnuki.Co0-wxJi.cjs');
+const config = require('./shared/gasnuki.CDe7f-cZ.cjs');
 require('node:crypto');
 require('node:fs');
 require('ts-morph');

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.DePJgSg9.mjs';
+import { l as loadConfig, g as generateAppsScriptTypes } from './shared/gasnuki.BAmTBfMa.mjs';
 import 'node:crypto';
 import 'node:fs';
 import 'ts-morph';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ciderjs/gasnuki",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "description": "Type definitions and utilities for Google Apps Script client-side API",
   "main": "dist/index.mjs",
   "types": "dist/index.d.ts",
@@ -68,12 +68,12 @@
   },
   "devDependencies": {
     "@biomejs/biome": "^2.3.11",
-    "@types/node": "^25.0.5",
-    "@vitest/coverage-v8": "4.0.16",
+    "@types/node": "^25.0.9",
+    "@vitest/coverage-v8": "4.0.17",
     "typescript": "^5.9.3",
     "unbuild": "^3.6.1",
     "vite": "^7.3.1",
-    "vitest": "4.0.16"
+    "vitest": "4.0.17"
   },
   "peerDependencies": {
     "vite": "^7"