@ciderjs/gasnuki 0.5.4 → 0.5.5

package/.agent/skills/commit-msg/SKILL.md

@@ -0,0 +1,30 @@
+---
+name: commit-msg
+description: Analyzes staged files, generates an appropriate commit message, and executes the commit.
+---
+
+# Commit Message Skill
+
+Generate a commit message for staged files and execute the commit.
+
+## Commit Procedure
+
+1. Read staged file differences using `git diff --staged`.
+2. Check the current branch using `git branch -a`.
+   - If on `main` branch or if the branch name does not reflect the staged changes, create and switch to a new branch:
+
+     ```powershell
+     git branch <new-branch-name>
+     git checkout <new-branch-name>
+     ```
+
+3. Review the last 3 commit messages using `git log -n 3` to understand the project's commit style.
+4. Generate a commit message based on:
+   - The staged changes
+   - The observed commit message style
+5. Execute the commit using `git commit` in a Windows 11 PowerShell environment.
+
+## Rules
+
+- Only commit staged files. Do not include unstaged changes.
+- Execute each git command separately. Do not chain commands.

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-91.22%25-brightgreen)](https://github.com/luthpg/gasnuki)
+[![Test Coverage](https://img.shields.io/badge/test%20coverage-89.47%25-green)](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)
 [![NPM Downloads](https://img.shields.io/npm/dw/@ciderjs/gasnuki)](https://www.npmjs.com/package/@ciderjs/gasnuki)

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-91.22%25-brightgreen)](https://github.com/luthpg/gasnuki)
+[![Test Coverage](https://img.shields.io/badge/test%20coverage-89.47%25-green)](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)
 [![NPM Downloads](https://img.shields.io/npm/dw/@ciderjs/gasnuki)](https://www.npmjs.com/package/@ciderjs/gasnuki)

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.D2FZdJSt.cjs');
+const config = require('./shared/gasnuki.BXbhblFz.cjs');
 require('chokidar');
 require('consola');
 require('node:crypto');
@@ -26,7 +26,7 @@ function _interopNamespaceCompat(e) {
 
 const path__namespace = /*#__PURE__*/_interopNamespaceCompat(path);
 
-const version = "0.5.4";
+const version = "0.5.5";
 
 const parseArgs = async (command) => {
   const cliOpts = command.opts();

package/dist/cli.mjs

@@ -2,7 +2,7 @@
 import * as path from 'node:path';
 import { Command } from 'commander';
 import { generateTypes } from './index.mjs';
-import { l as loadConfig } from './shared/gasnuki.Ee5cF3d4.mjs';
+import { l as loadConfig } from './shared/gasnuki.36-kDBNB.mjs';
 import 'chokidar';
 import 'consola';
 import 'node:crypto';
@@ -10,7 +10,7 @@ import 'node:fs';
 import 'ts-morph';
 import 'jiti';
 
-const version = "0.5.4";
+const version = "0.5.5";
 
 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.D2FZdJSt.cjs');
+const config = require('./shared/gasnuki.BXbhblFz.cjs');
 require('node:crypto');
 require('node:fs');
 require('ts-morph');
@@ -37,16 +37,23 @@ const generateTypes = async ({
   }
   const runGeneration = async (triggeredBy) => {
     const reason = triggeredBy ? ` (${triggeredBy})` : "";
-    consola.consola.info(`Generating AppsScript types${reason}...`);
+    if (!watch) {
+      consola.consola.info(`Generating AppsScript types${reason}...`);
+    }
     try {
       await config.generateAppsScriptTypes({
         project,
         srcDir,
         outDir,
         outputFile,
-        cache
+        cache,
+        quiet: watch
       });
-      consola.consola.info("Type generation complete.");
+      if (watch) {
+        consola.consola.success(`Generated AppsScript types${reason}.`);
+      } else {
+        consola.consola.info("Type generation complete.");
+      }
     } catch (e) {
       consola.consola.error(`Type generation failed: ${e.message}`, e);
     }

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.Ee5cF3d4.mjs';
-export { d as defineConfig } from './shared/gasnuki.Ee5cF3d4.mjs';
+import { g as generateAppsScriptTypes } from './shared/gasnuki.36-kDBNB.mjs';
+export { d as defineConfig } from './shared/gasnuki.36-kDBNB.mjs';
 import 'node:crypto';
 import 'node:fs';
 import 'ts-morph';
@@ -21,16 +21,23 @@ const generateTypes = async ({
   }
   const runGeneration = async (triggeredBy) => {
     const reason = triggeredBy ? ` (${triggeredBy})` : "";
-    consola.info(`Generating AppsScript types${reason}...`);
+    if (!watch) {
+      consola.info(`Generating AppsScript types${reason}...`);
+    }
     try {
       await generateAppsScriptTypes({
         project,
         srcDir,
         outDir,
         outputFile,
-        cache
+        cache,
+        quiet: watch
       });
-      consola.info("Type generation complete.");
+      if (watch) {
+        consola.success(`Generated AppsScript types${reason}.`);
+      } else {
+        consola.info("Type generation complete.");
+      }
     } catch (e) {
       consola.error(`Type generation failed: ${e.message}`, e);
     }

package/dist/shared/{gasnuki.Ee5cF3d4.mjs → gasnuki.36-kDBNB.mjs}

@@ -19,21 +19,48 @@ const computeSourceHash = (sourceFiles) => {
   }
   return hash.digest("hex");
 };
+const cleanType = (t) => t.replace(/import\(".*?"\)\.default\./g, "").replace(/import\(".*?"\)\./g, "");
+const simplifyType = (type, node) => {
+  const aliasSymbol = type.getAliasSymbol();
+  if (aliasSymbol && ["Pick", "Omit"].includes(aliasSymbol.getName())) {
+    const props = type.getProperties();
+    const members = props.map((prop) => {
+      const name = prop.getName();
+      const declarations = prop.getDeclarations();
+      let propType = prop.getTypeAtLocation(node);
+      if ((!propType || propType.getText() === "any") && declarations.length > 0) {
+        propType = declarations[0].getType();
+      }
+      const typeText = cleanType(propType.getText(node));
+      const isOptional = prop.hasFlags(SymbolFlags.Optional);
+      return `${name}${isOptional ? "?" : ""}: ${typeText}`;
+    });
+    return `{ ${members.join("; ")} }`;
+  }
+  return null;
+};
 const getInterfaceMethodDefinition_ = (name, node) => {
   const typeParameters = node.getTypeParameters?.() ?? [];
   const typeParamsString = typeParameters.length > 0 ? `<${typeParameters.map((tp) => tp.getText()).join(", ")}>` : "";
   const parameters = node.getParameters().map((param) => {
     const paramName = param.getName();
-    const type = param.getTypeNode()?.getText() ?? param.getType().getText(node) ?? "any";
+    let type = param.getTypeNode()?.getText() ?? param.getType().getText(node) ?? "any";
+    const simplified = simplifyType(param.getType(), node);
+    if (simplified) {
+      type = simplified;
+    }
     const questionToken = param.hasQuestionToken() ? "?" : "";
     return `${paramName}${questionToken}: ${type}`;
   }).join(", ");
   const returnTypeNode = node.getReturnTypeNode();
   let returnType;
-  if (returnTypeNode != null) {
+  const inferredReturnType = node.getReturnType();
+  const simplifiedReturn = simplifyType(inferredReturnType, node);
+  if (simplifiedReturn) {
+    returnType = simplifiedReturn;
+  } else if (returnTypeNode != null) {
     returnType = returnTypeNode.getText();
   } else {
-    const inferredReturnType = node.getReturnType();
     if (inferredReturnType.isVoid()) {
       returnType = "void";
     } else {
@@ -54,7 +81,6 @@ const getInterfaceMethodDefinition_ = (name, node) => {
 `;
     }
   }
-  const cleanType = (t) => t.replace(/import\(".*?"\)\.default\./g, "").replace(/import\(".*?"\)\./g, "");
   const cleanedReturnType = cleanType(returnType);
   const cleanedParameters = parameters.replace(
     /:\s*([^,;)]+)/g,
@@ -141,12 +167,7 @@ const resolveNodeModuleSpecifier_ = (filePath) => {
       if (matchesExportValue_(exportValue, relativePath)) {
         if (key === ".") return packageName;
         const subPath = key.startsWith("./") ? key.slice(2) : key;
-        console.log(`[gasnuki] Matched key: ${key}, subPath: ${subPath}`);
         return `${packageName}/${subPath}`;
-      } else {
-        console.log(
-          `[gasnuki] No match for ${key}: ${JSON.stringify(exportValue)} vs ${relativePath} (pkgRoot: ${packageRoot}, file: ${filePath})`
-        );
       }
     }
   }
@@ -168,15 +189,18 @@ const generateAppsScriptTypes = async ({
   outDir,
   outputFile,
   projectInstance,
-  cache = true
+  cache = true,
   // Default to true
+  quiet
 }) => {
   const absoluteSrcDir = path.resolve(projectPath, srcDir);
   const absoluteOutDir = path.resolve(projectPath, outDir);
   const absoluteOutputFile = path.resolve(absoluteOutDir, outputFile);
-  consola.info("Starting AppsScript type generation with gasnuki...");
-  consola.info(`  AppsScript Source Directory: ${absoluteSrcDir}`);
-  consola.info(`  Output File: ${absoluteOutputFile}`);
+  if (!quiet) {
+    consola.info("Starting AppsScript type generation with gasnuki...");
+    consola.info(`  AppsScript Source Directory: ${absoluteSrcDir}`);
+    consola.info(`  Output File: ${absoluteOutputFile}`);
+  }
   let tsConfigFilePath = path.resolve(projectPath, "tsconfig.json");
   if (fs.existsSync(path.resolve(projectPath, "tsconfig.app.json"))) {
     tsConfigFilePath = path.resolve(projectPath, "tsconfig.app.json");
@@ -189,14 +213,18 @@ const generateAppsScriptTypes = async ({
   const testFilesPattern = `!${path.join(absoluteSrcDir, "**/*.{test,spec}.ts").replace(/\\/g, "/")}`;
   project.addSourceFilesAtPaths([sourceFilesPattern, testFilesPattern]);
   const sourceFiles = project.getSourceFiles();
-  consola.info(`Found ${sourceFiles.length} source file(s).`);
+  if (!quiet) {
+    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)}).`
-      );
+      if (!quiet) {
+        consola.success(
+          `Skipping generation: Source files have not changed (Hash: ${currentHash.slice(0, 8)}).`
+        );
+      }
       return;
     }
   }
@@ -536,7 +564,9 @@ const generateAppsScriptTypes = async ({
   }
   if (!fs.existsSync(absoluteOutDir)) {
     fs.mkdirSync(absoluteOutDir, { recursive: true });
-    consola.info(`Created output directory: ${absoluteOutDir}`);
+    if (!quiet) {
+      consola.info(`Created output directory: ${absoluteOutDir}`);
+    }
   }
   const generatorName = "gasnuki";
   let outputContent = `// Auto-generated by ${generatorName}
@@ -565,14 +595,18 @@ const generateAppsScriptTypes = async ({
 ${formattedMethods}
 }
 `;
-    consola.info(
-      `Interface 'ServerScript' type definitions written to ${absoluteOutputFile} (${methodDefinitions.length} function(s), ${exportedTypeDefinitions.length + inlineDefinitions.size} type(s)).`
-    );
+    if (!quiet) {
+      consola.info(
+        `Interface 'ServerScript' type definitions written to ${absoluteOutputFile} (${methodDefinitions.length} function(s), ${exportedTypeDefinitions.length + inlineDefinitions.size} type(s)).`
+      );
+    }
   } else {
     bodyContent += "export type ServerScripts = {}\n";
-    consola.info(
-      `Interface 'ServerScript' type definitions written to ${absoluteOutputFile} (no functions found).`
-    );
+    if (!quiet) {
+      consola.info(
+        `Interface 'ServerScript' type definitions written to ${absoluteOutputFile} (no functions found).`
+      );
+    }
   }
   bodyContent += `
 // Auto-generated Types for GoogleAppsScript in client-side code

package/dist/shared/{gasnuki.D2FZdJSt.cjs → gasnuki.BXbhblFz.cjs}

@@ -37,21 +37,48 @@ const computeSourceHash = (sourceFiles) => {
   }
   return hash.digest("hex");
 };
+const cleanType = (t) => t.replace(/import\(".*?"\)\.default\./g, "").replace(/import\(".*?"\)\./g, "");
+const simplifyType = (type, node) => {
+  const aliasSymbol = type.getAliasSymbol();
+  if (aliasSymbol && ["Pick", "Omit"].includes(aliasSymbol.getName())) {
+    const props = type.getProperties();
+    const members = props.map((prop) => {
+      const name = prop.getName();
+      const declarations = prop.getDeclarations();
+      let propType = prop.getTypeAtLocation(node);
+      if ((!propType || propType.getText() === "any") && declarations.length > 0) {
+        propType = declarations[0].getType();
+      }
+      const typeText = cleanType(propType.getText(node));
+      const isOptional = prop.hasFlags(tsMorph.SymbolFlags.Optional);
+      return `${name}${isOptional ? "?" : ""}: ${typeText}`;
+    });
+    return `{ ${members.join("; ")} }`;
+  }
+  return null;
+};
 const getInterfaceMethodDefinition_ = (name, node) => {
   const typeParameters = node.getTypeParameters?.() ?? [];
   const typeParamsString = typeParameters.length > 0 ? `<${typeParameters.map((tp) => tp.getText()).join(", ")}>` : "";
   const parameters = node.getParameters().map((param) => {
     const paramName = param.getName();
-    const type = param.getTypeNode()?.getText() ?? param.getType().getText(node) ?? "any";
+    let type = param.getTypeNode()?.getText() ?? param.getType().getText(node) ?? "any";
+    const simplified = simplifyType(param.getType(), node);
+    if (simplified) {
+      type = simplified;
+    }
     const questionToken = param.hasQuestionToken() ? "?" : "";
     return `${paramName}${questionToken}: ${type}`;
   }).join(", ");
   const returnTypeNode = node.getReturnTypeNode();
   let returnType;
-  if (returnTypeNode != null) {
+  const inferredReturnType = node.getReturnType();
+  const simplifiedReturn = simplifyType(inferredReturnType, node);
+  if (simplifiedReturn) {
+    returnType = simplifiedReturn;
+  } else if (returnTypeNode != null) {
     returnType = returnTypeNode.getText();
   } else {
-    const inferredReturnType = node.getReturnType();
     if (inferredReturnType.isVoid()) {
       returnType = "void";
     } else {
@@ -72,7 +99,6 @@ const getInterfaceMethodDefinition_ = (name, node) => {
 `;
     }
   }
-  const cleanType = (t) => t.replace(/import\(".*?"\)\.default\./g, "").replace(/import\(".*?"\)\./g, "");
   const cleanedReturnType = cleanType(returnType);
   const cleanedParameters = parameters.replace(
     /:\s*([^,;)]+)/g,
@@ -159,12 +185,7 @@ const resolveNodeModuleSpecifier_ = (filePath) => {
       if (matchesExportValue_(exportValue, relativePath)) {
         if (key === ".") return packageName;
         const subPath = key.startsWith("./") ? key.slice(2) : key;
-        console.log(`[gasnuki] Matched key: ${key}, subPath: ${subPath}`);
         return `${packageName}/${subPath}`;
-      } else {
-        console.log(
-          `[gasnuki] No match for ${key}: ${JSON.stringify(exportValue)} vs ${relativePath} (pkgRoot: ${packageRoot}, file: ${filePath})`
-        );
       }
     }
   }
@@ -186,15 +207,18 @@ const generateAppsScriptTypes = async ({
   outDir,
   outputFile,
   projectInstance,
-  cache = true
+  cache = true,
   // Default to true
+  quiet
 }) => {
   const absoluteSrcDir = path__namespace.resolve(projectPath, srcDir);
   const absoluteOutDir = path__namespace.resolve(projectPath, outDir);
   const absoluteOutputFile = path__namespace.resolve(absoluteOutDir, outputFile);
-  consola.consola.info("Starting AppsScript type generation with gasnuki...");
-  consola.consola.info(`  AppsScript Source Directory: ${absoluteSrcDir}`);
-  consola.consola.info(`  Output File: ${absoluteOutputFile}`);
+  if (!quiet) {
+    consola.consola.info("Starting AppsScript type generation with gasnuki...");
+    consola.consola.info(`  AppsScript Source Directory: ${absoluteSrcDir}`);
+    consola.consola.info(`  Output File: ${absoluteOutputFile}`);
+  }
   let tsConfigFilePath = path__namespace.resolve(projectPath, "tsconfig.json");
   if (fs__namespace.existsSync(path__namespace.resolve(projectPath, "tsconfig.app.json"))) {
     tsConfigFilePath = path__namespace.resolve(projectPath, "tsconfig.app.json");
@@ -207,14 +231,18 @@ const generateAppsScriptTypes = async ({
   const testFilesPattern = `!${path__namespace.join(absoluteSrcDir, "**/*.{test,spec}.ts").replace(/\\/g, "/")}`;
   project.addSourceFilesAtPaths([sourceFilesPattern, testFilesPattern]);
   const sourceFiles = project.getSourceFiles();
-  consola.consola.info(`Found ${sourceFiles.length} source file(s).`);
+  if (!quiet) {
+    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)}).`
-      );
+      if (!quiet) {
+        consola.consola.success(
+          `Skipping generation: Source files have not changed (Hash: ${currentHash.slice(0, 8)}).`
+        );
+      }
       return;
     }
   }
@@ -554,7 +582,9 @@ const generateAppsScriptTypes = async ({
   }
   if (!fs__namespace.existsSync(absoluteOutDir)) {
     fs__namespace.mkdirSync(absoluteOutDir, { recursive: true });
-    consola.consola.info(`Created output directory: ${absoluteOutDir}`);
+    if (!quiet) {
+      consola.consola.info(`Created output directory: ${absoluteOutDir}`);
+    }
   }
   const generatorName = "gasnuki";
   let outputContent = `// Auto-generated by ${generatorName}
@@ -583,14 +613,18 @@ const generateAppsScriptTypes = async ({
 ${formattedMethods}
 }
 `;
-    consola.consola.info(
-      `Interface 'ServerScript' type definitions written to ${absoluteOutputFile} (${methodDefinitions.length} function(s), ${exportedTypeDefinitions.length + inlineDefinitions.size} type(s)).`
-    );
+    if (!quiet) {
+      consola.consola.info(
+        `Interface 'ServerScript' type definitions written to ${absoluteOutputFile} (${methodDefinitions.length} function(s), ${exportedTypeDefinitions.length + inlineDefinitions.size} type(s)).`
+      );
+    }
   } else {
     bodyContent += "export type ServerScripts = {}\n";
-    consola.consola.info(
-      `Interface 'ServerScript' type definitions written to ${absoluteOutputFile} (no functions found).`
-    );
+    if (!quiet) {
+      consola.consola.info(
+        `Interface 'ServerScript' type definitions written to ${absoluteOutputFile} (no functions found).`
+      );
+    }
   }
   bodyContent += `
 // Auto-generated Types for GoogleAppsScript in client-side code

package/dist/vite.cjs

@@ -2,7 +2,7 @@
 
 const path = require('node:path');
 const consola = require('consola');
-const config = require('./shared/gasnuki.D2FZdJSt.cjs');
+const config = require('./shared/gasnuki.BXbhblFz.cjs');
 require('node:crypto');
 require('node:fs');
 require('ts-morph');
@@ -36,13 +36,13 @@ function gasnuki(options) {
     debounce(async () => {
       const reason = triggeredBy ? ` (triggered by: ${triggeredBy})` : "";
       console.log("");
-      consola.consola.info(`[gasnuki] Generating AppsScript types${reason}...`);
       try {
         await config.generateAppsScriptTypes({
           ...gasnukiOptions,
-          project: projectRoot
+          project: projectRoot,
+          quiet: true
         });
-        consola.consola.success("[gasnuki] Type generation complete.");
+        consola.consola.success(`[gasnuki] Generated AppsScript types${reason}.`);
       } catch (e) {
         consola.consola.error(
           `[gasnuki] Type generation failed: ${e.message}`

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.Ee5cF3d4.mjs';
+import { l as loadConfig, g as generateAppsScriptTypes } from './shared/gasnuki.36-kDBNB.mjs';
 import 'node:crypto';
 import 'node:fs';
 import 'ts-morph';
@@ -20,13 +20,13 @@ function gasnuki(options) {
     debounce(async () => {
       const reason = triggeredBy ? ` (triggered by: ${triggeredBy})` : "";
       console.log("");
-      consola.info(`[gasnuki] Generating AppsScript types${reason}...`);
       try {
         await generateAppsScriptTypes({
           ...gasnukiOptions,
-          project: projectRoot
+          project: projectRoot,
+          quiet: true
         });
-        consola.success("[gasnuki] Type generation complete.");
+        consola.success(`[gasnuki] Generated AppsScript types${reason}.`);
       } catch (e) {
         consola.error(
           `[gasnuki] Type generation failed: ${e.message}`

package/package.json

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