@ciderjs/gasnuki 0.3.5 → 0.3.7

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-95.4%25-brightgreen)](https://github.com/luthpg/gasnuki)
+[![Test Coverage](https://img.shields.io/badge/test%20coverage-93.77%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-95.4%25-brightgreen)](https://github.com/luthpg/gasnuki)
+[![Test Coverage](https://img.shields.io/badge/test%20coverage-93.77%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.Cam3UO_N.cjs');
+const config = require('./shared/gasnuki.CooUv3Bz.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.5";
+const version = "0.3.7";
 
 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.HyFJZts6.mjs';
+import { l as loadConfig } from './shared/gasnuki.Md02V2Fd.mjs';
 import 'chokidar';
 import 'consola';
 import 'node:fs';
 import 'ts-morph';
 import 'jiti';
 
-const version = "0.3.5";
+const version = "0.3.7";
 
 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.Cam3UO_N.cjs');
+const config = require('./shared/gasnuki.CooUv3Bz.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.HyFJZts6.mjs';
-export { d as defineConfig } from './shared/gasnuki.HyFJZts6.mjs';
+import { g as generateAppsScriptTypes } from './shared/gasnuki.Md02V2Fd.mjs';
+export { d as defineConfig } from './shared/gasnuki.Md02V2Fd.mjs';
 import 'node:fs';
 import 'ts-morph';
 import 'jiti';

package/dist/shared/{gasnuki.Cam3UO_N.cjs → gasnuki.CooUv3Bz.cjs}

@@ -58,7 +58,15 @@ const getInterfaceMethodDefinition_ = (name, node) => {
 `;
     }
   }
-  return `${jsDocString}${name}${typeParamsString}(${parameters}): ${returnType};`;
+  const cleanType = (t) => t.replace(/import\(.*?\)\./g, "");
+  const cleanedReturnType = cleanType(returnType);
+  const cleanedParameters = parameters.replace(
+    /:\s*([^,;)]+)/g,
+    (_match, p1) => {
+      return `: ${cleanType(p1)}`;
+    }
+  );
+  return `${jsDocString}${name}${typeParamsString}(${cleanedParameters}): ${cleanedReturnType};`;
 };
 const SIMPLE_TRIGGER_FUNCTION_NAMES = [
   "onOpen",
@@ -161,32 +169,55 @@ const generateAppsScriptTypes = async ({
       if (foundSymbols.has(aliasSymbol)) {
         return;
       }
-      foundSymbols.add(aliasSymbol);
-      for (const typeArg of type.getAliasTypeArguments()) {
-        collectSymbolsFromType(typeArg, foundSymbols);
+      const declarations = aliasSymbol.getDeclarations();
+      if (declarations.length > 0) {
+        const sourceFilePath = declarations[0].getSourceFile().getFilePath();
+        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();
-    if (symbol && !foundSymbols.has(symbol)) {
-      foundSymbols.add(symbol);
-      if (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);
-              }
+    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();
+          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) {
+            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);
           }
+          collectSymbolsFromType(propDecl.getType(), foundSymbols);
         }
       }
     }
@@ -240,16 +271,35 @@ const generateAppsScriptTypes = async ({
     if (!declaration) {
       continue;
     }
-    if (declaration.getKind() === tsMorph.SyntaxKind.MethodSignature || declaration.getKind() === tsMorph.SyntaxKind.PropertySignature || declaration.getKind() === tsMorph.SyntaxKind.MethodDeclaration || declaration.getKind() === tsMorph.SyntaxKind.PropertyDeclaration) {
-      continue;
+    const allowedKinds = [
+      tsMorph.SyntaxKind.InterfaceDeclaration,
+      tsMorph.SyntaxKind.TypeAliasDeclaration,
+      tsMorph.SyntaxKind.EnumDeclaration,
+      tsMorph.SyntaxKind.ClassDeclaration,
+      tsMorph.SyntaxKind.ModuleDeclaration
+    ];
+    if (!allowedKinds.includes(declaration.getKind())) {
+      if (declaration.getKind() === tsMorph.SyntaxKind.VariableDeclaration) {
+        const typeNode = declaration.getTypeNode();
+        const isUniqueSymbol = typeNode?.getText().includes("unique symbol");
+        if (!isUniqueSymbol) {
+          continue;
+        }
+      } else {
+        continue;
+      }
     }
     const sourceFile = declaration.getSourceFile();
     const sourceFilePath = sourceFile.getFilePath();
     if (/[/\\]typescript[/\\]lib[/\\]/.test(sourceFilePath)) {
       continue;
     }
-    if (sourceFilePath.includes("node_modules")) {
-      if (functionSignatureSymbols.has(symbol)) {
+    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) {
+      if (sourceFilePath.includes("node_modules")) {
+        if (!functionSignatureSymbols.has(symbol)) {
+          continue;
+        }
         const packageName = getPackageNameFromNodeModulesPath_(sourceFilePath);
         if (packageName) {
           processedSymbols.add(symbolName);
@@ -258,37 +308,34 @@ const generateAppsScriptTypes = async ({
           }
           importsMap.get(packageName)?.add(symbolName);
         }
+      } else {
+        let modulePath = path__namespace.relative(absoluteOutDir, sourceFilePath).replace(/\\/g, "/");
+        modulePath = modulePath.replace(/\.(d\.)?ts$/, "");
+        if (modulePath.endsWith("/index")) {
+          modulePath = modulePath.slice(0, -6);
+        }
+        if (modulePath === "index" || modulePath === "") {
+          modulePath = ".";
+        }
+        if (!modulePath.startsWith(".")) {
+          modulePath = `./${modulePath}`;
+        }
+        if (!importsMap.has(modulePath)) {
+          importsMap.set(modulePath, /* @__PURE__ */ new Set());
+        }
+        importsMap.get(modulePath)?.add(symbolName);
       }
       continue;
     }
     processedSymbols.add(symbolName);
-    const isExternal = !sourceFilePath.replace(/\\/g, "/").startsWith(absoluteSrcDir.replace(/\\/g, "/")) && !sourceFilePath.replace(/\\/g, "/").startsWith(path__namespace.join(projectPath, srcDir).replace(/\\/g, "/"));
-    if (isExternal) {
-      let modulePath = path__namespace.relative(absoluteOutDir, sourceFilePath).replace(/\\/g, "/");
-      modulePath = modulePath.replace(/\.(d\.)?ts$/, "");
-      if (modulePath.endsWith("/index")) {
-        modulePath = modulePath.slice(0, -6);
-      }
-      if (modulePath === "index" || modulePath === "") {
-        modulePath = ".";
-      }
-      if (!modulePath.startsWith(".")) {
-        modulePath = `./${modulePath}`;
-      }
-      if (!importsMap.has(modulePath)) {
-        importsMap.set(modulePath, /* @__PURE__ */ new Set());
-      }
-      importsMap.get(modulePath)?.add(symbolName);
-    } else {
-      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();
-        }
+    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);
     }
+    inlineDefinitions.set(symbolName, declText);
     for (const descendant of declaration.getDescendantsOfKind(
       tsMorph.SyntaxKind.TypeReference
     )) {

package/dist/shared/{gasnuki.HyFJZts6.mjs → gasnuki.Md02V2Fd.mjs}

@@ -41,7 +41,15 @@ const getInterfaceMethodDefinition_ = (name, node) => {
 `;
     }
   }
-  return `${jsDocString}${name}${typeParamsString}(${parameters}): ${returnType};`;
+  const cleanType = (t) => t.replace(/import\(.*?\)\./g, "");
+  const cleanedReturnType = cleanType(returnType);
+  const cleanedParameters = parameters.replace(
+    /:\s*([^,;)]+)/g,
+    (_match, p1) => {
+      return `: ${cleanType(p1)}`;
+    }
+  );
+  return `${jsDocString}${name}${typeParamsString}(${cleanedParameters}): ${cleanedReturnType};`;
 };
 const SIMPLE_TRIGGER_FUNCTION_NAMES = [
   "onOpen",
@@ -144,32 +152,55 @@ const generateAppsScriptTypes = async ({
       if (foundSymbols.has(aliasSymbol)) {
         return;
       }
-      foundSymbols.add(aliasSymbol);
-      for (const typeArg of type.getAliasTypeArguments()) {
-        collectSymbolsFromType(typeArg, foundSymbols);
+      const declarations = aliasSymbol.getDeclarations();
+      if (declarations.length > 0) {
+        const sourceFilePath = declarations[0].getSourceFile().getFilePath();
+        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();
-    if (symbol && !foundSymbols.has(symbol)) {
-      foundSymbols.add(symbol);
-      if (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);
-              }
+    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();
+          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) {
+            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);
           }
+          collectSymbolsFromType(propDecl.getType(), foundSymbols);
         }
       }
     }
@@ -223,16 +254,35 @@ const generateAppsScriptTypes = async ({
     if (!declaration) {
       continue;
     }
-    if (declaration.getKind() === SyntaxKind.MethodSignature || declaration.getKind() === SyntaxKind.PropertySignature || declaration.getKind() === SyntaxKind.MethodDeclaration || declaration.getKind() === SyntaxKind.PropertyDeclaration) {
-      continue;
+    const allowedKinds = [
+      SyntaxKind.InterfaceDeclaration,
+      SyntaxKind.TypeAliasDeclaration,
+      SyntaxKind.EnumDeclaration,
+      SyntaxKind.ClassDeclaration,
+      SyntaxKind.ModuleDeclaration
+    ];
+    if (!allowedKinds.includes(declaration.getKind())) {
+      if (declaration.getKind() === SyntaxKind.VariableDeclaration) {
+        const typeNode = declaration.getTypeNode();
+        const isUniqueSymbol = typeNode?.getText().includes("unique symbol");
+        if (!isUniqueSymbol) {
+          continue;
+        }
+      } else {
+        continue;
+      }
     }
     const sourceFile = declaration.getSourceFile();
     const sourceFilePath = sourceFile.getFilePath();
     if (/[/\\]typescript[/\\]lib[/\\]/.test(sourceFilePath)) {
       continue;
     }
-    if (sourceFilePath.includes("node_modules")) {
-      if (functionSignatureSymbols.has(symbol)) {
+    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) {
+      if (sourceFilePath.includes("node_modules")) {
+        if (!functionSignatureSymbols.has(symbol)) {
+          continue;
+        }
         const packageName = getPackageNameFromNodeModulesPath_(sourceFilePath);
         if (packageName) {
           processedSymbols.add(symbolName);
@@ -241,37 +291,34 @@ const generateAppsScriptTypes = async ({
           }
           importsMap.get(packageName)?.add(symbolName);
         }
+      } else {
+        let modulePath = path.relative(absoluteOutDir, sourceFilePath).replace(/\\/g, "/");
+        modulePath = modulePath.replace(/\.(d\.)?ts$/, "");
+        if (modulePath.endsWith("/index")) {
+          modulePath = modulePath.slice(0, -6);
+        }
+        if (modulePath === "index" || modulePath === "") {
+          modulePath = ".";
+        }
+        if (!modulePath.startsWith(".")) {
+          modulePath = `./${modulePath}`;
+        }
+        if (!importsMap.has(modulePath)) {
+          importsMap.set(modulePath, /* @__PURE__ */ new Set());
+        }
+        importsMap.get(modulePath)?.add(symbolName);
       }
       continue;
     }
     processedSymbols.add(symbolName);
-    const isExternal = !sourceFilePath.replace(/\\/g, "/").startsWith(absoluteSrcDir.replace(/\\/g, "/")) && !sourceFilePath.replace(/\\/g, "/").startsWith(path.join(projectPath, srcDir).replace(/\\/g, "/"));
-    if (isExternal) {
-      let modulePath = path.relative(absoluteOutDir, sourceFilePath).replace(/\\/g, "/");
-      modulePath = modulePath.replace(/\.(d\.)?ts$/, "");
-      if (modulePath.endsWith("/index")) {
-        modulePath = modulePath.slice(0, -6);
-      }
-      if (modulePath === "index" || modulePath === "") {
-        modulePath = ".";
-      }
-      if (!modulePath.startsWith(".")) {
-        modulePath = `./${modulePath}`;
-      }
-      if (!importsMap.has(modulePath)) {
-        importsMap.set(modulePath, /* @__PURE__ */ new Set());
-      }
-      importsMap.get(modulePath)?.add(symbolName);
-    } else {
-      let declText = declaration.getText();
-      if (declaration.getKind() === SyntaxKind.VariableDeclaration) {
-        const variableStatement = declaration.getParent()?.getParent();
-        if (variableStatement && variableStatement.getKind() === SyntaxKind.VariableStatement) {
-          declText = variableStatement.getText();
-        }
+    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);
     }
+    inlineDefinitions.set(symbolName, declText);
     for (const descendant of declaration.getDescendantsOfKind(
       SyntaxKind.TypeReference
     )) {

package/dist/vite.cjs

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

package/package.json

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