@google/clasp 3.0.1-alpha1 → 3.0.2-alpha

package/README.md

@@ -118,22 +118,22 @@ There are several template projects on GitHub that show how to transform Typescr
 
 #### Command renames
 
-Clasp 3.x introdces some breaking changes from 2.x. For common use cases these changes should not impact usage, but some lesser used commands have been restructured and renamed to improve consistency.
+Clasp 3.x introduces some breaking changes from 2.x. For common use cases these changes should not impact usage, but some lesser used commands have been restructured and renamed to improve consistency.
 
 | 2.x                        | 3.x                                    |
 |----------------------------|----------------------------------------|
-|open                        | open-script                            |
-|open --web                  | open-web-app                           |
-|open --addon                | open-container                         |
-|open --creds                | open-credentials-setup                 |
-|login --creds <file>        | login -u <name> --creds <file>         |
-|logs --open                 | open-logs                              |
-|logs --setup                | N/A                                    |
-|apis --open                 | open-api-console                       |
-|apis enable <api>           | enable-api <api>                       |
-|apis disable <api>          | disable-api <api>                      |
-|settings                    | N/A                                    |
-|----------------------------|----------------------------------------|
+|`open`                        | `open-script`                        |
+|`open --web`                  | `open-web-app`                       |
+|`open --addon`                | `open-container`                     |
+|`open --creds`                | `open-credentials-setup`             |
+|`login --creds <file>`        | `login -u <name> --creds <file>`     |
+|`logs --open`                 | `open-logs`                          |
+|`logs --setup`                | N/A                                  |
+|`apis --open`                 | `open-api-console`                   |
+|`apis enable <api>`           | `enable-api <api>`                   |
+|`apis disable <api>`          | `disable-api <api>`                  |
+|`deploy -i <id>`              | `update-deployment <id>`             |
+|`settings`                    | N/A                                  |
 
 Other commands have also been renamed but retain aliases for compatibility.
 
