@ciderjs/gasnuki 0.3.7 → 0.3.8

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

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

@@ -354,24 +354,9 @@ const generateAppsScriptTypes = async ({
 // Do NOT edit this file manually.
 
 `;
-  const sortedModulePaths = [...importsMap.keys()].sort((a, b) => {
-    const aIsRelative = a.startsWith(".");
-    const bIsRelative = b.startsWith(".");
-    if (aIsRelative !== bIsRelative) return aIsRelative ? 1 : -1;
-    return a.localeCompare(b);
-  });
-  if (sortedModulePaths.length > 0) {
-    const importStatements = sortedModulePaths.map((modulePath) => {
-      const imports = [...importsMap.get(modulePath) ?? []].sort();
-      const finalModulePath = modulePath === "." ? "./index" : modulePath;
-      return `import type { ${imports.join(", ")} } from '${finalModulePath}';`;
-    });
-    outputContent += `${importStatements.join("\n")}
-
-`;
-  }
+  let bodyContent = "";
   if (inlineDefinitions.size > 0) {
-    outputContent += `${[...inlineDefinitions.values()].join("\n\n")}
+    bodyContent += `${[...inlineDefinitions.values()].join("\n\n")}
 
 `;
   }
@@ -379,7 +364,7 @@ const generateAppsScriptTypes = async ({
     (d) => d.getKind() === tsMorph.SyntaxKind.InterfaceDeclaration || d.getKind() === tsMorph.SyntaxKind.TypeAliasDeclaration
   ).map((decl) => decl.getText());
   if (exportedTypeDefinitions.length > 0) {
-    outputContent += `${exportedTypeDefinitions.join("\n\n")}
+    bodyContent += `${exportedTypeDefinitions.join("\n\n")}
 
 `;
   }
@@ -387,7 +372,7 @@ const generateAppsScriptTypes = async ({
     const formattedMethods = methodDefinitions.map(
       (method) => method.split("\n").map((line) => `  ${line}`).join("\n")
     ).join("\n\n");
-    outputContent += `export type ServerScripts = {
+    bodyContent += `export type ServerScripts = {
 ${formattedMethods}
 }
 `;
@@ -395,15 +380,40 @@ ${formattedMethods}
       `Interface 'ServerScript' type definitions written to ${absoluteOutputFile} (${methodDefinitions.length} function(s), ${exportedTypeDefinitions.length + inlineDefinitions.size} type(s)).`
     );
   } else {
-    outputContent += "export type ServerScripts = {}\n";
+    bodyContent += "export type ServerScripts = {}\n";
     consola.consola.info(
       `Interface 'ServerScript' type definitions written to ${absoluteOutputFile} (no functions found).`
     );
   }
-  outputContent += `
+  bodyContent += `
 // Auto-generated Types for GoogleAppsScript in client-side code
 
 ${text}`;
+  const sortedModulePaths = [...importsMap.keys()].sort((a, b) => {
+    const aIsRelative = a.startsWith(".");
+    const bIsRelative = b.startsWith(".");
+    if (aIsRelative !== bIsRelative) return aIsRelative ? 1 : -1;
+    return a.localeCompare(b);
+  });
+  if (sortedModulePaths.length > 0) {
+    const importStatements = sortedModulePaths.map((modulePath) => {
+      const imports = [...importsMap.get(modulePath) ?? []].sort().filter((importName) => {
+        const regex = new RegExp(`\\b${importName}\\b`);
+        return regex.test(bodyContent);
+      });
+      if (imports.length === 0) {
+        return null;
+      }
+      const finalModulePath = modulePath === "." ? "./index" : modulePath;
+      return `import type { ${imports.join(", ")} } from '${finalModulePath}';`;
+    }).filter((s) => s !== null);
+    if (importStatements.length > 0) {
+      outputContent += `${importStatements.join("\n")}
+
+`;
+    }
+  }
+  outputContent += bodyContent;
   fs__namespace.writeFileSync(absoluteOutputFile, outputContent);
 };
 

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

@@ -337,24 +337,9 @@ const generateAppsScriptTypes = async ({
 // Do NOT edit this file manually.
 
 `;
-  const sortedModulePaths = [...importsMap.keys()].sort((a, b) => {
-    const aIsRelative = a.startsWith(".");
-    const bIsRelative = b.startsWith(".");
-    if (aIsRelative !== bIsRelative) return aIsRelative ? 1 : -1;
-    return a.localeCompare(b);
-  });
-  if (sortedModulePaths.length > 0) {
-    const importStatements = sortedModulePaths.map((modulePath) => {
-      const imports = [...importsMap.get(modulePath) ?? []].sort();
-      const finalModulePath = modulePath === "." ? "./index" : modulePath;
-      return `import type { ${imports.join(", ")} } from '${finalModulePath}';`;
-    });
-    outputContent += `${importStatements.join("\n")}
-
-`;
-  }
+  let bodyContent = "";
   if (inlineDefinitions.size > 0) {
-    outputContent += `${[...inlineDefinitions.values()].join("\n\n")}
+    bodyContent += `${[...inlineDefinitions.values()].join("\n\n")}
 
 `;
   }
@@ -362,7 +347,7 @@ const generateAppsScriptTypes = async ({
     (d) => d.getKind() === SyntaxKind.InterfaceDeclaration || d.getKind() === SyntaxKind.TypeAliasDeclaration
   ).map((decl) => decl.getText());
   if (exportedTypeDefinitions.length > 0) {
-    outputContent += `${exportedTypeDefinitions.join("\n\n")}
+    bodyContent += `${exportedTypeDefinitions.join("\n\n")}
 
 `;
   }
@@ -370,7 +355,7 @@ const generateAppsScriptTypes = async ({
     const formattedMethods = methodDefinitions.map(
       (method) => method.split("\n").map((line) => `  ${line}`).join("\n")
     ).join("\n\n");
-    outputContent += `export type ServerScripts = {
+    bodyContent += `export type ServerScripts = {
 ${formattedMethods}
 }
 `;
@@ -378,15 +363,40 @@ ${formattedMethods}
       `Interface 'ServerScript' type definitions written to ${absoluteOutputFile} (${methodDefinitions.length} function(s), ${exportedTypeDefinitions.length + inlineDefinitions.size} type(s)).`
     );
   } else {
-    outputContent += "export type ServerScripts = {}\n";
+    bodyContent += "export type ServerScripts = {}\n";
     consola.info(
       `Interface 'ServerScript' type definitions written to ${absoluteOutputFile} (no functions found).`
     );
   }
-  outputContent += `
+  bodyContent += `
 // Auto-generated Types for GoogleAppsScript in client-side code
 
 ${text}`;
+  const sortedModulePaths = [...importsMap.keys()].sort((a, b) => {
+    const aIsRelative = a.startsWith(".");
+    const bIsRelative = b.startsWith(".");
+    if (aIsRelative !== bIsRelative) return aIsRelative ? 1 : -1;
+    return a.localeCompare(b);
+  });
+  if (sortedModulePaths.length > 0) {
+    const importStatements = sortedModulePaths.map((modulePath) => {
+      const imports = [...importsMap.get(modulePath) ?? []].sort().filter((importName) => {
+        const regex = new RegExp(`\\b${importName}\\b`);
+        return regex.test(bodyContent);
+      });
+      if (imports.length === 0) {
+        return null;
+      }
+      const finalModulePath = modulePath === "." ? "./index" : modulePath;
+      return `import type { ${imports.join(", ")} } from '${finalModulePath}';`;
+    }).filter((s) => s !== null);
+    if (importStatements.length > 0) {
+      outputContent += `${importStatements.join("\n")}
+
+`;
+    }
+  }
+  outputContent += bodyContent;
   fs.writeFileSync(absoluteOutputFile, outputContent);
 };
 

package/dist/vite.cjs

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

package/package.json

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