@ciderjs/gasnuki 0.3.8 → 0.4.1

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.63%25-brightgreen)](https://github.com/luthpg/gasnuki)
+[![Test Coverage](https://img.shields.io/badge/test%20coverage-93.02%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)

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.63%25-brightgreen)](https://github.com/luthpg/gasnuki)
+[![Test Coverage](https://img.shields.io/badge/test%20coverage-93.02%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)

package/dist/cli.cjs

@@ -4,9 +4,10 @@
 const path = require('node:path');
 const commander = require('commander');
 const index = require('./index.cjs');
-const config = require('./shared/gasnuki.BVdkJsiP.cjs');
+const config = require('./shared/gasnuki.Co0-wxJi.cjs');
 require('chokidar');
 require('consola');
+require('node:crypto');
 require('node:fs');
 require('ts-morph');
 require('jiti');
@@ -25,7 +26,7 @@ function _interopNamespaceCompat(e) {
 
 const path__namespace = /*#__PURE__*/_interopNamespaceCompat(path);
 
-const version = "0.3.8";
+const version = "0.4.1";
 
 const parseArgs = async (command) => {
   const cliOpts = command.opts();
@@ -69,7 +70,7 @@ const runCli = async () => {
     "-o, --outDir <dir>",
     "Output directory name (relative to project root)",
     "types"
-  ).option("-f, --outputFile <file>", "Output file name", "appsscript.ts").option("-w, --watch", "Watch for changes and re-generate types", false);
+  ).option("-f, --outputFile <file>", "Output file name", "appsscript.ts").option("-w, --watch", "Watch for changes and re-generate types", false).option("--cache", "Enable checking generation cache", true).option("--no-cache", "Disable checking generation cache", true);
   await program.parseAsync(process.argv);
 };
 const isMainModule = typeof require !== "undefined" && require.main === module;

package/dist/cli.mjs

@@ -2,14 +2,15 @@
 import * as path from 'node:path';
 import { Command } from 'commander';
 import { generateTypes } from './index.mjs';
-import { l as loadConfig } from './shared/gasnuki.Cd8JOTQ5.mjs';
+import { l as loadConfig } from './shared/gasnuki.DePJgSg9.mjs';
 import 'chokidar';
 import 'consola';
+import 'node:crypto';
 import 'node:fs';
 import 'ts-morph';
 import 'jiti';
 
-const version = "0.3.8";
+const version = "0.4.1";
 
 const parseArgs = async (command) => {
   const cliOpts = command.opts();
@@ -53,7 +54,7 @@ const runCli = async () => {
     "-o, --outDir <dir>",
     "Output directory name (relative to project root)",
     "types"
-  ).option("-f, --outputFile <file>", "Output file name", "appsscript.ts").option("-w, --watch", "Watch for changes and re-generate types", false);
+  ).option("-f, --outputFile <file>", "Output file name", "appsscript.ts").option("-w, --watch", "Watch for changes and re-generate types", false).option("--cache", "Enable checking generation cache", true).option("--no-cache", "Disable checking generation cache", true);
   await program.parseAsync(process.argv);
 };
 const isMainModule = typeof require !== "undefined" && require.main === module;

package/dist/index.cjs

@@ -3,7 +3,8 @@
 const path = require('node:path');
 const chokidar = require('chokidar');
 const consola = require('consola');
-const config = require('./shared/gasnuki.BVdkJsiP.cjs');
+const config = require('./shared/gasnuki.Co0-wxJi.cjs');
+require('node:crypto');
 require('node:fs');
 require('ts-morph');
 require('jiti');
@@ -28,13 +29,23 @@ const generateTypes = async ({
   srcDir,
   outDir,
   outputFile,
-  watch
+  watch,
+  cache
 }) => {
+  if (cache === false) {
+    consola.consola.info("Generation cache is disabled");
+  }
   const runGeneration = async (triggeredBy) => {
     const reason = triggeredBy ? ` (${triggeredBy})` : "";
     consola.consola.info(`Generating AppsScript types${reason}...`);
     try {
-      await config.generateAppsScriptTypes({ project, srcDir, outDir, outputFile });
+      await config.generateAppsScriptTypes({
+        project,
+        srcDir,
+        outDir,
+        outputFile,
+        cache
+      });
       consola.consola.info("Type generation complete.");
     } catch (e) {
       consola.consola.error(`Type generation failed: ${e.message}`, e);

package/dist/index.d.cts

@@ -16,8 +16,9 @@ interface GenerateOptions {
     outDir: string;
     outputFile: string;
     watch: boolean;
+    cache?: boolean;
 }
-declare const generateTypes: ({ project, srcDir, outDir, outputFile, watch, }: GenerateOptions) => Promise<void>;
+declare const generateTypes: ({ project, srcDir, outDir, outputFile, watch, cache, }: GenerateOptions) => Promise<void>;
 
 export { defineConfig, generateTypes };
 export type { GenerateOptions, UserConfig };

package/dist/index.d.mts

@@ -16,8 +16,9 @@ interface GenerateOptions {
     outDir: string;
     outputFile: string;
     watch: boolean;
+    cache?: boolean;
 }
-declare const generateTypes: ({ project, srcDir, outDir, outputFile, watch, }: GenerateOptions) => Promise<void>;
+declare const generateTypes: ({ project, srcDir, outDir, outputFile, watch, cache, }: GenerateOptions) => Promise<void>;
 
 export { defineConfig, generateTypes };
 export type { GenerateOptions, UserConfig };

package/dist/index.d.ts

@@ -16,8 +16,9 @@ interface GenerateOptions {
     outDir: string;
     outputFile: string;
     watch: boolean;
+    cache?: boolean;
 }
-declare const generateTypes: ({ project, srcDir, outDir, outputFile, watch, }: GenerateOptions) => Promise<void>;
+declare const generateTypes: ({ project, srcDir, outDir, outputFile, watch, cache, }: GenerateOptions) => Promise<void>;
 
 export { defineConfig, generateTypes };
 export type { GenerateOptions, UserConfig };

package/dist/index.mjs

@@ -1,8 +1,9 @@
 import * as path from 'node:path';
 import * as chokidar from 'chokidar';
 import { consola } from 'consola';
-import { g as generateAppsScriptTypes } from './shared/gasnuki.Cd8JOTQ5.mjs';
-export { d as defineConfig } from './shared/gasnuki.Cd8JOTQ5.mjs';
+import { g as generateAppsScriptTypes } from './shared/gasnuki.DePJgSg9.mjs';
+export { d as defineConfig } from './shared/gasnuki.DePJgSg9.mjs';
+import 'node:crypto';
 import 'node:fs';
 import 'ts-morph';
 import 'jiti';
@@ -12,13 +13,23 @@ const generateTypes = async ({
   srcDir,
   outDir,
   outputFile,
-  watch
+  watch,
+  cache
 }) => {
+  if (cache === false) {
+    consola.info("Generation cache is disabled");
+  }
   const runGeneration = async (triggeredBy) => {
     const reason = triggeredBy ? ` (${triggeredBy})` : "";
     consola.info(`Generating AppsScript types${reason}...`);
     try {
-      await generateAppsScriptTypes({ project, srcDir, outDir, outputFile });
+      await generateAppsScriptTypes({
+        project,
+        srcDir,
+        outDir,
+        outputFile,
+        cache
+      });
       consola.info("Type generation complete.");
     } catch (e) {
       consola.error(`Type generation failed: ${e.message}`, e);

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

@@ -1,5 +1,6 @@
 'use strict';
 
+const crypto = require('node:crypto');
 const fs = require('node:fs');
 const path = require('node:path');
 const consola = require('consola');
@@ -18,11 +19,24 @@ function _interopNamespaceCompat(e) {
   return n;
 }
 
+const crypto__namespace = /*#__PURE__*/_interopNamespaceCompat(crypto);
 const fs__namespace = /*#__PURE__*/_interopNamespaceCompat(fs);
 const path__namespace = /*#__PURE__*/_interopNamespaceCompat(path);
 
 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";
 
+const generationCache = /* @__PURE__ */ new Map();
+const computeSourceHash = (sourceFiles) => {
+  const hash = crypto__namespace.createHash("md5");
+  const sortedFiles = [...sourceFiles].sort(
+    (a, b) => a.getFilePath().localeCompare(b.getFilePath())
+  );
+  for (const file of sortedFiles) {
+    hash.update(file.getFilePath());
+    hash.update(file.getFullText());
+  }
+  return hash.digest("hex");
+};
 const getInterfaceMethodDefinition_ = (name, node) => {
   const typeParameters = node.getTypeParameters?.() ?? [];
   const typeParamsString = typeParameters.length > 0 ? `<${typeParameters.map((tp) => tp.getText()).join(", ")}>` : "";
@@ -58,7 +72,7 @@ const getInterfaceMethodDefinition_ = (name, node) => {
 `;
     }
   }
-  const cleanType = (t) => t.replace(/import\(.*?\)\./g, "");
+  const cleanType = (t) => t.replace(/import\(".*?"\)\.default\./g, "").replace(/import\(".*?"\)\./g, "");
   const cleanedReturnType = cleanType(returnType);
   const cleanedParameters = parameters.replace(
     /:\s*([^,;)]+)/g,
@@ -103,7 +117,9 @@ const generateAppsScriptTypes = async ({
   srcDir,
   outDir,
   outputFile,
-  projectInstance
+  projectInstance,
+  cache = true
+  // Default to true
 }) => {
   const absoluteSrcDir = path__namespace.resolve(projectPath, srcDir);
   const absoluteOutDir = path__namespace.resolve(projectPath, outDir);
@@ -120,6 +136,16 @@ const generateAppsScriptTypes = async ({
   project.addSourceFilesAtPaths([sourceFilesPattern, testFilesPattern]);
   const sourceFiles = project.getSourceFiles();
   consola.consola.info(`Found ${sourceFiles.length} source file(s).`);
+  if (cache) {
+    const currentHash = computeSourceHash(sourceFiles);
+    const cacheKey = absoluteOutputFile;
+    if (generationCache.get(cacheKey) === currentHash && fs__namespace.existsSync(absoluteOutputFile)) {
+      consola.consola.success(
+        `Skipping generation: Source files have not changed (Hash: ${currentHash.slice(0, 8)}).`
+      );
+      return;
+    }
+  }
   const methodDefinitions = [];
   const exportedDeclarations = [];
   const exportedDeclarationNames = /* @__PURE__ */ new Set();
@@ -163,8 +189,85 @@ const generateAppsScriptTypes = async ({
       }
     }
   }
-  const collectSymbolsFromType = (type, foundSymbols) => {
+  const collectSymbolsFromType = (type, foundSymbols, contextNode, depth = 0, isComponent = false) => {
+    if (type.isArray()) {
+      const elementType = type.getArrayElementType();
+      if (elementType) {
+        collectSymbolsFromType(
+          elementType,
+          foundSymbols,
+          contextNode,
+          depth + 1
+        );
+      }
+    }
+    if (type.isTuple()) {
+      for (const element of type.getTupleElements()) {
+        collectSymbolsFromType(element, foundSymbols, contextNode, depth + 1);
+      }
+    }
+    for (const typeArg of type.getTypeArguments()) {
+      collectSymbolsFromType(typeArg, foundSymbols, contextNode, depth + 1);
+    }
+    for (const typeArg of type.getAliasTypeArguments()) {
+      collectSymbolsFromType(typeArg, foundSymbols, contextNode, depth + 1);
+    }
+    if (type.isUnion()) {
+      for (const unionType of type.getUnionTypes()) {
+        collectSymbolsFromType(
+          unionType,
+          foundSymbols,
+          contextNode,
+          depth + 1,
+          true
+        );
+      }
+    }
+    if (type.isIntersection()) {
+      for (const intersectionType of type.getIntersectionTypes()) {
+        collectSymbolsFromType(
+          intersectionType,
+          foundSymbols,
+          contextNode,
+          depth + 1,
+          true
+        );
+      }
+    }
+    const typeText = type.getText(contextNode);
+    const importMatches = typeText.matchAll(
+      /import\("(.*?)"\)\.([^<>[\]{}() ,;]+)/g
+    );
+    for (const match of importMatches) {
+      const absolutePath = match[1];
+      const typeName = match[2];
+      if (typeName === "default" || typeName === "__type") continue;
+      let sourceFile = project.getSourceFile(absolutePath) || project.addSourceFileAtPathIfExists(absolutePath);
+      if (!sourceFile) {
+        const extensions = [".ts", ".d.ts", ".tsx"];
+        for (const ext of extensions) {
+          sourceFile = project.getSourceFile(absolutePath + ext) || project.addSourceFileAtPathIfExists(absolutePath + ext);
+          if (sourceFile) break;
+        }
+      }
+      if (sourceFile) {
+        const exported = sourceFile.getExportedDeclarations().get(typeName);
+        let s;
+        if (exported && exported.length > 0) {
+          s = exported[0].getSymbol();
+        } else {
+          s = sourceFile.getInterface(typeName)?.getSymbol() || sourceFile.getTypeAlias(typeName)?.getSymbol() || sourceFile.getEnum(typeName)?.getSymbol() || sourceFile.getClass(typeName)?.getSymbol();
+        }
+        if (s && !foundSymbols.has(s)) {
+          foundSymbols.add(s);
+        }
+      }
+    }
     const aliasSymbol = type.getAliasSymbol();
+    let symbol = type.getSymbol();
+    if (!symbol && !aliasSymbol) {
+      symbol = type.getApparentType().getSymbol();
+    }
     if (aliasSymbol) {
       if (foundSymbols.has(aliasSymbol)) {
         return;
@@ -175,14 +278,10 @@ const generateAppsScriptTypes = async ({
         const isExternal = sourceFilePath.includes("node_modules") || !sourceFilePath.replace(/\\/g, "/").startsWith(absoluteSrcDir.replace(/\\/g, "/")) && !sourceFilePath.replace(/\\/g, "/").startsWith(path__namespace.join(projectPath, srcDir).replace(/\\/g, "/"));
         if (isExternal) {
           foundSymbols.add(aliasSymbol);
-          for (const typeArg of type.getAliasTypeArguments()) {
-            collectSymbolsFromType(typeArg, foundSymbols);
-          }
           return;
         }
       }
     }
-    const symbol = type.getSymbol();
     let shouldTraverseProperties = true;
     if (symbol) {
       if (foundSymbols.has(symbol)) {
@@ -196,42 +295,68 @@ const generateAppsScriptTypes = async ({
             path__namespace.join(projectPath, srcDir).replace(/\\/g, "/")
           );
           if (isExternal) {
-            shouldTraverseProperties = false;
+            const isAnonymous = declarations.every(
+              (d) => d.getKind() === tsMorph.SyntaxKind.TypeLiteral || d.getKind() === tsMorph.SyntaxKind.ObjectLiteralExpression
+            );
+            if (!isComponent && !isAnonymous) {
+              shouldTraverseProperties = false;
+            }
           }
         }
       }
     }
-    if (shouldTraverseProperties && type.isObject()) {
-      for (const prop of type.getProperties()) {
-        const propDecl = prop.getDeclarations()[0];
-        if (propDecl) {
-          const compilerNode = propDecl.compilerNode;
-          if (
-            // @ts-expect-error - avoiding full type checks for perf, checking kind directly
-            compilerNode.name && // @ts-expect-error - avoiding full type checks for perf, checking kind directly
-            compilerNode.name.kind === tsMorph.SyntaxKind.ComputedPropertyName
-          ) {
-            const expression = propDecl.getNameNode().getExpression();
-            const symbol2 = expression.getSymbol();
-            if (symbol2 && !foundSymbols.has(symbol2)) {
-              foundSymbols.add(symbol2);
+    if (shouldTraverseProperties) {
+      const props = /* @__PURE__ */ new Set([
+        ...type.getProperties(),
+        ...type.getApparentProperties()
+      ]);
+      for (const prop of props) {
+        let propType;
+        if (contextNode) {
+          try {
+            propType = prop.getTypeAtLocation(contextNode);
+          } catch {
+          }
+        }
+        if (!propType || propType.getText() === "any") {
+          const propDecls = prop.getDeclarations();
+          if (propDecls.length > 0) {
+            propType = propDecls[0].getType();
+          }
+        }
+        if ((!propType || propType.getText() === "any") && prop.getAliasedSymbol()) {
+          const aliased = prop.getAliasedSymbol();
+          if (aliased) {
+            const decl = aliased.getValueDeclaration() || aliased.getDeclarations()[0];
+            if (decl) {
+              propType = decl.getType();
             }
           }
-          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);
+        if (propType) {
+          const propDecls = prop.getDeclarations();
+          if (propDecls.length > 0) {
+            const propDecl = propDecls[0];
+            const compilerNode = propDecl.compilerNode;
+            if (
+              // @ts-expect-error - checking kind directly for perf
+              compilerNode.name && // @ts-expect-error - checking kind directly for perf
+              compilerNode.name.kind === tsMorph.SyntaxKind.ComputedPropertyName
+            ) {
+              const expression = propDecl.getNameNode().getExpression();
+              const s = expression.getSymbol();
+              if (s && !foundSymbols.has(s)) {
+                foundSymbols.add(s);
+              }
+            }
+          }
+          collectSymbolsFromType(
+            propType,
+            foundSymbols,
+            contextNode,
+            depth + 1
+          );
+        }
       }
     }
   };
@@ -242,14 +367,14 @@ const generateAppsScriptTypes = async ({
       const func = decl.getKind() === tsMorph.SyntaxKind.FunctionDeclaration ? decl : decl.getInitializer();
       const parameters = func.getParameters();
       for (const param of parameters) {
-        collectSymbolsFromType(param.getType(), functionSignatureSymbols);
-        collectSymbolsFromType(param.getType(), symbolsToProcess);
+        collectSymbolsFromType(param.getType(), functionSignatureSymbols, func);
+        collectSymbolsFromType(param.getType(), symbolsToProcess, func);
       }
       const returnType = func.getReturnType();
-      collectSymbolsFromType(returnType, functionSignatureSymbols);
-      collectSymbolsFromType(returnType, symbolsToProcess);
+      collectSymbolsFromType(returnType, functionSignatureSymbols, func);
+      collectSymbolsFromType(returnType, symbolsToProcess, func);
     } else if (decl.getKind() === tsMorph.SyntaxKind.InterfaceDeclaration || decl.getKind() === tsMorph.SyntaxKind.TypeAliasDeclaration) {
-      collectSymbolsFromType(decl.getType(), symbolsToProcess);
+      collectSymbolsFromType(decl.getType(), symbolsToProcess, decl);
     }
   }
   const importsMap = /* @__PURE__ */ new Map();
@@ -398,7 +523,9 @@ ${text}`;
   if (sortedModulePaths.length > 0) {
     const importStatements = sortedModulePaths.map((modulePath) => {
       const imports = [...importsMap.get(modulePath) ?? []].sort().filter((importName) => {
-        const regex = new RegExp(`\\b${importName}\\b`);
+        const regex = new RegExp(
+          `(?:import\\(".*?"\\)\\.|\\b)${importName}\\b`
+        );
         return regex.test(bodyContent);
       });
       if (imports.length === 0) {
@@ -415,6 +542,10 @@ ${text}`;
   }
   outputContent += bodyContent;
   fs__namespace.writeFileSync(absoluteOutputFile, outputContent);
+  if (cache) {
+    const currentHash = computeSourceHash(sourceFiles);
+    generationCache.set(absoluteOutputFile, currentHash);
+  }
 };
 
 function defineConfig(config) {

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

@@ -1,3 +1,4 @@
+import * as crypto from 'node:crypto';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 import { consola } from 'consola';
@@ -6,6 +7,18 @@ 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";
 
+const generationCache = /* @__PURE__ */ new Map();
+const computeSourceHash = (sourceFiles) => {
+  const hash = crypto.createHash("md5");
+  const sortedFiles = [...sourceFiles].sort(
+    (a, b) => a.getFilePath().localeCompare(b.getFilePath())
+  );
+  for (const file of sortedFiles) {
+    hash.update(file.getFilePath());
+    hash.update(file.getFullText());
+  }
+  return hash.digest("hex");
+};
 const getInterfaceMethodDefinition_ = (name, node) => {
   const typeParameters = node.getTypeParameters?.() ?? [];
   const typeParamsString = typeParameters.length > 0 ? `<${typeParameters.map((tp) => tp.getText()).join(", ")}>` : "";
@@ -41,7 +54,7 @@ const getInterfaceMethodDefinition_ = (name, node) => {
 `;
     }
   }
-  const cleanType = (t) => t.replace(/import\(.*?\)\./g, "");
+  const cleanType = (t) => t.replace(/import\(".*?"\)\.default\./g, "").replace(/import\(".*?"\)\./g, "");
   const cleanedReturnType = cleanType(returnType);
   const cleanedParameters = parameters.replace(
     /:\s*([^,;)]+)/g,
@@ -86,7 +99,9 @@ const generateAppsScriptTypes = async ({
   srcDir,
   outDir,
   outputFile,
-  projectInstance
+  projectInstance,
+  cache = true
+  // Default to true
 }) => {
   const absoluteSrcDir = path.resolve(projectPath, srcDir);
   const absoluteOutDir = path.resolve(projectPath, outDir);
@@ -103,6 +118,16 @@ const generateAppsScriptTypes = async ({
   project.addSourceFilesAtPaths([sourceFilesPattern, testFilesPattern]);
   const sourceFiles = project.getSourceFiles();
   consola.info(`Found ${sourceFiles.length} source file(s).`);
+  if (cache) {
+    const currentHash = computeSourceHash(sourceFiles);
+    const cacheKey = absoluteOutputFile;
+    if (generationCache.get(cacheKey) === currentHash && fs.existsSync(absoluteOutputFile)) {
+      consola.success(
+        `Skipping generation: Source files have not changed (Hash: ${currentHash.slice(0, 8)}).`
+      );
+      return;
+    }
+  }
   const methodDefinitions = [];
   const exportedDeclarations = [];
   const exportedDeclarationNames = /* @__PURE__ */ new Set();
@@ -146,8 +171,85 @@ const generateAppsScriptTypes = async ({
       }
     }
   }
-  const collectSymbolsFromType = (type, foundSymbols) => {
+  const collectSymbolsFromType = (type, foundSymbols, contextNode, depth = 0, isComponent = false) => {
+    if (type.isArray()) {
+      const elementType = type.getArrayElementType();
+      if (elementType) {
+        collectSymbolsFromType(
+          elementType,
+          foundSymbols,
+          contextNode,
+          depth + 1
+        );
+      }
+    }
+    if (type.isTuple()) {
+      for (const element of type.getTupleElements()) {
+        collectSymbolsFromType(element, foundSymbols, contextNode, depth + 1);
+      }
+    }
+    for (const typeArg of type.getTypeArguments()) {
+      collectSymbolsFromType(typeArg, foundSymbols, contextNode, depth + 1);
+    }
+    for (const typeArg of type.getAliasTypeArguments()) {
+      collectSymbolsFromType(typeArg, foundSymbols, contextNode, depth + 1);
+    }
+    if (type.isUnion()) {
+      for (const unionType of type.getUnionTypes()) {
+        collectSymbolsFromType(
+          unionType,
+          foundSymbols,
+          contextNode,
+          depth + 1,
+          true
+        );
+      }
+    }
+    if (type.isIntersection()) {
+      for (const intersectionType of type.getIntersectionTypes()) {
+        collectSymbolsFromType(
+          intersectionType,
+          foundSymbols,
+          contextNode,
+          depth + 1,
+          true
+        );
+      }
+    }
+    const typeText = type.getText(contextNode);
+    const importMatches = typeText.matchAll(
+      /import\("(.*?)"\)\.([^<>[\]{}() ,;]+)/g
+    );
+    for (const match of importMatches) {
+      const absolutePath = match[1];
+      const typeName = match[2];
+      if (typeName === "default" || typeName === "__type") continue;
+      let sourceFile = project.getSourceFile(absolutePath) || project.addSourceFileAtPathIfExists(absolutePath);
+      if (!sourceFile) {
+        const extensions = [".ts", ".d.ts", ".tsx"];
+        for (const ext of extensions) {
+          sourceFile = project.getSourceFile(absolutePath + ext) || project.addSourceFileAtPathIfExists(absolutePath + ext);
+          if (sourceFile) break;
+        }
+      }
+      if (sourceFile) {
+        const exported = sourceFile.getExportedDeclarations().get(typeName);
+        let s;
+        if (exported && exported.length > 0) {
+          s = exported[0].getSymbol();
+        } else {
+          s = sourceFile.getInterface(typeName)?.getSymbol() || sourceFile.getTypeAlias(typeName)?.getSymbol() || sourceFile.getEnum(typeName)?.getSymbol() || sourceFile.getClass(typeName)?.getSymbol();
+        }
+        if (s && !foundSymbols.has(s)) {
+          foundSymbols.add(s);
+        }
+      }
+    }
     const aliasSymbol = type.getAliasSymbol();
+    let symbol = type.getSymbol();
+    if (!symbol && !aliasSymbol) {
+      symbol = type.getApparentType().getSymbol();
+    }
     if (aliasSymbol) {
       if (foundSymbols.has(aliasSymbol)) {
         return;
@@ -158,14 +260,10 @@ const generateAppsScriptTypes = async ({
         const isExternal = sourceFilePath.includes("node_modules") || !sourceFilePath.replace(/\\/g, "/").startsWith(absoluteSrcDir.replace(/\\/g, "/")) && !sourceFilePath.replace(/\\/g, "/").startsWith(path.join(projectPath, srcDir).replace(/\\/g, "/"));
         if (isExternal) {
           foundSymbols.add(aliasSymbol);
-          for (const typeArg of type.getAliasTypeArguments()) {
-            collectSymbolsFromType(typeArg, foundSymbols);
-          }
           return;
         }
       }
     }
-    const symbol = type.getSymbol();
     let shouldTraverseProperties = true;
     if (symbol) {
       if (foundSymbols.has(symbol)) {
@@ -179,42 +277,68 @@ const generateAppsScriptTypes = async ({
             path.join(projectPath, srcDir).replace(/\\/g, "/")
           );
           if (isExternal) {
-            shouldTraverseProperties = false;
+            const isAnonymous = declarations.every(
+              (d) => d.getKind() === SyntaxKind.TypeLiteral || d.getKind() === SyntaxKind.ObjectLiteralExpression
+            );
+            if (!isComponent && !isAnonymous) {
+              shouldTraverseProperties = false;
+            }
           }
         }
       }
     }
-    if (shouldTraverseProperties && type.isObject()) {
-      for (const prop of type.getProperties()) {
-        const propDecl = prop.getDeclarations()[0];
-        if (propDecl) {
-          const compilerNode = propDecl.compilerNode;
-          if (
-            // @ts-expect-error - avoiding full type checks for perf, checking kind directly
-            compilerNode.name && // @ts-expect-error - avoiding full type checks for perf, checking kind directly
-            compilerNode.name.kind === SyntaxKind.ComputedPropertyName
-          ) {
-            const expression = propDecl.getNameNode().getExpression();
-            const symbol2 = expression.getSymbol();
-            if (symbol2 && !foundSymbols.has(symbol2)) {
-              foundSymbols.add(symbol2);
+    if (shouldTraverseProperties) {
+      const props = /* @__PURE__ */ new Set([
+        ...type.getProperties(),
+        ...type.getApparentProperties()
+      ]);
+      for (const prop of props) {
+        let propType;
+        if (contextNode) {
+          try {
+            propType = prop.getTypeAtLocation(contextNode);
+          } catch {
+          }
+        }
+        if (!propType || propType.getText() === "any") {
+          const propDecls = prop.getDeclarations();
+          if (propDecls.length > 0) {
+            propType = propDecls[0].getType();
+          }
+        }
+        if ((!propType || propType.getText() === "any") && prop.getAliasedSymbol()) {
+          const aliased = prop.getAliasedSymbol();
+          if (aliased) {
+            const decl = aliased.getValueDeclaration() || aliased.getDeclarations()[0];
+            if (decl) {
+              propType = decl.getType();
             }
           }
-          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);
+        if (propType) {
+          const propDecls = prop.getDeclarations();
+          if (propDecls.length > 0) {
+            const propDecl = propDecls[0];
+            const compilerNode = propDecl.compilerNode;
+            if (
+              // @ts-expect-error - checking kind directly for perf
+              compilerNode.name && // @ts-expect-error - checking kind directly for perf
+              compilerNode.name.kind === SyntaxKind.ComputedPropertyName
+            ) {
+              const expression = propDecl.getNameNode().getExpression();
+              const s = expression.getSymbol();
+              if (s && !foundSymbols.has(s)) {
+                foundSymbols.add(s);
+              }
+            }
+          }
+          collectSymbolsFromType(
+            propType,
+            foundSymbols,
+            contextNode,
+            depth + 1
+          );
+        }
       }
     }
   };
@@ -225,14 +349,14 @@ const generateAppsScriptTypes = async ({
       const func = decl.getKind() === SyntaxKind.FunctionDeclaration ? decl : decl.getInitializer();
       const parameters = func.getParameters();
       for (const param of parameters) {
-        collectSymbolsFromType(param.getType(), functionSignatureSymbols);
-        collectSymbolsFromType(param.getType(), symbolsToProcess);
+        collectSymbolsFromType(param.getType(), functionSignatureSymbols, func);
+        collectSymbolsFromType(param.getType(), symbolsToProcess, func);
       }
       const returnType = func.getReturnType();
-      collectSymbolsFromType(returnType, functionSignatureSymbols);
-      collectSymbolsFromType(returnType, symbolsToProcess);
+      collectSymbolsFromType(returnType, functionSignatureSymbols, func);
+      collectSymbolsFromType(returnType, symbolsToProcess, func);
     } else if (decl.getKind() === SyntaxKind.InterfaceDeclaration || decl.getKind() === SyntaxKind.TypeAliasDeclaration) {
-      collectSymbolsFromType(decl.getType(), symbolsToProcess);
+      collectSymbolsFromType(decl.getType(), symbolsToProcess, decl);
     }
   }
   const importsMap = /* @__PURE__ */ new Map();
@@ -381,7 +505,9 @@ ${text}`;
   if (sortedModulePaths.length > 0) {
     const importStatements = sortedModulePaths.map((modulePath) => {
       const imports = [...importsMap.get(modulePath) ?? []].sort().filter((importName) => {
-        const regex = new RegExp(`\\b${importName}\\b`);
+        const regex = new RegExp(
+          `(?:import\\(".*?"\\)\\.|\\b)${importName}\\b`
+        );
         return regex.test(bodyContent);
       });
       if (imports.length === 0) {
@@ -398,6 +524,10 @@ ${text}`;
   }
   outputContent += bodyContent;
   fs.writeFileSync(absoluteOutputFile, outputContent);
+  if (cache) {
+    const currentHash = computeSourceHash(sourceFiles);
+    generationCache.set(absoluteOutputFile, currentHash);
+  }
 };
 
 function defineConfig(config) {

package/dist/vite.cjs

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

package/dist/vite.mjs

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ciderjs/gasnuki",
-  "version": "0.3.8",
+  "version": "0.4.1",
   "description": "Type definitions and utilities for Google Apps Script client-side API",
   "main": "dist/index.mjs",
   "types": "dist/index.d.ts",