@@ -263,14 +263,39 @@ You must [associate Google Script project with Google Cloud Platform](https://gi
 
 Even if you do not set this manually, clasp will ask this via a prompt to you at the required time.
 
-### `fileExtension` (optional)
+### `fileExtension` (deprecated, optional)
 
 Specifies the file extension for **local** script files in your Apps Script project.
 
+### `scriptExtensions` (optional)
+
+Specifies the file extensions for **local** script files in your Apps Script project. May be a string or array of strings. Files matching the extension will be considered scripts files.
+
+When pulling files, the first extension listed is used to write files.
+
+Defaults to `[".js", ".gs"]`
+
+### `htmlExtensions` (optional)
+
+Specifies the file extensions for **local** HTML files in your Apps Script project. May be a string or array of strings. Files matching the extension will be considered HTML files.
+
+When pulling files, the first extension listed is used to write files.
+
+Defaults to `[".html"]`
+
 ### `filePushOrder` (optional)
 
-Specifies the files that should be pushed first, useful for scripts that rely on order of execution. All other files are pushed after this list of files.
+Specifies the files that should be pushed first, useful for scripts that rely on order of execution. All other files are pushed after this list of files, sorted by name.
+
+Note that file paths are relative to directory containing .clasp.json. If `rootDir` is also set, any files listed should include that path as well.
+
+### `skipSubdirectories` (optional)
 
+For backwards compatibility with previous behavior where subdirectories
+are ignored if a `.claspignore` file is not present. Clasp provides default
+ignore rules, making the previous warning and behavior confusing. If you
+need to force clasp to ignore subdirectories and do not want to construct
+a `.claspignore` file, set this option to true.
 
 ## Reference
 
@@ -453,6 +478,19 @@ To update/redeploy an existing deployment, provide the deployment ID.
 - `clasp create-deployment --deploymentId abcd1234` (redeploy and create new version)
 - `clasp create-deployment -V 7 -d "Updates sidebar logo." -i abdc1234`
 
+### Redeploy
+
+Updates an existing deployment. Same as `create-deployment -i id`.
+
+#### Options
+
+- `-V <version>` `--versionNumber <version>`: The project version to deploy at.
+- `-d <description>` `--description <description>`: The deployment description.
+
+#### Examples
+
+- `clasp update-deployment abcd1234` (redeploy and create new version)
+
 ### Undeploy
 
 Undeploys a deployment of a script.

package/build/src/auth/localhost_auth_code_flow.js

@@ -1,8 +1,8 @@
 import { createServer } from 'http';
+import open from 'open';
 import enableDestroy from 'server-destroy';
 import { intl } from '../intl.js';
 import { AuthorizationCodeFlow, parseAuthResponseUrl } from './auth_code_flow.js';
-import open from 'open';
 export class LocalServerAuthorizationCodeFlow extends AuthorizationCodeFlow {
     constructor(oauth2client) {
         super(oauth2client);

package/build/src/commands/create-script.js

@@ -11,7 +11,7 @@ const DRIVE_FILE_MIMETYPES = {
     slides: 'application/vnd.google-apps.presentation',
 };
 export const command = new Command('create-script')
-    .command('create')
+    .alias('create')
     .description('Create a script')
     .option('--type <type>', 'Creates a new Apps Script project attached to a new Document, Spreadsheet, Presentation, Form, or as a standalone script, web app, or API.', 'standalone')
     .option('--title <title>', 'The project title.')
@@ -60,7 +60,7 @@ export const command = new Command('create-script')
         return files;
     });
     files.forEach(f => console.log(`└─ ${f.localPath}`));
-    const successMessage = intl.formatMessage({ id: "Hw9Gqn", defaultMessage: [{ type: 0, value: "Warning: files in subfolder are not accounted for unless you set a .claspignore file. Cloned " }, { type: 6, value: "count", options: { "=0": { value: [{ type: 0, value: "no files." }] }, one: { value: [{ type: 0, value: "one file." }] }, other: { value: [{ type: 7 }, { type: 0, value: " files" }] } }, offset: 0, pluralType: "cardinal" }, { type: 0, value: "." }] }, {
+    const successMessage = intl.formatMessage({ id: "XABSyD", defaultMessage: [{ type: 0, value: "Cloned " }, { type: 6, value: "count", options: { "=0": { value: [{ type: 0, value: "no files." }] }, one: { value: [{ type: 0, value: "one file." }] }, other: { value: [{ type: 7 }, { type: 0, value: " files" }] } }, offset: 0, pluralType: "cardinal" }, { type: 0, value: "." }] }, {
         count: files.length,
     });
     console.log(successMessage);

package/build/src/commands/open-apis.js

@@ -1,4 +1,5 @@
 import { Command } from 'commander';
+import { INCLUDE_USER_HINT_IN_URL } from '../experiments.js';
 import { assertGcpProjectConfigured, maybePromptForProjectId, openUrl } from './utils.js';
 export const command = new Command('open-api-console')
     .description('Open the API console for the current project.')
@@ -6,6 +7,11 @@ export const command = new Command('open-api-console')
     const clasp = this.opts().clasp;
     const projectId = await maybePromptForProjectId(clasp);
     assertGcpProjectConfigured(clasp);
-    const url = `https://console.developers.google.com/apis/dashboard?project=${projectId}`;
-    await openUrl(url);
+    const url = new URL('https://console.developers.google.com/apis/dashboard');
+    url.searchParams.set('project', projectId !== null && projectId !== void 0 ? projectId : '');
+    if (INCLUDE_USER_HINT_IN_URL) {
+        const userHint = await clasp.authorizedUser();
+        url.searchParams.set('authUser', userHint !== null && userHint !== void 0 ? userHint : '');
+    }
+    await openUrl(url.toString());
 });

package/build/src/commands/open-container.js

@@ -1,4 +1,5 @@
 import { Command } from 'commander';
+import { INCLUDE_USER_HINT_IN_URL } from '../experiments.js';
 import { intl } from '../intl.js';
 import { openUrl } from './utils.js';
 export const command = new Command('open-container')
@@ -10,6 +11,11 @@ export const command = new Command('open-container')
         const msg = intl.formatMessage({ id: "eXBzoP", defaultMessage: [{ type: 0, value: "Parent ID not set, unable to open document." }] });
         this.error(msg);
     }
-    const url = `https://drive.google.com/open?id=${parentId}`;
-    await openUrl(url);
+    const url = new URL('https://drive.google.com/open');
+    url.searchParams.set('id', parentId);
+    if (INCLUDE_USER_HINT_IN_URL) {
+        const userHint = await clasp.authorizedUser();
+        url.searchParams.set('authUser', userHint !== null && userHint !== void 0 ? userHint : '');
+    }
+    await openUrl(url.toString());
 });

