@ciderjs/gasnuki 0.5.2 → 0.5.4

package/README.ja.md

@@ -1,10 +1,10 @@
 # @ciderjs/gasnuki
 
 [![README-en](https://img.shields.io/badge/English-blue?logo=ReadMe)](./README.md)
-[![Test Coverage](https://img.shields.io/badge/test%20coverage-89.07%25-green)](https://github.com/luthpg/gasnuki)
+[![Test Coverage](https://img.shields.io/badge/test%20coverage-91.22%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)
-![NPM Downloads](https://img.shields.io/npm/dw/@ciderjs/gasnuki)
+[![NPM Downloads](https://img.shields.io/npm/dw/@ciderjs/gasnuki)](https://www.npmjs.com/package/@ciderjs/gasnuki)
 [![GitHub issues](https://img.shields.io/github/issues/luthpg/gasnuki.svg)](https://github.com/luthpg/gasnuki/issues)
 
 Google Apps Script クライアントサイドAPIの型定義・ユーティリティ

package/README.md

@@ -1,10 +1,10 @@
 # @ciderjs/gasnuki
 
 [![README-ja](https://img.shields.io/badge/日本語-blue?logo=ReadMe)](./README.ja.md)
-[![Test Coverage](https://img.shields.io/badge/test%20coverage-89.07%25-green)](https://github.com/luthpg/gasnuki)
+[![Test Coverage](https://img.shields.io/badge/test%20coverage-91.22%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)
-![NPM Downloads](https://img.shields.io/npm/dw/@ciderjs/gasnuki)
+[![NPM Downloads](https://img.shields.io/npm/dw/@ciderjs/gasnuki)](https://www.npmjs.com/package/@ciderjs/gasnuki)
 [![GitHub issues](https://img.shields.io/github/issues/luthpg/gasnuki.svg)](https://github.com/luthpg/gasnuki/issues)
 
 Type definitions and utilities for Google Apps Script client-side API

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.Clw_jH65.cjs');
+const config = require('./shared/gasnuki.D2FZdJSt.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.2";
+const version = "0.5.4";
 
 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.CYbD-wKI.mjs';
+import { l as loadConfig } from './shared/gasnuki.Ee5cF3d4.mjs';
 import 'chokidar';
 import 'consola';
 import 'node:crypto';
@@ -10,7 +10,7 @@ import 'node:fs';
 import 'ts-morph';
 import 'jiti';
 
-const version = "0.5.2";
+const version = "0.5.4";
 
 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.Clw_jH65.cjs');
+const config = require('./shared/gasnuki.D2FZdJSt.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.CYbD-wKI.mjs';
-export { d as defineConfig } from './shared/gasnuki.CYbD-wKI.mjs';
+import { g as generateAppsScriptTypes } from './shared/gasnuki.Ee5cF3d4.mjs';
+export { d as defineConfig } from './shared/gasnuki.Ee5cF3d4.mjs';
 import 'node:crypto';
 import 'node:fs';
 import 'ts-morph';

package/dist/shared/{gasnuki.Clw_jH65.cjs → gasnuki.D2FZdJSt.cjs}

@@ -123,15 +123,18 @@ const findPackageJson_ = (startDir) => {
   return null;
 };
 const matchesExportValue_ = (node, targetPath) => {
+  const normalize = (p) => p.startsWith(".") ? p : `./${p}`;
+  const normalizedTarget = normalize(targetPath);
   if (typeof node === "string") {
-    return node === targetPath || node === targetPath.replace(/\.d\.ts$/, ".js");
+    const normalizedNode = normalize(node);
+    return normalizedNode === normalizedTarget || normalizedNode === normalizedTarget.replace(/\.d\.ts$/, ".js");
   }
   if (typeof node === "object" && node !== null) {
-    if (node.types && node.types === targetPath) {
+    if (node.types && matchesExportValue_(node.types, targetPath)) {
       return true;
     }
     for (const key in node) {
-      if (matchesExportValue_(node[key], targetPath)) {
+      if (key !== "types" && matchesExportValue_(node[key], targetPath)) {
         return true;
       }
     }
@@ -155,7 +158,13 @@ const resolveNodeModuleSpecifier_ = (filePath) => {
       const exportValue = pkg.content.exports[key];
       if (matchesExportValue_(exportValue, relativePath)) {
         if (key === ".") return packageName;
-        return path__namespace.posix.join(packageName, key);
+        const subPath = key.startsWith("./") ? key.slice(2) : key;
+        console.log(`[gasnuki] Matched key: ${key}, subPath: ${subPath}`);
+        return `${packageName}/${subPath}`;
+      } else {
+        console.log(
+          `[gasnuki] No match for ${key}: ${JSON.stringify(exportValue)} vs ${relativePath} (pkgRoot: ${packageRoot}, file: ${filePath})`
+        );
       }
     }
   }
@@ -488,6 +497,16 @@ const generateAppsScriptTypes = async ({
         if (!functionSignatureSymbols.has(symbol)) {
           continue;
         }
+        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);

package/dist/shared/{gasnuki.CYbD-wKI.mjs → gasnuki.Ee5cF3d4.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";
@@ -105,15 +105,18 @@ const findPackageJson_ = (startDir) => {
   return null;
 };
 const matchesExportValue_ = (node, targetPath) => {
+  const normalize = (p) => p.startsWith(".") ? p : `./${p}`;
+  const normalizedTarget = normalize(targetPath);
   if (typeof node === "string") {
-    return node === targetPath || node === targetPath.replace(/\.d\.ts$/, ".js");
+    const normalizedNode = normalize(node);
+    return normalizedNode === normalizedTarget || normalizedNode === normalizedTarget.replace(/\.d\.ts$/, ".js");
   }
   if (typeof node === "object" && node !== null) {
-    if (node.types && node.types === targetPath) {
+    if (node.types && matchesExportValue_(node.types, targetPath)) {
       return true;
     }
     for (const key in node) {
-      if (matchesExportValue_(node[key], targetPath)) {
+      if (key !== "types" && matchesExportValue_(node[key], targetPath)) {
         return true;
       }
     }
@@ -137,7 +140,13 @@ const resolveNodeModuleSpecifier_ = (filePath) => {
       const exportValue = pkg.content.exports[key];
       if (matchesExportValue_(exportValue, relativePath)) {
         if (key === ".") return packageName;
-        return path.posix.join(packageName, key);
+        const subPath = key.startsWith("./") ? key.slice(2) : key;
+        console.log(`[gasnuki] Matched key: ${key}, subPath: ${subPath}`);
+        return `${packageName}/${subPath}`;
+      } else {
+        console.log(
+          `[gasnuki] No match for ${key}: ${JSON.stringify(exportValue)} vs ${relativePath} (pkgRoot: ${packageRoot}, file: ${filePath})`
+        );
       }
     }
   }
@@ -470,6 +479,16 @@ const generateAppsScriptTypes = async ({
         if (!functionSignatureSymbols.has(symbol)) {
           continue;
         }
+        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);

package/dist/vite.cjs

@@ -2,7 +2,7 @@
 
 const path = require('node:path');
 const consola = require('consola');
-const config = require('./shared/gasnuki.Clw_jH65.cjs');
+const config = require('./shared/gasnuki.D2FZdJSt.cjs');
 require('node:crypto');
 require('node:fs');
 require('ts-morph');
@@ -54,31 +54,41 @@ function gasnuki(options) {
     name: "vite-plugin-gasnuki",
     apply: "serve",
     // Apply only in serve mode
-    async configResolved(config$1) {
-      projectRoot = config$1.root;
-      const fileConfig = await config.loadConfig(projectRoot);
-      const defaultOptions = {
-        srcDir: "server",
-        outDir: "types",
-        outputFile: "appsscript.ts"
-      };
-      gasnukiOptions = {
-        ...defaultOptions,
-        ...fileConfig,
-        ...options || {}
-      };
+    async configResolved(config) {
+      projectRoot = config.root;
+      await reloadOptions();
     },
     async configureServer(server) {
-      const targetDir = path__namespace.resolve(projectRoot, gasnukiOptions.srcDir);
-      runGeneration("server startup");
-      server.watcher.on("all", (_event, filePath) => {
+      server.watcher.on("all", async (_event, filePath) => {
+        const fileName = path__namespace.basename(filePath);
+        if (fileName.startsWith("gasnuki.config.")) {
+          consola.consola.info("[gasnuki] Config file changed, reloading...");
+          await reloadOptions();
+          runGeneration("config change");
+          return;
+        }
+        const targetDir = path__namespace.resolve(projectRoot, gasnukiOptions.srcDir);
         const relativePath = path__namespace.relative(targetDir, filePath);
         if (!relativePath.startsWith("..") && relativePath !== "..") {
           runGeneration(path__namespace.relative(projectRoot, filePath));
         }
       });
+      runGeneration("server startup");
     }
   };
+  async function reloadOptions() {
+    const fileConfig = await config.loadConfig(projectRoot);
+    const defaultOptions = {
+      srcDir: "server",
+      outDir: "types",
+      outputFile: "appsscript.ts"
+    };
+    gasnukiOptions = {
+      ...defaultOptions,
+      ...fileConfig,
+      ...options || {}
+    };
+  }
 }
 
 exports.gasnuki = gasnuki;

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.CYbD-wKI.mjs';
+import { l as loadConfig, g as generateAppsScriptTypes } from './shared/gasnuki.Ee5cF3d4.mjs';
 import 'node:crypto';
 import 'node:fs';
 import 'ts-morph';
@@ -40,29 +40,39 @@ function gasnuki(options) {
     // Apply only in serve mode
     async configResolved(config) {
       projectRoot = config.root;
-      const fileConfig = await loadConfig(projectRoot);
-      const defaultOptions = {
-        srcDir: "server",
-        outDir: "types",
-        outputFile: "appsscript.ts"
-      };
-      gasnukiOptions = {
-        ...defaultOptions,
-        ...fileConfig,
-        ...options || {}
-      };
+      await reloadOptions();
     },
     async configureServer(server) {
-      const targetDir = path.resolve(projectRoot, gasnukiOptions.srcDir);
-      runGeneration("server startup");
-      server.watcher.on("all", (_event, filePath) => {
+      server.watcher.on("all", async (_event, filePath) => {
+        const fileName = path.basename(filePath);
+        if (fileName.startsWith("gasnuki.config.")) {
+          consola.info("[gasnuki] Config file changed, reloading...");
+          await reloadOptions();
+          runGeneration("config change");
+          return;
+        }
+        const targetDir = path.resolve(projectRoot, gasnukiOptions.srcDir);
         const relativePath = path.relative(targetDir, filePath);
         if (!relativePath.startsWith("..") && relativePath !== "..") {
           runGeneration(path.relative(projectRoot, filePath));
         }
       });
+      runGeneration("server startup");
     }
   };
+  async function reloadOptions() {
+    const fileConfig = await loadConfig(projectRoot);
+    const defaultOptions = {
+      srcDir: "server",
+      outDir: "types",
+      outputFile: "appsscript.ts"
+    };
+    gasnukiOptions = {
+      ...defaultOptions,
+      ...fileConfig,
+      ...options || {}
+    };
+  }
 }
 
 export { gasnuki };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ciderjs/gasnuki",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "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.6",
-    "@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"