@ciderjs/gasnuki 0.1.2 → 0.1.4

package/bin/generate.ts

@@ -0,0 +1,11 @@
+import * as fs from 'node:fs/promises';
+
+(async () => {
+  const file = await fs.readFile('./bin/typedef/clientside.d.ts', 'utf-8');
+  await fs.writeFile(
+    './src/modules/clientside.json',
+    JSON.stringify({
+      text: file,
+    }),
+  );
+})();

package/bin/typedef/clientside.d.ts

@@ -0,0 +1,52 @@
+type RemoveReturnType<T> = {
+  [P in keyof T]: T[P] extends (...args: infer A) => any
+    ? (...args: A) => void
+    : T[P];
+};
+
+type _AppsScriptRun = RemoveReturnType<ServerScripts> & {
+  withSuccessHandler: <T = string | number | boolean | undefined, U = any>(
+    callback: (returnValues: T, userObject?: U) => void,
+  ) => _AppsScriptRun;
+  withFailureHandler: <U = any>(
+    callback: (error: Error, userObject?: U) => void,
+  ) => _AppsScriptRun;
+  withUserObject: <U = any>(userObject: U) => _AppsScriptRun;
+};
+
+type _AppsScriptHistoryFunction = (
+  stateObject: object,
+  params: object,
+  hash: string,
+) => void;
+
+interface _WebAppLovacationType {
+  hash: string;
+  parameter: Record<string, string>;
+  parameters: Record<string, string[]>;
+}
+
+export declare interface GoogleClientSideApi {
+  script: {
+    run: _AppsScriptRun;
+    url: {
+      getLocation: (
+        callback: (location: _WebAppLovacationType) => void,
+      ) => void;
+    };
+    history: {
+      push: _AppsScriptHistoryFunction;
+      replace: _AppsScriptHistoryFunction;
+      setChangeHandler: (
+        callback: (e: {
+          state: object;
+          location: _WebAppLovacationType;
+        }) => void,
+      ) => void;
+    };
+  };
+}
+
+declare global {
+  const google: GoogleClientSideApi;
+}

package/dist/cli.cjs

@@ -9,7 +9,7 @@ require('consola');
 require('node:fs');
 require('ts-morph');
 