package/build/src/commands/open-credentials.js

@@ -1,4 +1,5 @@
 import { Command } from 'commander';
+import { INCLUDE_USER_HINT_IN_URL } from '../experiments.js';
 import { assertGcpProjectConfigured, maybePromptForProjectId, openUrl } from './utils.js';
 export const command = new Command('open-credentials-setup')
     .description("Open credentials page for the script's GCP project")
@@ -6,6 +7,11 @@ export const command = new Command('open-credentials-setup')
     const clasp = this.opts().clasp;
     const projectId = await maybePromptForProjectId(clasp);
     assertGcpProjectConfigured(clasp);
-    const url = `https://console.developers.google.com/apis/credentials?project=${projectId}`;
-    await openUrl(url);
+    const url = new URL('https://console.developers.google.com/apis/credentials');
+    url.searchParams.set('project', projectId !== null && projectId !== void 0 ? projectId : '');
+    if (INCLUDE_USER_HINT_IN_URL) {
+        const userHint = await clasp.authorizedUser();
+        url.searchParams.set('authUser', userHint !== null && userHint !== void 0 ? userHint : '');
+    }
+    await openUrl(url.toString());
 });

package/build/src/commands/open-logs.js

@@ -1,4 +1,5 @@
 import { Command } from 'commander';
+import { INCLUDE_USER_HINT_IN_URL } from '../experiments.js';
 import { assertGcpProjectConfigured, maybePromptForProjectId, openUrl } from './utils.js';
 export const command = new Command('open-logs')
     .description('Open logs in the developer console')
@@ -6,6 +7,12 @@ export const command = new Command('open-logs')
     const clasp = this.opts().clasp;
     const projectId = await maybePromptForProjectId(clasp);
     assertGcpProjectConfigured(clasp);
-    const url = `https://console.cloud.google.com/logs/viewer?project=${projectId}&resource=app_script_function`;
-    await openUrl(url);
+    const url = new URL('https://console.cloud.google.com/logs/viewer');
+    url.searchParams.set('project', projectId !== null && projectId !== void 0 ? projectId : '');
+    url.searchParams.set('resource', 'app_script_function');
+    if (INCLUDE_USER_HINT_IN_URL) {
+        const userHint = await clasp.authorizedUser();
+        url.searchParams.set('authUser', userHint !== null && userHint !== void 0 ? userHint : '');
+    }
+    await openUrl(url.toString());
 });

package/build/src/commands/open-script.js

@@ -1,4 +1,5 @@
 import { Command } from 'commander';
+import { INCLUDE_USER_HINT_IN_URL } from '../experiments.js';
 import { intl } from '../intl.js';
 import { openUrl } from './utils.js';
 export const command = new Command('open-script')
@@ -13,6 +14,10 @@ export const command = new Command('open-script')
         const msg = intl.formatMessage({ id: "RXEA+0", defaultMessage: [{ type: 0, value: "Script ID not set, unable to open IDE." }] });
         this.error(msg);
     }
-    const url = `https://script.google.com/d/${scriptId}/edit`;
-    await openUrl(url);
+    const url = new URL(`https://script.google.com/d/${scriptId}/edit`);
+    if (INCLUDE_USER_HINT_IN_URL) {
+        const userHint = await clasp.authorizedUser();
+        url.searchParams.set('authUser', userHint !== null && userHint !== void 0 ? userHint : '');
+    }
+    await openUrl(url.toString());
 });

package/build/src/commands/open-webapp.js

@@ -1,5 +1,6 @@
 import { Command } from 'commander';
 import inquirer from 'inquirer';
+import { INCLUDE_USER_HINT_IN_URL } from '../experiments.js';
 import { intl } from '../intl.js';
 import { ellipsize, isInteractive, openUrl } from './utils.js';
 export const command = new Command('open-web-app')
@@ -39,7 +40,7 @@ export const command = new Command('open-web-app')
         deploymentId = answer.deployment;
     }
     if (!deploymentId) {
-        const msg = intl.formatMessage({ id: "j847fH", defaultMessage: [{ type: 0, value: "Deployment ID is requrired." }] });
+        const msg = intl.formatMessage({ id: "VJZ9X5", defaultMessage: [{ type: 0, value: "Deployment ID is required." }] });
         this.error(msg);
     }
     const entryPoints = (_a = (await clasp.project.entryPoints(deploymentId))) !== null && _a !== void 0 ? _a : [];
