@google/clasp 2.4.0 → 2.4.2

package/build/src/utils.js

@@ -10,7 +10,7 @@ import { Conf } from './conf.js';
 import { DOTFILE } from './dotfile.js';
 import { projectIdPrompt } from './inquirer.js';
 import { ERROR, LOG } from './messages.js';
-const { auth } = Conf.get();
+const config = Conf.get();
 /**
  * Returns input string with uppercased first character
  */
@@ -21,17 +21,10 @@ const capitalize = (value) => value && value[0].toUpperCase() + value.slice(1);
  * @return {boolean}
  */
 export const hasOauthClientSettings = (local = false) => {
-    let previousPath;
-    if (local && auth.isDefault()) {
-        // if no local auth defined, try current directory
-        previousPath = auth.path;
-        auth.path = '.';
+    if (local) {
+        return config.authLocal !== undefined && fs.existsSync(config.authLocal);
     }
-    const result = (local ? !auth.isDefault() : auth.isDefault()) && fs.existsSync(auth.resolve());
-    if (previousPath) {
-        auth.path = previousPath;
-    }
-    return result;
+    return config.auth !== undefined && fs.existsSync(config.auth);
 };
 /**
  * Gets the OAuth client settings from rc file.
@@ -43,7 +36,7 @@ export const getOAuthSettings = async (local) => {
     var _a;
     try {
         const result = DOTFILE.AUTH(local).read();
-        return result;
+        return await result;
     }
     catch (error) {
         throw new ClaspError((_a = getErrorMessage(error)) !== null && _a !== void 0 ? _a : ERROR.NO_CREDENTIALS(local));
@@ -63,20 +56,20 @@ export const getErrorMessage = (value) => {
     if (value && typeof value.error === 'string') {
         return JSON.parse(value.error).error;
     }
-    else if ((value === null || value === void 0 ? void 0 : value.statusCode) === 401 || ((value === null || value === void 0 ? void 0 : value.error) && value.error.error && value.error.error.code === 401)) {
+    if ((value === null || value === void 0 ? void 0 : value.statusCode) === 401 || ((value === null || value === void 0 ? void 0 : value.error) && value.error.error && value.error.error.code === 401)) {
         // TODO check if local creds exist:
         //  localOathSettingsExist() ? ERROR.UNAUTHENTICATED : ERROR.UNAUTHENTICATED_LOCAL
         return ERROR.UNAUTHENTICATED;
     }
-    else if (value && ((value.error && value.error.code === 403) || value.code === 403)) {
+    if (value && ((value.error && value.error.code === 403) || value.code === 403)) {
         // TODO check if local creds exist:
         //  localOathSettingsExist() ? ERROR.PERMISSION_DENIED : ERROR.PERMISSION_DENIED_LOCAL
         return ERROR.PERMISSION_DENIED;
     }
-    else if (value && value.code === 429) {
+    if (value && value.code === 429) {
         return ERROR.RATE_LIMIT;
     }
-    else if (value === null || value === void 0 ? void 0 : value.error) {
+    if (value === null || value === void 0 ? void 0 : value.error) {
         return `~~ API ERROR (${value.statusCode || value.error.code})=\n${value.error}`;
     }
     return undefined;
@@ -89,19 +82,19 @@ export const getErrorMessage = (value) => {
  * @return {string}          The URL of the web application in the online script editor.
  */
 export const getWebApplicationURL = (value) => {
-    var _a;
+    var _a, _b;
     const { entryPoints = [] } = value;
     const entryPoint = entryPoints.find((entryPoint) => entryPoint.entryPointType === 'WEB_APP');
     if (entryPoint) {
-        return entryPoint.webApp && entryPoint.webApp.url;
+        return (_a = entryPoint.webApp) === null || _a === void 0 ? void 0 : _a.url;
     }
-    throw new ClaspError(ERROR.NO_WEBAPP((_a = value.deploymentId) !== null && _a !== void 0 ? _a : ''));
+    throw new ClaspError(ERROR.NO_WEBAPP((_b = value.deploymentId) !== null && _b !== void 0 ? _b : ''));
 };
 /**
  * Gets default project name.
  * @return {string} default project name.
  */
-export const getDefaultProjectName = () => capitalize(path.basename(process.cwd()));
+export const getDefaultProjectName = () => capitalize(path.basename(config.projectRootDirectory));
 /**
  * Gets the project settings from the project dotfile.
  *
@@ -113,7 +106,7 @@ export const getDefaultProjectName = () => capitalize(path.basename(process.cwd(
 export const getProjectSettings = async () => {
     const dotfile = DOTFILE.PROJECT();
     try {
-        if (dotfile.exists()) {
+        if (await dotfile.exists()) {
             // Found a dotfile, but does it have the settings, or is it corrupted?
             try {
                 const settings = await dotfile.read();
@@ -123,10 +116,10 @@ export const getProjectSettings = async () => {
                 }
             }
             catch (error) {
-                throw new ClaspError(ERROR.SETTINGS_DNE); // Never found a dotfile
+                throw new ClaspError(ERROR.SETTINGS_DNE()); // Never found a dotfile
             }
         }
-        throw new ClaspError(ERROR.SETTINGS_DNE); // Never found a dotfile
+        throw new ClaspError(ERROR.SETTINGS_DNE()); // Never found a dotfile
     }
     catch (error) {
         if (error instanceof ClaspError) {
@@ -210,6 +203,7 @@ export const getProjectId = async (promptUser = true) => {
         if (error instanceof ClaspError) {
             throw error;
         }
+        // TODO: better error handling
         throw new ClaspError(error.message);
     }
 };

package/build/src/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"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"}

package/docs/esmodules.md

@@ -12,9 +12,9 @@ import { nodeResolve } from "@rollup/plugin-node-resolve";
 
 const extensions = [".ts", ".js"];
 
-const preventThreeShakingPlugin = () => {
+const preventTreeShakingPlugin = () => {
     return {
-      name: 'no-threeshaking',
+      name: 'no-treeshaking',
       resolveId(id, importer) {
         if (!importer) {
             // let's not theeshake entry points, as we're not exporting anything in Apps Script files
@@ -32,7 +32,7 @@ export default {
     format: "esm",
   },
   plugins: [
-    preventThreeShakingPlugin(),
+    preventTreeShakingPlugin(),
     nodeResolve({
       extensions,
     }),
@@ -78,4 +78,4 @@ node_modules/**
 
 Now you can push using your normal `clasp push`-command!
 
-This should be enough to start developing a project using ES Modules. A complete example repo can be cloned from [atti187/esmodules](https://github.com/atti187/esmodules).
+This should be enough to start developing a project using ES Modules. A complete example repo can be cloned from [atti187/esmodules](https://github.com/atti187/esmodules).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@google/clasp",
-  "version": "2.4.0",
+  "version": "2.4.2",
   "description": "Develop Apps Script Projects locally",
   "type": "module",
   "exports": "./build/src/index.js",
@@ -60,17 +60,19 @@
   "author": "Grant Timmerman",
   "license": "Apache-2.0",
   "dependencies": {
-    "chalk": "^4.1.1",
-    "chokidar": "^3.5.1",
-    "cli-truncate": "^2.1.0",
-    "commander": "^7.2.0",
+    "@sindresorhus/is": "^4.0.1",
+    "chalk": "^4.1.2",
+    "chokidar": "^3.5.2",
+    "cli-truncate": "^3.0.0",
+    "commander": "^8.1.0",
     "debounce": "^1.2.1",
-    "dotf": "^2.0.0",
+    "dotf": "^2.0.2",
+    "find-up": "^6.0.0",
     "fs-extra": "^10.0.0",
     "fuzzy": "^0.1.3",
-    "google-auth-library": "^7.1.2",
-    "googleapis": "^76.0.0",
-    "inquirer": "^8.1.0",
+    "google-auth-library": "^7.6.2",
+    "googleapis": "^84.0.0",
+    "inquirer": "^8.1.2",
     "inquirer-autocomplete-prompt-ipt": "^2.0.0",
     "is-reachable": "^5.0.0",
     "log-symbols": "^5.0.0",
@@ -78,34 +80,35 @@
     "make-dir": "^3.1.0",
     "multimatch": "^5.0.0",
     "normalize-newline": "^4.1.0",
-    "open": "^8.2.0",
-    "ora": "^5.4.1",
-    "p-map": "^5.0.0",
+    "open": "^8.2.1",
+    "ora": "^6.0.0",
+    "p-map": "^5.1.0",
     "read-pkg-up": "^8.0.0",
     "recursive-readdir": "^2.2.2",
+    "server-destroy": "^1.0.1",
     "split-lines": "^3.0.0",
     "strip-bom": "^5.0.0",
-    "ts2gas": "^4.0.0",
-    "typescript": "^4.3.2",
-    "wtfnode": "^0.8.4"
+    "ts2gas": "^4.2.0",
+    "typescript": "^4.4.2"
   },
   "devDependencies": {
-    "@types/chai": "^4.2.18",
+    "@types/chai": "^4.2.21",
     "@types/debounce": "^1.2.0",
-    "@types/fs-extra": "^9.0.11",
-    "@types/inquirer": "^7.3.1",
-    "@types/mocha": "^8.2.2",
-    "@types/node": "^12.20.15",
+    "@types/fs-extra": "^9.0.12",
+    "@types/inquirer": "^7.3.3",
+    "@types/mocha": "^9.0.0",
+    "@types/node": "^12.20.21",
     "@types/recursive-readdir": "^2.2.0",
-    "@types/tmp": "^0.2.0",
+    "@types/server-destroy": "^1.0.1",
+    "@types/tmp": "^0.2.1",
     "@types/wtfnode": "^0.7.0",
     "chai": "^4.3.4",
-    "coveralls": "^3.1.0",
+    "coveralls": "^3.1.1",
     "gts": "^3.1.0",
-    "mocha": "^9.0.0",
+    "mocha": "^9.1.1",
     "nyc": "^15.1.0",
-    "prettier": "^2.3.1",
+    "prettier": "^2.3.2",
     "tmp": "^0.2.1",
-    "type-fest": "^1.2.0"
+    "type-fest": "^2.1.0"
   }
 }

package/build/src/path-proxy.d.ts

@@ -1,53 +0,0 @@
-/// <reference types="node" />
-import path from 'path';
-/** A path broken down into a `dir`ectory and a `base` filename */
-declare type BrokenPath = Pick<path.ParsedPath, 'dir' | 'base'>;
-export declare class PathProxy {
-    protected _default: BrokenPath;
-    protected _userDefined: string | undefined;
-    /**
-     * Handles a path to a file.
-     *
-     * - Constructor requires a default path (directory and filename)
-     * - Path can be overridden with the `path` accessor.
-     * - The `resolve()` method implements specific rules to define the effective path to the proxied file.
-     *
-     * @param {BrokenPath} defaultPath default path
-     */
-    constructor(defaultPath: BrokenPath);
-    /**
-     * Returns the current (raw and unresolved) defined path to the proxied file.
-     *
-     * *Note: for most uses, prefer the `resolve()` method in order to retreive a file's path*
-     *
-     * @returns {string}
-     */
-    get path(): string;
-    /**
-     * Sets the current (raw and unresolved) path to the proxied file.
-     *
-     * *Note: passing an empty string restores the default path*
-     */
-    set path(userDefined: string);
-    /**
-     * Returns true if current path is the default.
-     *
-     * @returns {boolean}
-     */
-    isDefault(): boolean;
-    /**
-     * Returns the resolved directory to the proxied file.
-     *
-     * *Note: for most uses, prefer the `.resolve()` method in order to retreive a file's path*
-     *
-     * @returns {string}
-     */
-    get resolvedDir(): string;
-    /**
-     * Resolves the current active path
-     *
-     * @returns {string}
-     */
-    resolve(): string;
-}
-export {};

package/build/src/path-proxy.js

@@ -1,112 +0,0 @@
-import fs from 'fs-extra';
-import path from 'path';
-import { ClaspError } from './clasp-error.js';
-export class PathProxy {
-    /**
-     * Handles a path to a file.
-     *
-     * - Constructor requires a default path (directory and filename)
-     * - Path can be overridden with the `path` accessor.
-     * - The `resolve()` method implements specific rules to define the effective path to the proxied file.
-     *
-     * @param {BrokenPath} defaultPath default path
-     */
-    constructor(defaultPath) {
-        this._default = defaultPath;
-    }
-    /**
-     * Returns the current (raw and unresolved) defined path to the proxied file.
-     *
-     * *Note: for most uses, prefer the `resolve()` method in order to retreive a file's path*
-     *
-     * @returns {string}
-     */
-    get path() {
-        var _a;
-        return (_a = this._userDefined) !== null && _a !== void 0 ? _a : path.join(this._default.dir, this._default.base);
-    }
-    /**
-     * Sets the current (raw and unresolved) path to the proxied file.
-     *
-     * *Note: passing an empty string restores the default path*
-     */
-    set path(userDefined) {
-        this._userDefined = userDefined === path.join(this._default.dir, this._default.base) ? undefined : userDefined;
-    }
-    /**
-     * Returns true if current path is the default.
-     *
-     * @returns {boolean}
-     */
-    isDefault() {
-        return !this._userDefined || this._userDefined === path.join(this._default.dir, this._default.base);
-    }
-    /**
-     * Returns the resolved directory to the proxied file.
-     *
-     * *Note: for most uses, prefer the `.resolve()` method in order to retreive a file's path*
-     *
-     * @returns {string}
-     */
-    get resolvedDir() {
-        return path.dirname(this.resolve());
-    }
-    /**
-     * Resolves the current active path
-     *
-     * @returns {string}
-     */
-    resolve() {
-        return this._userDefined
-            ? resolvePath(this._userDefined, this._default.base)
-            : path.join(this._default.dir, this._default.base);
-    }
-}
-/**
- * Attempts to resolve a path with the following rules:
- *
- * - if path exists and points to a file: use it as is
- * - if path exists and points to a directory: append the default base filename to the path
- * - if path partially resolves to an existing directory but base filename does not exists: use it as is
- * - otherwise throw an error
- *
- * @param {string} pathToResolve the path to resolve
- * @param {string} baseFilename the default base filename
- *
- * @returns {string}
- */
-const resolvePath = (pathToResolve, baseFilename) => {
-    if (fs.existsSync(pathToResolve)) {
-        return appendBaseIfIsDirectory(pathToResolve, baseFilename);
-    }
-    const parsedPath = path.parse(pathToResolve);
-    if (parsedPath.dir === '' || fs.lstatSync(parsedPath.dir).isDirectory()) {
-        return pathToResolve; // Assume fullpath to missing file
-    }
-    // TODO: improve support for unresolved paths
-    throw new ClaspError(`Unrecognized path ${pathToResolve}`);
-};
-/**
- * Attempts to resolve an **existing** path using the following rules:
- *
- * - if path exists and points to a file: use it as is
- * - if path exists and points to a directory: append the default base filename to the path
- * - otherwise throw an error
- *
- * @param {string} somePath the path to resolve
- * @param {string} baseFilename the default base filename
- *
- * @returns {string}
- */
-const appendBaseIfIsDirectory = (somePath, baseFilename) => {
-    const stats = fs.lstatSync(somePath);
-    if (stats.isFile()) {
-        return somePath;
-    }
-    if (stats.isDirectory()) {
-        return path.join(somePath, baseFilename);
-    }
-    // TODO: improve support for other stats types (stats.isSymbolicLink() ? )
-    throw new ClaspError(`Unrecognized path ${somePath}`);
-};
-//# sourceMappingURL=path-proxy.js.map

package/build/src/path-proxy.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"path-proxy.js","sourceRoot":"","sources":["../../src/path-proxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAK5C,MAAM,OAAO,SAAS;IAIpB;;;;;;;;OAQG;IACH,YAAY,WAAuB;QACjC,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC;IAC9B,CAAC;IAED;;;;;;OAMG;IACH,IAAI,IAAI;;QACN,OAAO,MAAA,IAAI,CAAC,YAAY,mCAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC/E,CAAC;IAED;;;;OAIG;IACH,IAAI,IAAI,CAAC,WAAmB;QAC1B,IAAI,CAAC,YAAY,GAAG,WAAW,KAAK,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC;IACjH,CAAC;IAED;;;;OAIG;IACH,SAAS;QACP,OAAO,CAAC,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,YAAY,KAAK,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACtG,CAAC;IAED;;;;;;OAMG;IACH,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;IACtC,CAAC;IAED;;;;OAIG;IACH,OAAO;QACL,OAAO,IAAI,CAAC,YAAY;YACtB,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;YACpD,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACvD,CAAC;CACF;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,WAAW,GAAG,CAAC,aAAqB,EAAE,YAAoB,EAAE,EAAE;IAClE,IAAI,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE;QAChC,OAAO,uBAAuB,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;KAC7D;IAED,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IAE7C,IAAI,UAAU,CAAC,GAAG,KAAK,EAAE,IAAI,EAAE,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE;QACvE,OAAO,aAAa,CAAC,CAAC,kCAAkC;KACzD;IAED,6CAA6C;IAC7C,MAAM,IAAI,UAAU,CAAC,qBAAqB,aAAa,EAAE,CAAC,CAAC;AAC7D,CAAC,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,MAAM,uBAAuB,GAAG,CAAC,QAAgB,EAAE,YAAoB,EAAU,EAAE;IACjF,MAAM,KAAK,GAAG,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IAErC,IAAI,KAAK,CAAC,MAAM,EAAE,EAAE;QAClB,OAAO,QAAQ,CAAC;KACjB;IAED,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE;QACvB,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;KAC1C;IAED,0EAA0E;IAC1E,MAAM,IAAI,UAAU,CAAC,qBAAqB,QAAQ,EAAE,CAAC,CAAC;AACxD,CAAC,CAAC"}