@ciderjs/gasnuki 0.2.5 → 0.2.6

package/README.ja.md

@@ -1,6 +1,6 @@
 # gasnuki
 
-[![Test Coverage](https://img.shields.io/badge/test%20coverage-83.65%25-green)](https://github.com/luthpg/gasnuki)
+[![Test Coverage](https://img.shields.io/badge/test%20coverage-77.03%25-yellowgreen)](https://github.com/luthpg/gasnuki)
 [![License](https://img.shields.io/badge/license-ISC-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,6 +1,6 @@
 # @ciderjs/gasnuki
 
-[![Test Coverage](https://img.shields.io/badge/test%20coverage-83.65%25-green)](https://github.com/luthpg/gasnuki)
+[![Test Coverage](https://img.shields.io/badge/test%20coverage-77.03%25-yellowgreen)](https://github.com/luthpg/gasnuki)
 [![License](https://img.shields.io/badge/license-ISC-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

@@ -3,7 +3,7 @@
 
 const path = require('node:path');
 const commander = require('commander');
-const index = require('./shared/gasnuki.Ce9vzQ2b.cjs');
+const index = require('./shared/gasnuki.DH8w-v3n.cjs');
 require('chokidar');
 require('consola');
 require('node:fs');
@@ -24,7 +24,7 @@ function _interopNamespaceCompat(e) {
 
 const path__namespace = /*#__PURE__*/_interopNamespaceCompat(path);
 
-const version = "0.2.5";
+const version = "0.2.6";
 
 const parseArgs = async (command) => {
   const cliOpts = command.opts();

package/dist/cli.mjs

@@ -1,14 +1,14 @@
 #! /usr/bin/env  node
 import * as path from 'node:path';
 import { Command } from 'commander';
-import { l as loadConfig, g as generateTypes } from './shared/gasnuki.DJCCMztm.mjs';
+import { l as loadConfig, g as generateTypes } from './shared/gasnuki.DgQBiLxg.mjs';
 import 'chokidar';
 import 'consola';
 import 'node:fs';
 import 'ts-morph';
 import 'jiti';
 
-const version = "0.2.5";
+const version = "0.2.6";
 
 const parseArgs = async (command) => {
   const cliOpts = command.opts();

package/dist/index.cjs

@@ -3,7 +3,7 @@
 require('node:path');
 require('chokidar');
 require('consola');
-const index = require('./shared/gasnuki.Ce9vzQ2b.cjs');
+const index = require('./shared/gasnuki.DH8w-v3n.cjs');
 require('node:fs');
 require('ts-morph');
 require('jiti');

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import 'node:path';
 import 'chokidar';
 import 'consola';
-export { d as defineConfig, g as generateTypes } from './shared/gasnuki.DJCCMztm.mjs';
+export { d as defineConfig, g as generateTypes } from './shared/gasnuki.DgQBiLxg.mjs';
 import 'node:fs';
 import 'ts-morph';
 import 'jiti';

package/dist/shared/{gasnuki.Ce9vzQ2b.cjs → gasnuki.DH8w-v3n.cjs}

@@ -92,86 +92,147 @@ const generateAppsScriptTypes = async ({
   const sourceFiles = project.getSourceFiles();
   consola.consola.info(`Found ${sourceFiles.length} source file(s).`);
   const methodDefinitions = [];
-  const localDeclarations = [];
-  const localDeclarationNames = /* @__PURE__ */ new Set();
+  const exportedDeclarations = [];
+  const exportedDeclarationNames = /* @__PURE__ */ new Set();
+  const exportedFunctions = [];
   for (const sourceFile of sourceFiles) {
     for (const iface of sourceFile.getInterfaces()) {
-      const name = iface.getName?.();
-      if (name && !name.endsWith("_")) {
-        localDeclarations.push(iface);
-        localDeclarationNames.add(name);
+      if (iface.isExported() && !iface.getName()?.endsWith("_")) {
+        exportedDeclarations.push(iface);
+        exportedDeclarationNames.add(iface.getName());
       }
     }
     for (const typeAlias of sourceFile.getTypeAliases()) {
-      const name = typeAlias.getName();
-      if (name && !name.endsWith("_")) {
-        localDeclarations.push(typeAlias);
-        localDeclarationNames.add(name);
+      if (typeAlias.isExported() && !typeAlias.getName().endsWith("_")) {
+        exportedDeclarations.push(typeAlias);
+        exportedDeclarationNames.add(typeAlias.getName());
       }
     }
     for (const func of sourceFile.getFunctions()) {
       const name = func.getName();
-      if (name && !func.isAmbient() && !name.endsWith("_") && !SIMPLE_TRIGGER_FUNCTION_NAMES.includes(name)) {
-        localDeclarations.push(func);
-        localDeclarationNames.add(name);
+      if (func.isExported() && name && !name.endsWith("_") && !SIMPLE_TRIGGER_FUNCTION_NAMES.includes(name)) {
+        exportedDeclarations.push(func);
+        exportedDeclarationNames.add(name);
         methodDefinitions.push(getInterfaceMethodDefinition_(name, func));
+        exportedFunctions.push(func);
       }
     }
     for (const varStmt of sourceFile.getVariableStatements()) {
-      if (varStmt.isAmbient()) continue;
+      if (!varStmt.isExported()) continue;
       for (const varDecl of varStmt.getDeclarations()) {
         const name = varDecl.getName();
         const initializer = varDecl.getInitializer();
         if (!name.endsWith("_") && !SIMPLE_TRIGGER_FUNCTION_NAMES.includes(name) && initializer && (initializer.getKind() === tsMorph.SyntaxKind.ArrowFunction || initializer.getKind() === tsMorph.SyntaxKind.FunctionExpression)) {
-          localDeclarations.push(varDecl);
-          localDeclarationNames.add(name);
-          methodDefinitions.push(
-            getInterfaceMethodDefinition_(
-              name,
-              initializer
-            )
-          );
+          const funcExpr = initializer;
+          exportedDeclarations.push(varDecl);
+          exportedDeclarationNames.add(name);
+          methodDefinitions.push(getInterfaceMethodDefinition_(name, funcExpr));
+          exportedFunctions.push(funcExpr);
         }
       }
     }
   }
+  const collectSymbolsFromType = (type, foundSymbols) => {
+    const symbol = type.getAliasSymbol() ?? 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);
+          }
+        }
+      }
+    }
+    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);
+      }
+    }
+  };
+  const returnValueSymbols = /* @__PURE__ */ new Set();
+  for (const func of exportedFunctions) {
+    collectSymbolsFromType(func.getReturnType(), returnValueSymbols);
+  }
   const importsMap = /* @__PURE__ */ new Map();
-  for (const decl of localDeclarations) {
-    const descendants = decl.getDescendantsOfKind?.(tsMorph.SyntaxKind.TypeReference) ?? [];
-    for (const descendant of descendants) {
+  const inlineDefinitions = /* @__PURE__ */ new Map();
+  const symbolsToProcess = /* @__PURE__ */ new Set();
+  const processedSymbols = /* @__PURE__ */ new Set();
+  for (const decl of exportedDeclarations) {
+    for (const descendant of decl.getDescendantsOfKind(
+      tsMorph.SyntaxKind.TypeReference
+    )) {
       const symbol = descendant.getType().getAliasSymbol() ?? descendant.getType().getSymbol();
       if (symbol) {
-        const symbolFlags = symbol.getFlags();
-        if (symbolFlags & tsMorph.SymbolFlags.TypeParameter) {
-          continue;
-        }
-        const symbolName = symbol.getName();
-        if (localDeclarationNames.has(symbolName) || symbolName === "__type") {
-          continue;
-        }
-        const declaration = symbol.getDeclarations()[0];
-        if (declaration) {
-          const declarationSourceFile = declaration.getSourceFile();
-          if (declarationSourceFile.getFilePath().includes("node_modules")) {
-            continue;
-          }
-          let modulePath = path__namespace.relative(absoluteOutDir, declarationSourceFile.getFilePath()).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());
+        symbolsToProcess.add(symbol);
+      }
+    }
+  }
+  while (symbolsToProcess.size > 0) {
+    const symbol = symbolsToProcess.values().next().value;
+    if (!symbol) continue;
+    symbolsToProcess.delete(symbol);
+    const symbolName = symbol.getName();
+    if (processedSymbols.has(symbolName) || exportedDeclarationNames.has(symbolName) || symbolName === "__type") {
+      continue;
+    }
+    const symbolFlags = symbol.getFlags();
+    if (symbolFlags & tsMorph.SymbolFlags.TypeParameter) {
+      continue;
+    }
+    const declaration = symbol.getDeclarations()[0];
+    if (!declaration) {
+      continue;
+    }
+    const sourceFile = declaration.getSourceFile();
+    if (sourceFile.getFilePath().includes("node_modules")) {
+      continue;
+    }
+    processedSymbols.add(symbolName);
+    const isLocalDefinition = declaration.getParent()?.getKind() !== tsMorph.SyntaxKind.SourceFile;
+    if (isLocalDefinition) {
+      if (returnValueSymbols.has(symbol)) {
+        const declText = declaration.getText();
+        inlineDefinitions.set(symbolName, declText);
+        const tempSourceFile = project.createSourceFile(
+          `__temp_${symbolName}.ts`,
+          declText
+        );
+        for (const descendant of tempSourceFile.getDescendantsOfKind(
+          tsMorph.SyntaxKind.TypeReference
+        )) {
+          const newSymbol = descendant.getType().getAliasSymbol() ?? descendant.getType().getSymbol();
+          if (newSymbol) {
+            symbolsToProcess.add(newSymbol);
           }
-          importsMap.get(modulePath)?.add(symbolName);
         }
+        tempSourceFile.delete();
       }
+    } else {
+      let modulePath = path__namespace.relative(absoluteOutDir, sourceFile.getFilePath()).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);
     }
   }
   if (!fs__namespace.existsSync(absoluteOutDir)) {
@@ -199,11 +260,16 @@ const generateAppsScriptTypes = async ({
 
 `;
   }
-  const globalTypeDefinitions = localDeclarations.filter(
-    (d) => d.getKind?.() === tsMorph.SyntaxKind.InterfaceDeclaration || d.getKind?.() === tsMorph.SyntaxKind.TypeAliasDeclaration
-  ).map((decl) => decl.getText?.());
-  if (globalTypeDefinitions.length > 0) {
-    outputContent += `${globalTypeDefinitions.join("\n\n")}
+  if (inlineDefinitions.size > 0) {
+    outputContent += `${[...inlineDefinitions.values()].join("\n\n")}
+
+`;
+  }
+  const exportedTypeDefinitions = exportedDeclarations.filter(
+    (d) => d.getKind() === tsMorph.SyntaxKind.InterfaceDeclaration || d.getKind() === tsMorph.SyntaxKind.TypeAliasDeclaration
+  ).map((decl) => decl.getText());
+  if (exportedTypeDefinitions.length > 0) {
+    outputContent += `${exportedTypeDefinitions.join("\n\n")}
 
 `;
   }
@@ -216,7 +282,7 @@ ${formattedMethods}
 }
 `;
     consola.consola.info(
-      `Interface 'ServerScript' type definitions written to ${absoluteOutputFile} (${methodDefinitions.length} function(s), ${globalTypeDefinitions.length} type(s)).`
+      `Interface 'ServerScript' type definitions written to ${absoluteOutputFile} (${methodDefinitions.length} function(s), ${exportedTypeDefinitions.length + inlineDefinitions.size} type(s)).`
     );
   } else {
     outputContent += "export type ServerScripts = {}\n";

package/dist/shared/{gasnuki.DJCCMztm.mjs → gasnuki.DgQBiLxg.mjs}

@@ -74,86 +74,147 @@ const generateAppsScriptTypes = async ({
   const sourceFiles = project.getSourceFiles();
   consola.info(`Found ${sourceFiles.length} source file(s).`);
   const methodDefinitions = [];
-  const localDeclarations = [];
-  const localDeclarationNames = /* @__PURE__ */ new Set();
+  const exportedDeclarations = [];
+  const exportedDeclarationNames = /* @__PURE__ */ new Set();
+  const exportedFunctions = [];
   for (const sourceFile of sourceFiles) {
     for (const iface of sourceFile.getInterfaces()) {
-      const name = iface.getName?.();
-      if (name && !name.endsWith("_")) {
-        localDeclarations.push(iface);
-        localDeclarationNames.add(name);
+      if (iface.isExported() && !iface.getName()?.endsWith("_")) {
+        exportedDeclarations.push(iface);
+        exportedDeclarationNames.add(iface.getName());
       }
     }
     for (const typeAlias of sourceFile.getTypeAliases()) {
-      const name = typeAlias.getName();
-      if (name && !name.endsWith("_")) {
-        localDeclarations.push(typeAlias);
-        localDeclarationNames.add(name);
+      if (typeAlias.isExported() && !typeAlias.getName().endsWith("_")) {
+        exportedDeclarations.push(typeAlias);
+        exportedDeclarationNames.add(typeAlias.getName());
       }
     }
     for (const func of sourceFile.getFunctions()) {
       const name = func.getName();
-      if (name && !func.isAmbient() && !name.endsWith("_") && !SIMPLE_TRIGGER_FUNCTION_NAMES.includes(name)) {
-        localDeclarations.push(func);
-        localDeclarationNames.add(name);
+      if (func.isExported() && name && !name.endsWith("_") && !SIMPLE_TRIGGER_FUNCTION_NAMES.includes(name)) {
+        exportedDeclarations.push(func);
+        exportedDeclarationNames.add(name);
         methodDefinitions.push(getInterfaceMethodDefinition_(name, func));
+        exportedFunctions.push(func);
       }
     }
     for (const varStmt of sourceFile.getVariableStatements()) {
-      if (varStmt.isAmbient()) continue;
+      if (!varStmt.isExported()) continue;
       for (const varDecl of varStmt.getDeclarations()) {
         const name = varDecl.getName();
         const initializer = varDecl.getInitializer();
         if (!name.endsWith("_") && !SIMPLE_TRIGGER_FUNCTION_NAMES.includes(name) && initializer && (initializer.getKind() === SyntaxKind.ArrowFunction || initializer.getKind() === SyntaxKind.FunctionExpression)) {
-          localDeclarations.push(varDecl);
-          localDeclarationNames.add(name);
-          methodDefinitions.push(
-            getInterfaceMethodDefinition_(
-              name,
-              initializer
-            )
-          );
+          const funcExpr = initializer;
+          exportedDeclarations.push(varDecl);
+          exportedDeclarationNames.add(name);
+          methodDefinitions.push(getInterfaceMethodDefinition_(name, funcExpr));
+          exportedFunctions.push(funcExpr);
         }
       }
     }
   }
+  const collectSymbolsFromType = (type, foundSymbols) => {
+    const symbol = type.getAliasSymbol() ?? 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);
+          }
+        }
+      }
+    }
+    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);
+      }
+    }
+  };
+  const returnValueSymbols = /* @__PURE__ */ new Set();
+  for (const func of exportedFunctions) {
+    collectSymbolsFromType(func.getReturnType(), returnValueSymbols);
+  }
   const importsMap = /* @__PURE__ */ new Map();
-  for (const decl of localDeclarations) {
-    const descendants = decl.getDescendantsOfKind?.(SyntaxKind.TypeReference) ?? [];
-    for (const descendant of descendants) {
+  const inlineDefinitions = /* @__PURE__ */ new Map();
+  const symbolsToProcess = /* @__PURE__ */ new Set();
+  const processedSymbols = /* @__PURE__ */ new Set();
+  for (const decl of exportedDeclarations) {
+    for (const descendant of decl.getDescendantsOfKind(
+      SyntaxKind.TypeReference
+    )) {
       const symbol = descendant.getType().getAliasSymbol() ?? descendant.getType().getSymbol();
       if (symbol) {
-        const symbolFlags = symbol.getFlags();
-        if (symbolFlags & SymbolFlags.TypeParameter) {
-          continue;
-        }
-        const symbolName = symbol.getName();
-        if (localDeclarationNames.has(symbolName) || symbolName === "__type") {
-          continue;
-        }
-        const declaration = symbol.getDeclarations()[0];
-        if (declaration) {
-          const declarationSourceFile = declaration.getSourceFile();
-          if (declarationSourceFile.getFilePath().includes("node_modules")) {
-            continue;
-          }
-          let modulePath = path.relative(absoluteOutDir, declarationSourceFile.getFilePath()).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());
+        symbolsToProcess.add(symbol);
+      }
+    }
+  }
+  while (symbolsToProcess.size > 0) {
+    const symbol = symbolsToProcess.values().next().value;
+    if (!symbol) continue;
+    symbolsToProcess.delete(symbol);
+    const symbolName = symbol.getName();
+    if (processedSymbols.has(symbolName) || exportedDeclarationNames.has(symbolName) || symbolName === "__type") {
+      continue;
+    }
+    const symbolFlags = symbol.getFlags();
+    if (symbolFlags & SymbolFlags.TypeParameter) {
+      continue;
+    }
+    const declaration = symbol.getDeclarations()[0];
+    if (!declaration) {
+      continue;
+    }
+    const sourceFile = declaration.getSourceFile();
+    if (sourceFile.getFilePath().includes("node_modules")) {
+      continue;
+    }
+    processedSymbols.add(symbolName);
+    const isLocalDefinition = declaration.getParent()?.getKind() !== SyntaxKind.SourceFile;
+    if (isLocalDefinition) {
+      if (returnValueSymbols.has(symbol)) {
+        const declText = declaration.getText();
+        inlineDefinitions.set(symbolName, declText);
+        const tempSourceFile = project.createSourceFile(
+          `__temp_${symbolName}.ts`,
+          declText
+        );
+        for (const descendant of tempSourceFile.getDescendantsOfKind(
+          SyntaxKind.TypeReference
+        )) {
+          const newSymbol = descendant.getType().getAliasSymbol() ?? descendant.getType().getSymbol();
+          if (newSymbol) {
+            symbolsToProcess.add(newSymbol);
           }
-          importsMap.get(modulePath)?.add(symbolName);
         }
+        tempSourceFile.delete();
       }
+    } else {
+      let modulePath = path.relative(absoluteOutDir, sourceFile.getFilePath()).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);
     }
   }
   if (!fs.existsSync(absoluteOutDir)) {
@@ -181,11 +242,16 @@ const generateAppsScriptTypes = async ({
 
 `;
   }
-  const globalTypeDefinitions = localDeclarations.filter(
-    (d) => d.getKind?.() === SyntaxKind.InterfaceDeclaration || d.getKind?.() === SyntaxKind.TypeAliasDeclaration
-  ).map((decl) => decl.getText?.());
-  if (globalTypeDefinitions.length > 0) {
-    outputContent += `${globalTypeDefinitions.join("\n\n")}
+  if (inlineDefinitions.size > 0) {
+    outputContent += `${[...inlineDefinitions.values()].join("\n\n")}
+
+`;
+  }
+  const exportedTypeDefinitions = exportedDeclarations.filter(
+    (d) => d.getKind() === SyntaxKind.InterfaceDeclaration || d.getKind() === SyntaxKind.TypeAliasDeclaration
+  ).map((decl) => decl.getText());
+  if (exportedTypeDefinitions.length > 0) {
+    outputContent += `${exportedTypeDefinitions.join("\n\n")}
 
 `;
   }
@@ -198,7 +264,7 @@ ${formattedMethods}
 }
 `;
     consola.info(
-      `Interface 'ServerScript' type definitions written to ${absoluteOutputFile} (${methodDefinitions.length} function(s), ${globalTypeDefinitions.length} type(s)).`
+      `Interface 'ServerScript' type definitions written to ${absoluteOutputFile} (${methodDefinitions.length} function(s), ${exportedTypeDefinitions.length + inlineDefinitions.size} type(s)).`
     );
   } else {
     outputContent += "export type ServerScripts = {}\n";

package/package.json

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