@@ -51,6 +52,10 @@ export const command = new Command('open-web-app')
         const msg = intl.formatMessage({ id: "Kfeimc", defaultMessage: [{ type: 0, value: "No web app entry point found." }] });
         this.error(msg);
     }
-    const url = webAppEntry.webApp.url;
-    await openUrl(url);
+    const url = new URL(webAppEntry.webApp.url);
+    if (INCLUDE_USER_HINT_IN_URL) {
+        const userHint = await clasp.authorizedUser();
+        url.searchParams.set('authUser', userHint !== null && userHint !== void 0 ? userHint : '');
+    }
+    await openUrl(url.toString());
 });

package/build/src/commands/push.js

@@ -18,6 +18,7 @@ export const command = new Command('push')
             if (!force) {
                 const msg = intl.formatMessage({ id: "TItFfu", defaultMessage: [{ type: 0, value: "Skipping push." }] });
                 console.log(msg);
+                return;
             }
         }
         const spinnerMsg = intl.formatMessage({ id: "qUq++d", defaultMessage: [{ type: 0, value: "Pushing files..." }] });

package/build/src/commands/run-function.js

@@ -39,7 +39,7 @@ export const command = new Command('run-function')
             console.error(`${chalk.red(msg)}`, errorMessage, scriptStackTraceElements || []);
             return;
         }