-const version = "0.1.2";
+const version = "0.1.4";
 
 const parseArgs = async (command) => {
   const { project, srcDir, outDir, outputFile, watch } = command.opts();

package/dist/cli.mjs

@@ -7,7 +7,7 @@ import 'consola';
 import 'node:fs';
 import 'ts-morph';
 
-const version = "0.1.2";
+const version = "0.1.4";
 
 const parseArgs = async (command) => {
   const { project, srcDir, outDir, outputFile, watch } = command.opts();

package/dist/index.cjs

@@ -22,6 +22,8 @@ const path__namespace = /*#__PURE__*/_interopNamespaceCompat(path);
 const chokidar__namespace = /*#__PURE__*/_interopNamespaceCompat(chokidar);
 const fs__namespace = /*#__PURE__*/_interopNamespaceCompat(fs);
 
+const text = "type RemoveReturnType<T> = {\n  [P in keyof T]: T[P] extends (...args: infer A) => any\n    ? (...args: A) => void\n    : T[P];\n};\n\ntype _AppsScriptRun = RemoveReturnType<ServerScripts> & {\n  withSuccessHandler: <T = string | number | boolean | undefined, U = any>(\n    callback: (returnValues: T, userObject?: U) => void,\n  ) => _AppsScriptRun;\n  withFailureHandler: <U = any>(\n    callback: (error: Error, userObject?: U) => void,\n  ) => _AppsScriptRun;\n  withUserObject: <U = any>(userObject: U) => _AppsScriptRun;\n};\n\ntype _AppsScriptHistoryFunction = (\n  stateObject: object,\n  params: object,\n  hash: string,\n) => void;\n\ninterface _WebAppLovacationType {\n  hash: string;\n  parameter: Record<string, string>;\n  parameters: Record<string, string[]>;\n}\n\nexport declare interface GoogleClientSideApi {\n  script: {\n    run: _AppsScriptRun;\n    url: {\n      getLocation: (\n        callback: (location: _WebAppLovacationType) => void,\n      ) => void;\n    };\n    history: {\n      push: _AppsScriptHistoryFunction;\n      replace: _AppsScriptHistoryFunction;\n      setChangeHandler: (\n        callback: (e: {\n          state: object;\n          location: _WebAppLovacationType;\n        }) => void,\n      ) => void;\n    };\n  };\n}\n\ndeclare global {\n  const google: GoogleClientSideApi;\n}\n";
+
 const getInterfaceMethodDefinition_ = (name, node) => {
   const typeParameters = node.getTypeParameters?.() ?? [];
   const typeParamsString = typeParameters.length > 0 ? `<${typeParameters.map((tp) => tp.getText()).join(", ")}>` : "";
@@ -109,7 +111,7 @@ const generateAppsScriptTypes = async ({
     for (const funcDecl of sourceFile.getFunctions()) {
       if (!funcDecl.isAmbient()) {
         const name = funcDecl.getName();
-        if (name != null) {
+        if (name != null && !name.endsWith("_")) {
           methodDefinitions.push(getInterfaceMethodDefinition_(name, funcDecl));
         }
       }
@@ -119,7 +121,7 @@ const generateAppsScriptTypes = async ({
         for (const varDecl of varStmt.getDeclarations()) {
           const initializer = varDecl.getInitializer();
           const varName = varDecl.getName();
-          if (initializer != null && (initializer.getKind() === tsMorph.SyntaxKind.ArrowFunction || initializer.getKind() === tsMorph.SyntaxKind.FunctionExpression)) {
+          if (initializer != null && (initializer.getKind() === tsMorph.SyntaxKind.ArrowFunction || initializer.getKind() === tsMorph.SyntaxKind.FunctionExpression) && !varName.endsWith("_")) {
             methodDefinitions.push(
               getInterfaceMethodDefinition_(
                 varName,
@@ -148,7 +150,7 @@ const generateAppsScriptTypes = async ({
     const formattedMethods = methodDefinitions.map(
       (method) => method.split("\n").map((line) => `  ${line}`).join("\n")
     ).join("\n\n");
-    outputContent += `export interface ServerScripts {
+    outputContent += `export type ServerScripts = {
 ${formattedMethods}
 }
 `;
@@ -156,7 +158,7 @@ ${formattedMethods}
       `Interface 'ServerScript' type definitions written to ${absoluteOutputFile} (${methodDefinitions.length} function(s), ${globalTypeDefinitions.length} type(s)).`
     );
   } else {
-    outputContent = "export interface ServerScripts {}\n";
+    outputContent = "export type ServerScripts = {}\n";
     consola.consola.info(
       `Interface 'ServerScript' type definitions written to ${absoluteOutputFile} (no functions found).`
     );
@@ -164,54 +166,7 @@ ${formattedMethods}
   outputContent += `
 // Auto-generated Types for GoogleAppsScript in client-side code
 
-type RemoveReturnType<T> = {
-  [P in keyof T]: T[P] extends (...args: infer A) => any
-    ? (...args: A) => void
-    : T[P];
-};
-
-type _AppsScriptRun = RemoveReturnType<ServerScripts> & {
-  withSuccessHandler: <T = string | number | boolean | undefined, U = any>(
-    callback: (returnValues: T, userObject?: U) => void,
-  ) => _AppsScriptRun;
-  withFailureHandler: <U = any>(
-    callback: (error: Error, userObject?: U) => void,
-  ) => _AppsScriptRun;
-  withUserObject: <U = any>(userObject: U) => _AppsScriptRun;
-};
-
-type _AppsScriptHistoryFunction = (
-  stateObject: object,
-  params: object,
-  hash: string,
-) => void;
-
-interface _WebAppLovacationType {
-  hash: string;
-  parameter: Record<string, string>;
-  parameters: Record<string, string[]>;
-}
-
-export declare interface GoogleClientSideApi {
-  script: {
-    run: _AppsScriptRun;
-    url: {
-      getLocation: (callback: (location: _WebAppLovacationType) => void) => void;
-    };
-    history: {
-      push: _AppsScriptHistoryFunction;
-      replace: _AppsScriptHistoryFunction;
-      setChangeHandler: (
-        callback: (e: { state: object; location: _WebAppLovacationType }) => void
-      ) => void;
-    }
-  };
-}
-
-declare global {
-  const google: GoogleClientSideApi;
-}
-`;
+${text}`;
   fs__namespace.writeFileSync(absoluteOutputFile, outputContent);
 };
 

package/dist/index.mjs

@@ -4,6 +4,8 @@ import { consola } from 'consola';
 import * as fs from 'node:fs';
 import { Project, SyntaxKind } from 'ts-morph';
 
+const text = "type RemoveReturnType<T> = {\n  [P in keyof T]: T[P] extends (...args: infer A) => any\n    ? (...args: A) => void\n    : T[P];\n};\n\ntype _AppsScriptRun = RemoveReturnType<ServerScripts> & {\n  withSuccessHandler: <T = string | number | boolean | undefined, U = any>(\n    callback: (returnValues: T, userObject?: U) => void,\n  ) => _AppsScriptRun;\n  withFailureHandler: <U = any>(\n    callback: (error: Error, userObject?: U) => void,\n  ) => _AppsScriptRun;\n  withUserObject: <U = any>(userObject: U) => _AppsScriptRun;\n};\n\ntype _AppsScriptHistoryFunction = (\n  stateObject: object,\n  params: object,\n  hash: string,\n) => void;\n\ninterface _WebAppLovacationType {\n  hash: string;\n  parameter: Record<string, string>;\n  parameters: Record<string, string[]>;\n}\n\nexport declare interface GoogleClientSideApi {\n  script: {\n    run: _AppsScriptRun;\n    url: {\n      getLocation: (\n        callback: (location: _WebAppLovacationType) => void,\n      ) => void;\n    };\n    history: {\n      push: _AppsScriptHistoryFunction;\n      replace: _AppsScriptHistoryFunction;\n      setChangeHandler: (\n        callback: (e: {\n          state: object;\n          location: _WebAppLovacationType;\n        }) => void,\n      ) => void;\n    };\n  };\n}\n\ndeclare global {\n  const google: GoogleClientSideApi;\n}\n";
+
 const getInterfaceMethodDefinition_ = (name, node) => {
   const typeParameters = node.getTypeParameters?.() ?? [];
   const typeParamsString = typeParameters.length > 0 ? `<${typeParameters.map((tp) => tp.getText()).join(", ")}>` : "";
@@ -91,7 +93,7 @@ const generateAppsScriptTypes = async ({
     for (const funcDecl of sourceFile.getFunctions()) {
       if (!funcDecl.isAmbient()) {
         const name = funcDecl.getName();
-        if (name != null) {
+        if (name != null && !name.endsWith("_")) {
           methodDefinitions.push(getInterfaceMethodDefinition_(name, funcDecl));
         }
       }
@@ -101,7 +103,7 @@ const generateAppsScriptTypes = async ({
         for (const varDecl of varStmt.getDeclarations()) {
           const initializer = varDecl.getInitializer();
           const varName = varDecl.getName();
-          if (initializer != null && (initializer.getKind() === SyntaxKind.ArrowFunction || initializer.getKind() === SyntaxKind.FunctionExpression)) {
+          if (initializer != null && (initializer.getKind() === SyntaxKind.ArrowFunction || initializer.getKind() === SyntaxKind.FunctionExpression) && !varName.endsWith("_")) {
             methodDefinitions.push(
               getInterfaceMethodDefinition_(
                 varName,
@@ -130,7 +132,7 @@ const generateAppsScriptTypes = async ({
     const formattedMethods = methodDefinitions.map(
       (method) => method.split("\n").map((line) => `  ${line}`).join("\n")
     ).join("\n\n");
-    outputContent += `export interface ServerScripts {
+    outputContent += `export type ServerScripts = {
 ${formattedMethods}
 }
 `;
@@ -138,7 +140,7 @@ ${formattedMethods}
       `Interface 'ServerScript' type definitions written to ${absoluteOutputFile} (${methodDefinitions.length} function(s), ${globalTypeDefinitions.length} type(s)).`
     );
   } else {
-    outputContent = "export interface ServerScripts {}\n";
+    outputContent = "export type ServerScripts = {}\n";
     consola.info(
       `Interface 'ServerScript' type definitions written to ${absoluteOutputFile} (no functions found).`
     );
@@ -146,54 +148,7 @@ ${formattedMethods}
   outputContent += `
 // Auto-generated Types for GoogleAppsScript in client-side code
 
-type RemoveReturnType<T> = {
-  [P in keyof T]: T[P] extends (...args: infer A) => any
-    ? (...args: A) => void
-    : T[P];
-};
-
-type _AppsScriptRun = RemoveReturnType<ServerScripts> & {
-  withSuccessHandler: <T = string | number | boolean | undefined, U = any>(
-    callback: (returnValues: T, userObject?: U) => void,
-  ) => _AppsScriptRun;
-  withFailureHandler: <U = any>(
-    callback: (error: Error, userObject?: U) => void,
-  ) => _AppsScriptRun;
-  withUserObject: <U = any>(userObject: U) => _AppsScriptRun;
-};
-
-type _AppsScriptHistoryFunction = (
-  stateObject: object,
-  params: object,
-  hash: string,
-) => void;
-
-interface _WebAppLovacationType {
-  hash: string;
-  parameter: Record<string, string>;
-  parameters: Record<string, string[]>;
-}
-
-export declare interface GoogleClientSideApi {
-  script: {
-    run: _AppsScriptRun;
-    url: {
-      getLocation: (callback: (location: _WebAppLovacationType) => void) => void;
-    };
-    history: {
-      push: _AppsScriptHistoryFunction;
-      replace: _AppsScriptHistoryFunction;
-      setChangeHandler: (
-        callback: (e: { state: object; location: _WebAppLovacationType }) => void
-      ) => void;
-    }
-  };
-}
-
-declare global {
-  const google: GoogleClientSideApi;
-}
-`;
+${text}`;
   fs.writeFileSync(absoluteOutputFile, outputContent);
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ciderjs/gasnuki",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "",
   "main": "dist/index.mjs",
   "types": "dist/index.d.ts",
@@ -15,10 +15,11 @@
     }
   },
   "scripts": {
-    "dev": "jiti src/cli.ts -p playground/react -s src/server",
+    "prebuild": "jiti bin/generate.ts",
+    "dev": "pnpm prebuild && jiti src/cli.ts -p playground/react -s src/server",
     "start": "node dist/cli.mjs -p playground/react -s src/server",
     "check": "biome check --write",
-    "build": "unbuild",
+    "build": "pnpm prebuild && unbuild",
     "test": "vitest run",
     "prepare": "pnpm run check && pnpm run build"
   },