@ciderjs/gasnuki 0.5.0 → 0.5.2

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-93.03%25-brightgreen)](https://github.com/luthpg/gasnuki)
+[![Test Coverage](https://img.shields.io/badge/test%20coverage-89.07%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-93.03%25-brightgreen)](https://github.com/luthpg/gasnuki)
+[![Test Coverage](https://img.shields.io/badge/test%20coverage-89.07%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.Clw_jH65.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.0";
+const version = "0.5.2";
 
 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.CYbD-wKI.mjs';
 import 'chokidar';
 import 'consola';
 import 'node:crypto';
@@ -10,7 +10,7 @@ import 'node:fs';
 import 'ts-morph';
 import 'jiti';
 
-const version = "0.5.0";
+const version = "0.5.2";
 
 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.Clw_jH65.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.CYbD-wKI.mjs';
+export { d as defineConfig } from './shared/gasnuki.CYbD-wKI.mjs';
 import 'node:crypto';
 import 'node:fs';
 import 'ts-morph';

package/dist/promise.cjs

@@ -7,7 +7,24 @@ function getPromisedServerScripts(options = {}) {
   return new Proxy(mockupFunctions, {
     get(target, method) {
       if (!("google" in globalThis) || !google?.script?.run) {
-        return target[method];
+        const mockFunc = target[method];
+        if (!mockFunc) {
+          return void 0;
+        }
+        if (!parseJson) {
+          return mockFunc;
+        }
+        return async (...args) => {
+          const res = await mockFunc(...args);
+          if (typeof res === "string") {
+            try {
+              return json.deserialize(res);
+            } catch {
+              return res;
+            }
+          }
+          return res;
+        };
       }
       if (!(method in google.script.run)) {
         throw Error(`Method ${method} not found in AppsScript.`);

package/dist/promise.d.cts

@@ -10,7 +10,7 @@ type PromisedWithJson<T> = {
 type PartialScriptType<T> = Partial<Promised<T>>;
 type PartialScriptTypeWithJson<T> = Partial<PromisedWithJson<T>>;
 type GetPromisedServerScriptsOptions<T, IsJson extends boolean = boolean> = {
-    mockupFunctions?: IsJson extends true ? PartialScriptTypeWithJson<T> : PartialScriptType<T>;
+    mockupFunctions?: PartialScriptType<T>;
     parseJson?: IsJson;
 };
 declare function getPromisedServerScripts<T extends Record<string, (...args: any[]) => any> = Omit<typeof google.script.run, 'withSuccessHandler' | 'withFailureHandler' | 'withUserObject'>>(options: GetPromisedServerScriptsOptions<T, true>): PromisedWithJson<T>;

package/dist/promise.d.mts

@@ -10,7 +10,7 @@ type PromisedWithJson<T> = {
 type PartialScriptType<T> = Partial<Promised<T>>;
 type PartialScriptTypeWithJson<T> = Partial<PromisedWithJson<T>>;
 type GetPromisedServerScriptsOptions<T, IsJson extends boolean = boolean> = {
-    mockupFunctions?: IsJson extends true ? PartialScriptTypeWithJson<T> : PartialScriptType<T>;
+    mockupFunctions?: PartialScriptType<T>;
     parseJson?: IsJson;
 };
 declare function getPromisedServerScripts<T extends Record<string, (...args: any[]) => any> = Omit<typeof google.script.run, 'withSuccessHandler' | 'withFailureHandler' | 'withUserObject'>>(options: GetPromisedServerScriptsOptions<T, true>): PromisedWithJson<T>;

package/dist/promise.d.ts

@@ -10,7 +10,7 @@ type PromisedWithJson<T> = {
 type PartialScriptType<T> = Partial<Promised<T>>;
 type PartialScriptTypeWithJson<T> = Partial<PromisedWithJson<T>>;
 type GetPromisedServerScriptsOptions<T, IsJson extends boolean = boolean> = {
-    mockupFunctions?: IsJson extends true ? PartialScriptTypeWithJson<T> : PartialScriptType<T>;
+    mockupFunctions?: PartialScriptType<T>;
     parseJson?: IsJson;
 };
 declare function getPromisedServerScripts<T extends Record<string, (...args: any[]) => any> = Omit<typeof google.script.run, 'withSuccessHandler' | 'withFailureHandler' | 'withUserObject'>>(options: GetPromisedServerScriptsOptions<T, true>): PromisedWithJson<T>;

package/dist/promise.mjs

@@ -5,7 +5,24 @@ function getPromisedServerScripts(options = {}) {
   return new Proxy(mockupFunctions, {
     get(target, method) {
       if (!("google" in globalThis) || !google?.script?.run) {
-        return target[method];
+        const mockFunc = target[method];
+        if (!mockFunc) {
+          return void 0;
+        }
+        if (!parseJson) {
+          return mockFunc;
+        }
+        return async (...args) => {
+          const res = await mockFunc(...args);
+          if (typeof res === "string") {
+            try {
+              return deserialize(res);
+            } catch {
+              return res;
+            }
+          }
+          return res;
+        };
       }
       if (!(method in google.script.run)) {
         throw Error(`Method ${method} not found in AppsScript.`);

package/dist/shared/{gasnuki.DePJgSg9.mjs → gasnuki.CYbD-wKI.mjs}

@@ -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 (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 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 (parts[0].startsWith("@") && parts.length >= 2) {
-    const scopedName = `${parts[0]}/${parts[1]}`;
-    if (parts[0] === "@types") {
-      return parts[1];
+  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);
+      }
     }
-    return scopedName;
   }
-  return parts[0];
+  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,7 @@ const generateAppsScriptTypes = async ({
         if (!functionSignatureSymbols.has(symbol)) {
           continue;
         }
-        const packageName = getPackageNameFromNodeModulesPath_(sourceFilePath);
+        const packageName = resolveNodeModuleSpecifier_(sourceFilePath);
         if (packageName) {
           processedSymbols.add(symbolName);
           if (!importsMap.has(packageName)) {

package/dist/shared/{gasnuki.Co0-wxJi.cjs → gasnuki.Clw_jH65.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 (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 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 (parts[0].startsWith("@") && parts.length >= 2) {
-    const scopedName = `${parts[0]}/${parts[1]}`;
-    if (parts[0] === "@types") {
-      return parts[1];
+  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);
+      }
     }
-    return scopedName;
   }
-  return parts[0];
+  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,7 @@ const generateAppsScriptTypes = async ({
         if (!functionSignatureSymbols.has(symbol)) {
           continue;
         }
-        const packageName = getPackageNameFromNodeModulesPath_(sourceFilePath);
+        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.Clw_jH65.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.CYbD-wKI.mjs';
 import 'node:crypto';
 import 'node:fs';
 import 'ts-morph';

package/package.json

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