-        if (response && response.result) {
+        if (response && response.result !== undefined) {
             console.log(response.result);
         }
         else {

package/build/src/commands/tail-logs.js

@@ -41,6 +41,7 @@ export const command = new Command('tail-logs')
         await maybePromptForProjectId(clasp);
     }
     assertGcpProjectConfigured(clasp);
+    console.log('PAST', clasp.project.projectId);
     await fetchAndPrintLogs();
     if (watch) {
         const POLL_INTERVAL = 6000; // 6s
@@ -62,6 +63,9 @@ function formatEntry(entry, options) {
     if (!resource) {
         return undefined;
     }
+    if (!timestamp) {
+        return undefined;
+    }
     let functionName = (_b = (_a = resource.labels) === null || _a === void 0 ? void 0 : _a['function_name']) !== null && _b !== void 0 ? _b : 'N/A';
     let payloadData = '';
     if (options.json) {
@@ -85,8 +89,18 @@ function formatEntry(entry, options) {
     const coloredSeverity = `${severityColor[severity](severity) || severity}`.padEnd(20);
     functionName = functionName.padEnd(15);
     payloadData = payloadData.padEnd(20);
+    const localizedTime = getLocalISODateTime(new Date(timestamp));
     if (options.simplified) {
         return `${coloredSeverity} ${functionName} ${payloadData}`;
     }
-    return `${coloredSeverity} ${timestamp} ${functionName} ${payloadData}`;
+    return `${coloredSeverity} ${localizedTime} ${functionName} ${payloadData}`;
+}
+function getLocalISODateTime(date) {
+    const year = date.getFullYear();
+    const month = String(date.getMonth() + 1).padStart(2, '0');
+    const day = String(date.getDate()).padStart(2, '0');
+    const hours = String(date.getHours()).padStart(2, '0');
+    const minutes = String(date.getMinutes()).padStart(2, '0');
+    const seconds = String(date.getSeconds()).padStart(2, '0');
+    return `${year}-${month}-${day}T${hours}:${minutes}:${seconds}`;
 }

package/build/src/commands/update-deployment.js

@@ -0,0 +1,36 @@
+import { Command } from 'commander';
+import { intl } from '../intl.js';
+import { withSpinner } from './utils.js';
+export const command = new Command('update-deployment')
+    .alias('redeploy')
+    .argument('<deploymentId>')
+    .description('Updates a deployment for a project to a new version')
+    .option('-V, --versionNumber <version>', 'The project version')
+    .option('-d, --description <description>', 'The deployment description')
+    .action(async function (deploymentId, options) {
+    var _a, _b, _c;
+    const clasp = this.opts().clasp;
+    const description = (_a = options.description) !== null && _a !== void 0 ? _a : '';
+    const versionNumber = options.versionNumber ? Number(options.versionNumber) : undefined;
+    if (!deploymentId) {
+        const msg = intl.formatMessage({ id: "OXJvuR", defaultMessage: [{ type: 0, value: "Deployment ID is required to redeploy." }] });
+        this.error(msg);
+    }
+    try {
+        const spinnerMsg = intl.formatMessage({ id: "oL8t7p", defaultMessage: [{ type: 0, value: "Deploying project..." }] });
+        const deployment = await withSpinner(spinnerMsg, async () => {
+            return await clasp.project.deploy(description, deploymentId, versionNumber);
+        });
+        const successMessage = intl.formatMessage({ id: "wWBE7L", defaultMessage: [{ type: 0, value: "Redeployed " }, { type: 1, value: "deploymentId" }, { type: 0, value: " " }, { type: 5, value: "version", options: { undefined: { value: [{ type: 0, value: "@HEAD" }] }, other: { value: [{ type: 0, value: "@" }, { type: 1, value: "version" }] } } }] }, {
+            deploymentId: deployment.deploymentId,
+            version: (_b = deployment.deploymentConfig) === null || _b === void 0 ? void 0 : _b.versionNumber,
+        });
+        console.log(successMessage);
+    }
+    catch (error) {
+        if (((_c = error.cause) === null || _c === void 0 ? void 0 : _c.code) === 'INVALID_ARGUMENT') {
+            this.error(error.cause.message);
+        }
+        throw error;
+    }
+});

package/build/src/commands/utils.js

@@ -3,14 +3,14 @@ import inquirer from 'inquirer';
 import open from 'open';
 import ora from 'ora';
 import { intl } from '../intl.js';
-export async function assertScriptConfigured(clasp) {
+export function assertScriptConfigured(clasp) {
     if (clasp.project.scriptId) {
         return;
     }
     const msg = intl.formatMessage({ id: "2IuvqO", defaultMessage: [{ type: 0, value: "Script ID is not set, unable to continue." }] });
     throw new Error(msg);
 }
-export async function assertGcpProjectConfigured(clasp) {
+export function assertGcpProjectConfigured(clasp) {
     if (clasp.project.projectId) {
         return;
     }
@@ -61,13 +61,14 @@ export function ellipsize(value, length) {
 }
 // Exporting and wrapping to allow it to be toggled in tests
 export const claspEnv = {
-    isInteractive: process.stdout.isTTY
+    isInteractive: process.stdout.isTTY,
+    isBrowserPresent: process.stdout.isTTY,
 };
 export function isInteractive() {
     return claspEnv.isInteractive;
 }
 export async function openUrl(url) {
-    if (!isInteractive()) {
+    if (!claspEnv.isBrowserPresent) {
         const msg = intl.formatMessage({ id: "kvR0OI", defaultMessage: [{ type: 0, value: "Open " }, { type: 1, value: "url" }, { type: 0, value: " in your browser to continue." }] }, {
             url,
         });

package/build/src/core/clasp.js

@@ -4,11 +4,13 @@ import { findUpSync } from 'find-up';
 import fs from 'fs/promises';
 import splitLines from 'split-lines';
 import stripBom from 'strip-bom';
+import { getUserInfo } from '../auth/auth.js';
 import { Files } from './files.js';
 import { Functions } from './functions.js';
 import { Logs } from './logs.js';
 import { Project } from './project.js';
 import { Services } from './services.js';
+import { ensureStringArray } from './utils.js';
 const debug = Debug('clasp:core');
 const DEFAULT_CLASP_IGNORE = [
     '**/**',
@@ -30,6 +32,19 @@ export class Clasp {
         this.logs = new Logs(options);
         this.functions = new Functions(options);
     }
+    async authorizedUser() {
+        if (!this.options.credentials) {
+            return undefined;
+        }
+        try {
+            const user = await getUserInfo(this.options.credentials);
+            return user === null || user === void 0 ? void 0 : user.id;
+        }
+        catch (err) {
+            debug('Unable to fetch user info, %O', err);
+        }
+        return undefined;
+    }
     withScriptId(scriptId) {
         if (this.options.project) {
             throw new Error('Science project already set, create new instance instead');
@@ -65,7 +80,8 @@ export async function initClaspInstance(options) {
                 ignoreFilePath: ignoreFile,
                 ignorePatterns: ignoreRules,
                 filePushOrder: [],
-                fileExtension: 'js',
+                skipSubdirectories: false,
+                fileExtensions: readFileExtensions({}),
             },
         });
     }
@@ -74,7 +90,7 @@ export async function initClaspInstance(options) {
     const ignoreRules = await loadIgnoreFileOrDefaults(ignoreFile);
     const content = await fs.readFile(projectRoot.configPath, { encoding: 'utf8' });
     const config = JSON.parse(content);
-    const fileExtension = config.fileExtension || 'js';
+    const fileExtensions = readFileExtensions(config);
     const filePushOrder = config.filePushOrder || [];
     const contentDir = path.resolve(projectRoot.rootDir, config.srcDir || config.rootDir || '.');
     return new Clasp({
@@ -86,7 +102,8 @@ export async function initClaspInstance(options) {
             ignoreFilePath: ignoreFile,
             ignorePatterns: ignoreRules,
             filePushOrder: filePushOrder,
-            fileExtension: fileExtension,
+            fileExtensions: fileExtensions,
+            skipSubdirectories: config.ignoreSubdirectories,
         },
         project: {
             scriptId: config.scriptId,
@@ -95,6 +112,36 @@ export async function initClaspInstance(options) {
         },
     });
 }
+function readFileExtensions(config) {
+    let scriptExtensions = ['js', 'gs'];
+    let htmlExtensions = ['html'];
+    let jsonExtensions = ['json'];
+    if (config === null || config === void 0 ? void 0 : config.fileExtension) {
+        // legacy fileExtension setting
+        scriptExtensions = [config.fileExtension];
+    }
+    if (config === null || config === void 0 ? void 0 : config.scriptExtensions) {
+        scriptExtensions = ensureStringArray(config.scriptExtensions);
+    }
+    if (config === null || config === void 0 ? void 0 : config.htmlExtensions) {
+        htmlExtensions = ensureStringArray(config.htmlExtensions);
+    }
+    if (config === null || config === void 0 ? void 0 : config.jsonExtensions) {
+        jsonExtensions = ensureStringArray(config.jsonExtensions);
+    }
+    const fixupExtension = (ext) => {
+        ext = ext.toLowerCase().trim();
+        if (!ext.startsWith('.')) {
+            ext = `.${ext}`;
+        }
+        return ext;
+    };
+    return {
+        SERVER_JS: scriptExtensions.map(fixupExtension),
+        HTML: htmlExtensions.map(fixupExtension),
+        JSON: jsonExtensions.map(fixupExtension),
+    };
+}
 async function findProjectRootdDir(configFilePath) {
     debug('Searching for project root');
     if (configFilePath) {

package/build/src/core/files.js

@@ -59,28 +59,36 @@ function createFilenameConflictChecker() {
         return file;
     };
 }
-function getFileType(fileName) {
-    const extension = path.extname(fileName).toUpperCase();
-    if (['.GS', '.JS'].includes(extension)) {
+function getFileType(fileName, fileExtensions) {
+    var _a, _b, _c;
+    const originalExtension = path.extname(fileName);
+    const extension = originalExtension.toLowerCase();
+    if ((_a = fileExtensions['SERVER_JS']) === null || _a === void 0 ? void 0 : _a.includes(extension)) {
         return 'SERVER_JS';
     }
-    if (extension === '.JSON' && path.basename(fileName) === 'appsscript.json') {
-        return 'JSON';
-    }
-    if (extension === '.HTML') {
+    if ((_b = fileExtensions['HTML']) === null || _b === void 0 ? void 0 : _b.includes(extension)) {
         return 'HTML';
     }
+    if (((_c = fileExtensions['JSON']) === null || _c === void 0 ? void 0 : _c.includes(extension)) && path.basename(fileName, originalExtension) === 'appsscript') {
+        return 'JSON';
+    }
     return undefined;
 }
-function getFileExtension(type) {
+function getFileExtension(type, fileExtensions) {
     // TODO - Include project setting override
+    const extensionFor = (type, defaultValue) => {
+        if (fileExtensions[type] && fileExtensions[type][0]) {
+            return fileExtensions[type][0];
+        }
+        return defaultValue;
+    };
     switch (type) {
         case 'SERVER_JS':
-            return 'js';
+            return extensionFor('SERVER_JS', '.js');
         case 'JSON':
-            return 'json';
+            return extensionFor('JSON', '.json');
         case 'HTML':
-            return 'html';
+            return extensionFor('HTML', '.html');
         default:
             throw new Error('Invalid file type', {
                 cause: {
@@ -119,15 +127,16 @@ export class Files {
         const contentDir = this.options.files.contentDir;
         const scriptId = this.options.project.scriptId;
         const script = google.script({ version: 'v1', auth: credentials });
+        const fileExtensionMap = this.options.files.fileExtensions;
         try {
             const requestOptions = { scriptId, versionNumber };
-            debug('Fetchign script content, request %o', requestOptions);
+            debug('Fetching script content, request %o', requestOptions);
             const response = await script.projects.getContent(requestOptions);
             const files = (_a = response.data.files) !== null && _a !== void 0 ? _a : [];
             return files.map(f => {
                 var _a, _b, _c;
-                const ext = getFileExtension(f.type);
-                const localPath = path.relative(process.cwd(), path.resolve(contentDir, `${f.name}.${ext}`));
+                const ext = getFileExtension(f.type, fileExtensionMap);
+                const localPath = path.relative(process.cwd(), path.resolve(contentDir, `${f.name}${ext}`));
                 const file = {
                     localPath: localPath,
                     remotePath: (_a = f.name) !== null && _a !== void 0 ? _a : undefined,
@@ -148,17 +157,18 @@ export class Files {
         assertScriptConfigured(this.options);
         const contentDir = this.options.files.contentDir;
         const ignorePatterns = (_a = this.options.files.ignorePatterns) !== null && _a !== void 0 ? _a : [];
-        const recursive = this.options.files.ignoreFilePath !== undefined;
+        const recursive = !this.options.files.skipSubdirectories;
         // Read all filenames as a flattened tree
         // Note: filePaths contain relative paths such as "test/bar.ts", "../../src/foo.js"
-        const filelist = await getLocalFiles(contentDir, ignorePatterns, recursive);
+        const filelist = Array.from(await getLocalFiles(contentDir, ignorePatterns, recursive));
         const checkDuplicate = createFilenameConflictChecker();
+        const fileExtensionMap = this.options.files.fileExtensions;
         const files = await Promise.all(filelist.map(async (filename) => {
             const localPath = path.relative(process.cwd(), path.join(contentDir, filename));
             const resolvedPath = path.relative(contentDir, localPath);
             const parsedPath = path.parse(resolvedPath);
             let remotePath = path.format({ dir: normalizePath(parsedPath.dir), name: parsedPath.name });
-            const type = getFileType(localPath);
+            const type = getFileType(localPath, fileExtensionMap);
             if (!type) {
                 debug('Ignoring unsupported file %s', localPath);
                 return undefined;
@@ -309,6 +319,16 @@ export class Files {
             handleApiError(error);
         }
     }
+    checkMissingFilesFromPushOrder(pushedFiles) {
+        var _a;
+        const missingFiles = [];
+        for (const path of (_a = this.options.files.filePushOrder) !== null && _a !== void 0 ? _a : []) {
+            const wasPushed = pushedFiles.find(f => f.localPath === path);
+            if (!wasPushed) {
+                missingFiles.push(path);
+            }
+        }
+    }
     async pull(version) {
         debug('Pulling files');
         assertAuthenticated(this.options);

package/build/src/core/project.js

@@ -286,8 +286,11 @@ export class Project {
             scriptId: this.options.project.scriptId,
             rootDir: srcDir,
             projectId: this.options.project.projectId,
-            fileExtension: this.options.files.fileExtension,
+            scriptExtensions: this.options.files.fileExtensions['SERVER_JS'],
+            htmlExtensions: this.options.files.fileExtensions['HTML'],
+            jsonExtensions: this.options.files.fileExtensions['JSON'],
             filePushOrder: [],
+            skipSubdirectories: this.options.files.skipSubdirectories,
         };
         await fs.writeFile(this.options.configFilePath, JSON.stringify(settings, null, 2));
     }

package/build/src/core/utils.js

@@ -100,7 +100,7 @@ export function handleApiError(error) {
         throw new Error('Unexpected error', {
             cause: {
                 code: 'UNEPECTED_ERROR',
-                message: String(error),
+                message: new String(error),
                 error: error,
             },
         });
@@ -119,3 +119,26 @@ export function handleApiError(error) {
         },
     });
 }
+export function ensureStringArray(value) {
+    if (typeof value === 'string') {
+        return [value];
+    }
+    else if (Array.isArray(value)) {
+        // Ensure all elements in the array are strings.
+        if (value.every(item => typeof item === 'string')) {
+            return value;
+        }
+        else {
+            // Handle cases where the array contains non-string elements.
+            // You could throw an error, filter out non-strings, or convert them to strings.
+            // Example: filter out non-strings
+            return value.filter(item => typeof item === 'string');
+        }
+    }
+    else {
+        // Handle cases where the value is neither a string nor an array of strings.
+        // You could throw an error or return an empty array.
+        // Example: return an empty array
+        return [];
+    }
+}

package/build/src/experiments.js

@@ -0,0 +1,16 @@
+export function isEnabled(experimentName, defaultValue = false) {
+    const envVarName = `CLASP_${experimentName.toUpperCase()}`;
+    const envVarValue = process.env[envVarName];
+    if (envVarValue === undefined || envVarValue === null) {
+        return defaultValue;
+    }
+    if (envVarValue.toLowerCase() === 'true' || envVarValue === '1') {
+        return true;
+    }
+    if (envVarValue.toLowerCase() === 'false' || envVarValue === '0') {
+        return false;
+    }
+    // If it's not a boolean, return the raw string value (for string experiments)
+    return envVarValue;
+}
+export const INCLUDE_USER_HINT_IN_URL = isEnabled('enable_user_hints');

package/build/src/index.js

@@ -22,6 +22,8 @@ import Debug from 'debug';
 import loudRejection from 'loud-rejection';
 import { makeProgram } from './commands/program.js';
 const debug = Debug('clasp:cli');
+// Suppress warnings about punycode and other issues caused by dependencies
+process.removeAllListeners('warning');
 // Ensure any unhandled exception won't go unnoticed
 loudRejection();
 const program = makeProgram();

package/build/src/intl.js

@@ -25,10 +25,12 @@ function loadMessages(_locale) {
 }
 const cache = createIntlCache();
 const locale = getLocale();
+const localTimeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
 debug('Using locale: %s', locale);
 export const intl = createIntl({
     // Locale of the application
     locale,
+    timeZone: localTimeZone,
     defaultLocale: 'en',
     messages: loadMessages(locale),
 }, cache);

package/docs/run.md

@@ -7,8 +7,8 @@
 To use `clasp run`, you need to complete 5 steps:
 
 - Set up the **Project ID** in your `.clasp.json` if missing.
-- Create an **OAuth Client ID** (Other). Download as `creds.json`.
-- `clasp login --creds creds.json` with this downloaded file.
+- Create an **OAuth Client ID** of type `Desktop Application`. Download as `client_secret.json`.
+- `clasp login --creds client_secret.json` with this downloaded file.
 - Add the following to `appsscript.json`:
   ```json
   "executionApi": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@google/clasp",
-  "version": "3.0.1-alpha1",
+  "version": "3.0.2-alpha",
   "description": "Develop Apps Script Projects locally",
   "type": "module",
   "exports": "./build/src/index.js",
@@ -21,8 +21,8 @@
     "watch": "tspc --project tsconfig.json --watch",
     "prepare": "npm run compile",
     "lint": "npm run check",
-    "test": "nyc mocha",
-    "coverage": "nyc --cache false report --reporter=text-lcov | coveralls",
+    "test": "mocha",
+    "test:coverage": "c8 mocha",
     "prettier": "biome format src test --write",
     "check": "biome check src test && npm run compile",
     "clean": "rm -rf build",
@@ -39,21 +39,6 @@
     ],
     "outfile": "src/messages/messages.js"
   },
-  "nyc": {
-    "extends": "@istanbuljs/nyc-config-typescript",
-    "include": [
-      "src/**/*.ts"
-    ],
-    "extension": [
-      ".ts"
-    ],
-    "reporter": [
-      "text-summary",
-      "html"
-    ],
-    "sourceMap": true,
-    "instrument": true
-  },
   "repository": {
     "type": "git",
     "url": "https://github.com/google/clasp"
@@ -130,10 +115,10 @@
     "@types/sinon": "^17.0.4",
     "@types/tmp": "^0.2.6",
     "@types/wtfnode": "^0.7.3",
+    "c8": "^10.1.3",
     "chai": "^5.1.2",
     "chai-as-promised": "^8.0.1",
     "chai-subset": "^1.6.0",
-    "coveralls": "^3.1.1",
     "mocha": "^11.1.0",
     "mock-fs": "^5.4.1",
     "nock": "^14.0.0",