@ciderjs/gasnuki 0.3.4 → 0.3.6

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-94.32%25-brightgreen)](https://github.com/luthpg/gasnuki)
+[![Test Coverage](https://img.shields.io/badge/test%20coverage-94.74%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-94.32%25-brightgreen)](https://github.com/luthpg/gasnuki)
+[![Test Coverage](https://img.shields.io/badge/test%20coverage-94.74%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,7 +4,7 @@
 const path = require('node:path');
 const commander = require('commander');
 const index = require('./index.cjs');
-const config = require('./shared/gasnuki.kBd1L15Q.cjs');
+const config = require('./shared/gasnuki.rciF8k_d.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.4";
+const version = "0.3.6";
 
 const parseArgs = async (command) => {
   const cliOpts = command.opts();

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.C96Q3amR.mjs';
+import { l as loadConfig } from './shared/gasnuki.CfdOhkQS.mjs';
 import 'chokidar';
 import 'consola';
 import 'node:fs';
 import 'ts-morph';
 import 'jiti';
 
-const version = "0.3.4";
+const version = "0.3.6";
 
 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.kBd1L15Q.cjs');
+const config = require('./shared/gasnuki.rciF8k_d.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.C96Q3amR.mjs';
-export { d as defineConfig } from './shared/gasnuki.C96Q3amR.mjs';
+import { g as generateAppsScriptTypes } from './shared/gasnuki.CfdOhkQS.mjs';
+export { d as defineConfig } from './shared/gasnuki.CfdOhkQS.mjs';
 import 'node:fs';
 import 'ts-morph';
 import 'jiti';

package/dist/shared/{gasnuki.C96Q3amR.mjs → gasnuki.CfdOhkQS.mjs}

@@ -144,21 +144,53 @@ const generateAppsScriptTypes = async ({
       if (foundSymbols.has(aliasSymbol)) {
         return;
       }
+      const declarations = aliasSymbol.getDeclarations();
+      if (declarations.length > 0) {
+        const sourceFilePath = declarations[0].getSourceFile().getFilePath();
+        const isNodeModules = sourceFilePath.includes("node_modules");
+        if (isNodeModules) {
+          foundSymbols.add(aliasSymbol);
+          return;
+        }
+      }
       foundSymbols.add(aliasSymbol);
       for (const typeArg of type.getAliasTypeArguments()) {
         collectSymbolsFromType(typeArg, foundSymbols);
       }
-      return;
     }
     const symbol = type.getSymbol();
-    if (symbol && !foundSymbols.has(symbol)) {
-      foundSymbols.add(symbol);
-      if (type.isObject()) {
-        for (const prop of type.getProperties()) {
-          const propDecl = prop.getDeclarations()[0];
-          if (propDecl) {
-            collectSymbolsFromType(propDecl.getType(), foundSymbols);
+    let shouldTraverseProperties = true;
+    if (symbol) {
+      if (foundSymbols.has(symbol)) {
+        shouldTraverseProperties = false;
+      } else {
+        foundSymbols.add(symbol);
+        const declarations = symbol.getDeclarations();
+        if (declarations.length > 0) {
+          const sourceFilePath = declarations[0].getSourceFile().getFilePath();
+          if (sourceFilePath.includes("node_modules")) {
+            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);
+            }
           }
+          collectSymbolsFromType(propDecl.getType(), foundSymbols);
         }
       }
     }
@@ -251,10 +283,16 @@ const generateAppsScriptTypes = async ({
         importsMap.set(modulePath, /* @__PURE__ */ new Set());
       }
       importsMap.get(modulePath)?.add(symbolName);
-    } else {
-      const declText = declaration.getText();
-      inlineDefinitions.set(symbolName, declText);
+      continue;
+    }
+    let declText = declaration.getText();
+    if (declaration.getKind() === SyntaxKind.VariableDeclaration) {
+      const variableStatement = declaration.getParent()?.getParent();
+      if (variableStatement && variableStatement.getKind() === SyntaxKind.VariableStatement) {
+        declText = variableStatement.getText();
+      }
     }
+    inlineDefinitions.set(symbolName, declText);
     for (const descendant of declaration.getDescendantsOfKind(
       SyntaxKind.TypeReference
     )) {

package/dist/shared/{gasnuki.kBd1L15Q.cjs → gasnuki.rciF8k_d.cjs}

@@ -161,21 +161,53 @@ const generateAppsScriptTypes = async ({
       if (foundSymbols.has(aliasSymbol)) {
         return;
       }
+      const declarations = aliasSymbol.getDeclarations();
+      if (declarations.length > 0) {
+        const sourceFilePath = declarations[0].getSourceFile().getFilePath();
+        const isNodeModules = sourceFilePath.includes("node_modules");
+        if (isNodeModules) {
+          foundSymbols.add(aliasSymbol);
+          return;
+        }
+      }
       foundSymbols.add(aliasSymbol);
       for (const typeArg of type.getAliasTypeArguments()) {
         collectSymbolsFromType(typeArg, foundSymbols);
       }
-      return;
     }
     const symbol = type.getSymbol();
-    if (symbol && !foundSymbols.has(symbol)) {
-      foundSymbols.add(symbol);
-      if (type.isObject()) {
-        for (const prop of type.getProperties()) {
-          const propDecl = prop.getDeclarations()[0];
-          if (propDecl) {
-            collectSymbolsFromType(propDecl.getType(), foundSymbols);
+    let shouldTraverseProperties = true;
+    if (symbol) {
+      if (foundSymbols.has(symbol)) {
+        shouldTraverseProperties = false;
+      } else {
+        foundSymbols.add(symbol);
+        const declarations = symbol.getDeclarations();
+        if (declarations.length > 0) {
+          const sourceFilePath = declarations[0].getSourceFile().getFilePath();
+          if (sourceFilePath.includes("node_modules")) {
+            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);
+            }
           }
+          collectSymbolsFromType(propDecl.getType(), foundSymbols);
         }
       }
     }
@@ -268,10 +300,16 @@ const generateAppsScriptTypes = async ({
         importsMap.set(modulePath, /* @__PURE__ */ new Set());
       }
       importsMap.get(modulePath)?.add(symbolName);
-    } else {
-      const declText = declaration.getText();
-      inlineDefinitions.set(symbolName, declText);
+      continue;
+    }
+    let declText = declaration.getText();
+    if (declaration.getKind() === tsMorph.SyntaxKind.VariableDeclaration) {
+      const variableStatement = declaration.getParent()?.getParent();
+      if (variableStatement && variableStatement.getKind() === tsMorph.SyntaxKind.VariableStatement) {
+        declText = variableStatement.getText();
+      }
     }
+    inlineDefinitions.set(symbolName, declText);
     for (const descendant of declaration.getDescendantsOfKind(
       tsMorph.SyntaxKind.TypeReference
     )) {

package/dist/vite.cjs

@@ -2,7 +2,7 @@
 
 const path = require('node:path');
 const consola = require('consola');
-const config = require('./shared/gasnuki.kBd1L15Q.cjs');
+const config = require('./shared/gasnuki.rciF8k_d.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.C96Q3amR.mjs';
+import { l as loadConfig, g as generateAppsScriptTypes } from './shared/gasnuki.CfdOhkQS.mjs';
 import 'node:fs';
 import 'ts-morph';
 import 'jiti';

package/package.json

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