@anmiles/google-api-wrapper 15.2.0 → 16.0.0

package/dist/templates/css.html

@@ -0,0 +1,111 @@
+<style type="text/css">
+	* {
+		box-sizing: border-box;
+	}
+
+	html, body {
+		width: 100%;
+		height: 100%;
+		margin: 0;
+		padding: 0;
+	}
+
+	body {
+		font-family: Arial, sans-serif;
+		font-size: 17px;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		padding: 30px 0;
+	}
+
+	.box {
+		width: 450px;
+		min-height: 500px;
+		max-height: 100%;
+		padding: 82px 40px 28px 40px;
+		margin: 1em;
+		border: 1px solid #dadce0;
+		border-radius: 8px;
+		position: relative;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+
+	.box:before {
+		width: 100%;
+		height: 34px;
+		border-bottom: 1px solid #dadce0;
+		position: absolute;
+		top: 0;
+		display: block;
+		content: '';
+	}
+
+	h1 {
+		font-size: 24px;
+		line-height: 40px;
+		font-weight: normal;
+		margin: 0;
+	}
+
+	p {
+		line-height: 32px;
+		margin: 0;
+	}
+
+	ul {
+		width: 100%;
+		margin: 18px 0 30px 0;
+		padding-left: 0;
+		border-top: 1px solid #dadce0;
+		list-style-type: none;
+		overflow: auto;
+	}
+
+	li {
+		line-height: 48px;
+		color: brown;
+		border-bottom: 1px solid #dadce0;
+		display: flex;
+		align-items: center;
+	}
+
+	li:before {
+		content: 'W';
+		width: 28px;
+		height: 28px;
+		border-radius: 50%;
+		border: 2px solid currentColor;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 14px;
+		margin-right: 10px;
+	}
+
+	li.readonly {
+		color: darkgreen;
+	}
+
+	li.readonly:before {
+		content: 'R';
+	}
+
+	a {
+		width: 50%;
+		padding: 0 24px;
+		line-height: 36px;
+		margin: auto;
+		color: #ffffff;
+		background: #1a73e8;
+		border-radius: 4px;
+		outline: none;
+		display: block;
+		text-align: center;
+		text-decoration: none;
+		font-weight: bold;
+		font-size: 15px;
+	}
+</style>

package/dist/templates/page.html

@@ -1,113 +1,4 @@
-<style type="text/css">
-	* {
-		box-sizing: border-box;
-	}
-
-	html, body {
-		width: 100%;
-		height: 100%;
-		margin: 0;
-		padding: 0;
-	}
-
-	body {
-		font-family: Arial, sans-serif;
-		font-size: 17px;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		padding: 30px 0;
-	}
-
-	.box {
-		width: 450px;
-		min-height: 500px;
-		max-height: 100%;
-		padding: 82px 40px 28px 40px;
-		margin: 1em;
-		border: 1px solid #dadce0;
-		border-radius: 8px;
-		position: relative;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-	}
-
-	.box:before {
-		width: 100%;
-		height: 34px;
-		border-bottom: 1px solid #dadce0;
-		position: absolute;
-		top: 0;
-		display: block;
-		content: '';
-	}
-
-	h1 {
-		font-size: 24px;
-		line-height: 40px;
-		font-weight: normal;
-		margin: 0;
-	}
-
-	p {
-		line-height: 32px;
-		margin: 0;
-	}
-
-	ul {
-		width: 100%;
-		margin: 18px 0 30px 0;
-		padding-left: 0;
-		border-top: 1px solid #dadce0;
-		list-style-type: none;
-		overflow: auto;
-	}
-
-	li {
-		line-height: 48px;
-		color: brown;
-		border-bottom: 1px solid #dadce0;
-		display: flex;
-		align-items: center;
-	}
-
-	li:before {
-		content: 'W';
-		width: 28px;
-		height: 28px;
-		border-radius: 50%;
-		border: 2px solid currentColor;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		font-size: 14px;
-		margin-right: 10px;
-	}
-
-	li.readonly {
-		color: darkgreen;
-	}
-
-	li.readonly:before {
-		content: 'R';
-	}
-
-	a {
-		width: 50%;
-		padding: 0 24px;
-		line-height: 36px;
-		margin: auto;
-		color: #ffffff;
-		background: #1a73e8;
-		border-radius: 4px;
-		display: block;
-		text-align: center;
-		text-decoration: none;
-		font-weight: bold;
-		font-size: 15px;
-	}
-</style>
+${css}
 <div class="box">
 	${content}
 </div>

package/dist/types/common.d.ts

@@ -1,3 +1,4 @@
 export interface CommonOptions {
     hideProgress?: boolean;
 }
+//# sourceMappingURL=common.d.ts.map

package/dist/types/common.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../src/types/common.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,aAAa;IAC7B,YAAY,CAAC,EAAE,OAAO,CAAA;CACtB"}

package/dist/types/index.d.ts

@@ -1,2 +1,3 @@
 export * from './common';
 export * from './secrets';
+//# sourceMappingURL=index.d.ts.map

package/dist/types/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC"}

package/dist/types/secrets.d.ts

@@ -13,3 +13,4 @@ export interface AuthOptions {
     temporary?: boolean;
     scopes?: string[];
 }
+//# sourceMappingURL=secrets.d.ts.map

package/dist/types/secrets.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"secrets.d.ts","sourceRoot":"","sources":["../../src/types/secrets.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,OAAO;IACvB,GAAG,EAAE;QACJ,SAAS,EAAE,GAAG,MAAM,6BAA6B,CAAC;QAClD,UAAU,EAAE,MAAM,CAAC;QACnB,QAAQ,EAAE,2CAA2C,CAAC;QACtD,SAAS,EAAE,qCAAqC,CAAC;QACjD,2BAA2B,EAAE,4CAA4C,CAAC;QAC1E,aAAa,EAAE,MAAM,CAAC;QACtB,aAAa,EAAE,MAAM,EAAE,CAAC;KACxB,CAAC;CACF;AAED,MAAM,WAAW,WAAW;IAC3B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CAClB"}

package/jest.config.js

@@ -1,12 +1,14 @@
 module.exports = {
-	preset     : 'ts-jest',
+	preset    : 'ts-jest',
+	transform : {
+		'^.+\\.tsx?$' : 'ts-jest',
+	},
+
 	clearMocks : true,
 
 	roots     : [ '<rootDir>/src' ],
 	testMatch : [ '<rootDir>/src/**/__tests__/*.test.ts' ],
-	transform : {
-		'^.+\\.ts$' : 'ts-jest',
-	},
+
 	collectCoverageFrom : [
 		'<rootDir>/src/**/*.ts',
 		'!<rootDir>/src/**/*.d.ts',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anmiles/google-api-wrapper",
-  "version": "15.2.0",
+  "version": "16.0.0",
   "description": "Provides quick interface for getting google API data",
   "keywords": [
     "google",
@@ -16,45 +16,42 @@
   },
   "main": "dist/index.js",
   "scripts": {
-    "build": "rimraf dist && tsc && copyfiles -u 1 src/templates/* dist/",
-    "lint": "eslint --ext .js,.ts .",
+    "build": "rimraf dist && tsc -p ./tsconfig.build.json && copyfiles -u 1 src/templates/* dist/",
+    "lint": "eslint --ext .js,.ts --ignore-path .gitignore .",
     "lint:fix": "npm run lint -- --fix",
     "test": "jest --verbose",
     "test:coverage": "npm test -- --coverage",
     "test:ci": "npm test -- --ci --coverage",
     "test:watch": "npm test -- --watch",
     "test:watch:coverage": "npm test -- --watch --coverage",
-    "test:report:coverage": "nyc report --nycrc-path ./coverage.config.js -t ./coverage --report-dir ./coverage",
-    "create": "node ./dist/create.js",
-    "login": "node ./dist/login.js"
+    "test:report:coverage": "nyc report --nycrc-path ./coverage.config.js -t ./coverage --report-dir ./coverage"
   },
   "dependencies": {
-    "@anmiles/google-api-wrapper": "file:.",
-    "@anmiles/logger": "^3.0.0",
-    "@anmiles/prototypes": "^2.3.0",
-    "@anmiles/sleep": "^1.0.3",
-    "execa": "^5.1.1",
-    "googleapis": "^126.0.1",
-    "open": "^8.4.2",
+    "@anmiles/logger": "^6.0.0",
+    "@anmiles/prototypes": "^7.0.0",
+    "@anmiles/sleep": "^3.0.0",
+    "googleapis": "^130.0.0",
+    "out-url": "^1.1.3",
     "server-destroy": "^1.0.1"
   },
   "devDependencies": {
-    "@anmiles/eslint-config": "^2.0.0",
-    "@types/event-emitter": "^0.3.3",
-    "@types/jest": "^29.5.4",
-    "@types/server-destroy": "^1.0.1",
-    "@typescript-eslint/eslint-plugin": "^6.7.0",
-    "@typescript-eslint/parser": "^6.7.0",
+    "@anmiles/eslint-config": "^5.0.0",
+    "@anmiles/tsconfig": "^2.0.0",
+    "@types/event-emitter": "^0.3.5",
+    "@types/jest": "^29.5.11",
+    "@types/server-destroy": "^1.0.3",
+    "@typescript-eslint/eslint-plugin": "^6.19.0",
+    "@typescript-eslint/parser": "^6.19.0",
     "copyfiles": "^2.4.1",
-    "eslint": "^8.49.0",
+    "eslint": "^8.56.0",
     "eslint-plugin-align-assignments": "^1.1.2",
-    "eslint-plugin-import": "^2.28.1",
-    "eslint-plugin-jest": "^27.2.3",
+    "eslint-plugin-import": "^2.29.1",
+    "eslint-plugin-jest": "^27.6.3",
     "event-emitter": "^0.3.5",
-    "jest": "^29.6.4",
+    "jest": "^29.7.0",
     "nyc": "^15.1.0",
-    "rimraf": "^5.0.1",
+    "rimraf": "^5.0.5",
     "ts-jest": "^29.1.1",
-    "typescript": "^5.2.2"
+    "typescript": "^5.3.3"
   }
 }

package/src/lib/__tests__/api.test.ts

@@ -108,7 +108,7 @@ describe('src/lib/api', () => {
 		it('should return instance wrapper for google api', async () => {
 			const instance = await api.getAPI('calendar', profile, { scopes, temporary : true });
 
-			expect(instance).toEqual({ apiName : 'calendar', profile, authOptions : { scopes, temporary : true }, api : calendarAPI, auth : googleAuth });
+			expect(instance).toEqual({ apiName : 'calendar', profile, authOptions : { scopes, temporary : true }, api : calendarAPI });
 		});
 
 		it('should warn when creating permanent credentials using non-readonly scopes', async () => {
@@ -228,6 +228,12 @@ describe('src/lib/api', () => {
 
 				expect(items).toEqual(items);
 			});
+
+			it('should throw if api was not initialized before getting items', async () => {
+				instance = new api.API('calendar', profile);
+
+				await expect(() => instance.getItems((api) => api.calendarList, args)).rejects.toEqual('API is not initialized. Call `init` before getting items.');
+			});
 		});
 	});
 });

package/src/lib/__tests__/renderer.test.ts

@@ -36,7 +36,8 @@ jest.mock<Partial<typeof paths>>('../paths', () => ({
 }));
 
 const mockTemplates: Record<TemplateName, string> = {
-	page  : 'page content = (${content})',
+	page  : 'page css = (${css}) content = (${content})',
+	css   : 'css',
 	auth  : 'auth profile = (${profile}) authUrl = (${authUrl}) scopesList = (${scopesList})',
 	scope : 'scope type = (${type}) title = (${title}) name = (${name})',
 	done  : 'done profile = (${profile})',
@@ -50,14 +51,14 @@ describe('src/lib/renderer', () => {
 	describe('renderAuth', () => {
 		it('should return auth page', () => {
 			const result = original.renderAuth({ authUrl, profile, scope });
-			expect(result).toEqual('page content = (auth profile = (username) authUrl = (https://authUrl) scopesList = (scope type = (readonly) title = (Readonly (cannot change or delete your data)) name = (scope1.readonly)\nscope type = () title = (Writable (can change or delete your data)) name = (scope2)))');
+			expect(result).toEqual('page css = (css) content = (auth profile = (username) authUrl = (https://authUrl) scopesList = (scope type = (readonly) title = (Readonly (cannot change or delete your data)) name = (scope1.readonly)\nscope type = () title = (Writable (can change or delete your data)) name = (scope2)))');
 		});
 	});
 
 	describe('renderDone', () => {
 		it('should return done page', () => {
 			const result = original.renderDone({ profile });
-			expect(result).toEqual('page content = (done profile = (username))');
+			expect(result).toEqual('page css = (css) content = (done profile = (username))');
 		});
 	});
 

package/src/lib/__tests__/secrets.test.ts

@@ -1,7 +1,7 @@
 import fs from 'fs';
 import http from 'http';
 import path from 'path';
-import open from 'open';
+import { open } from 'out-url';
 import type GoogleApis from 'googleapis';
 import logger from '@anmiles/logger';
 import emitter from 'event-emitter';
@@ -54,8 +54,8 @@ jest.mock<Partial<typeof path>>('path', () => ({
 	join : jest.fn().mockImplementation((...args) => args.join('/')),
 }));
 
-jest.mock('open', () => jest.fn().mockImplementation((url: string) => {
-	makeRequest(url.replace('http://localhost:6006', ''));
+jest.mock<{ open: typeof open }>('out-url', () => ({
+	open : jest.fn().mockImplementation(async (url) => makeRequest(url.replace('http://localhost:6006', ''))),
 }));
 
 jest.mock<Partial<typeof logger>>('@anmiles/logger', () => ({

package/src/lib/api.ts

@@ -24,22 +24,17 @@ type CommonResponse<TItem> = {
 };
 
 class API<TKey extends keyof typeof allAPIs> {
-	api: ReturnType<typeof allAPIs[TKey]>;
-	private auth: GoogleApis.Common.OAuth2Client;
+	api: ReturnType<typeof allAPIs[TKey]> | undefined;
 
-	private apiName: TKey;
-	private profile: string;
-	private authOptions?: AuthOptions;
-
-	constructor(apiName: TKey, profile: string, authOptions?: AuthOptions) {
-		this.apiName     = apiName;
-		this.profile     = profile;
-		this.authOptions = authOptions;
-	}
+	constructor(
+		private apiName: TKey,
+		private profile: string,
+		private authOptions?: AuthOptions,
+	) {	}
 
 	async init() {
-		this.auth = await getAuth(this.profile, this.authOptions);
-		this.api  = allAPIs[this.apiName](this.auth) as ReturnType<typeof allAPIs[TKey]>;
+		const auth = await getAuth(this.profile, this.authOptions);
+		this.api   = allAPIs[this.apiName](auth) as ReturnType<typeof allAPIs[TKey]>;
 	}
 
 	async getItems<TItem>(selectAPI: (api: ReturnType<typeof allAPIs[TKey]>) => CommonAPI<TItem>, params: any, options?: CommonOptions): Promise<TItem[]> {
@@ -51,9 +46,15 @@ class API<TKey extends keyof typeof allAPIs> {
 			let response: GoogleApis.Common.GaxiosResponse<CommonResponse<TItem>>;
 
 			try {
+				if (!this.api) {
+					throw 'API is not initialized. Call `init` before getting items.';
+				}
+
 				response = await selectAPI(this.api).list({ ...params, pageToken });
 			} catch (ex) {
-				if ((ex.message === 'invalid_grant' || ex.message === 'Invalid credentials') && !this.authOptions?.temporary) {
+				const message = ex instanceof Error ? ex.message : ex as string;
+
+				if ((message === 'invalid_grant' || message === 'Invalid credentials') && !this.authOptions?.temporary) {
 					warn('Access token stored is invalid, re-creating...');
 					deleteCredentials(this.profile);
 					await this.init();

package/src/lib/renderer.ts

@@ -5,7 +5,8 @@ import { getTemplateFile } from './paths';
 export { templates, renderAuth, renderDone };
 
 const templates = {
-	page  : [ 'content' ] as const,
+	page  : [ 'css', 'content' ] as const,
+	css   : [ ] as const,
 	auth  : [ 'profile', 'authUrl', 'scopesList' ],
 	scope : [ 'type', 'title', 'name' ] as const,
 	done  : [ 'profile' ] as const,
@@ -22,13 +23,15 @@ function renderAuth({ profile, authUrl, scope }: { profile: string, authUrl: str
 		type  : s.endsWith('.readonly') ? 'readonly' : '',
 	})).join('\n');
 
+	const css     = render('css', {});
 	const content = render('auth', { profile, authUrl, scopesList });
-	return render('page', { content });
+	return render('page', { css, content });
 }
 
 function renderDone({ profile }: { profile: string }): string {
+	const css     = render('css', {});
 	const content = render('done', { profile });
-	return render('page', { content });
+	return render('page', { css, content });
 }
 
 // TODO: Use react

package/src/lib/secrets.ts

@@ -1,7 +1,7 @@
 import fs from 'fs';
 import http from 'http';
+import { open } from 'out-url';
 import enableDestroy from 'server-destroy';
-import open from 'open';
 import type GoogleApis from 'googleapis';
 import { warn } from '@anmiles/logger';
 import type { Secrets, AuthOptions } from '../types';
@@ -115,7 +115,7 @@ async function createCredentials(profile: string, auth: GoogleApis.Auth.OAuth2Cl
 			}
 		});
 
-		server.once('listening', () => {
+		server.once('listening', async () => {
 			warn('Please check your browser for further actions');
 			open(startURI);
 		});

package/src/templates/auth.html

@@ -3,4 +3,5 @@
 <ul>
 	${scopesList}
 </ul>
-<a href="${authUrl}">Continue</a>
+<a id="button" href="${authUrl}">Continue</a>
+<script type="text/javascript">document.addEventListener('DOMContentLoaded', function(){ document.getElementById('button').focus(); });</script>

package/src/templates/css.html

@@ -0,0 +1,111 @@
+<style type="text/css">
+	* {
+		box-sizing: border-box;
+	}
+
+	html, body {
+		width: 100%;
+		height: 100%;
+		margin: 0;
+		padding: 0;
+	}
+
+	body {
+		font-family: Arial, sans-serif;
+		font-size: 17px;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		padding: 30px 0;
+	}
+
+	.box {
+		width: 450px;
+		min-height: 500px;
+		max-height: 100%;
+		padding: 82px 40px 28px 40px;
+		margin: 1em;
+		border: 1px solid #dadce0;
+		border-radius: 8px;
+		position: relative;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+
+	.box:before {
+		width: 100%;
+		height: 34px;
+		border-bottom: 1px solid #dadce0;
+		position: absolute;
+		top: 0;
+		display: block;
+		content: '';
+	}
+
+	h1 {
+		font-size: 24px;
+		line-height: 40px;
+		font-weight: normal;
+		margin: 0;
+	}
+
+	p {
+		line-height: 32px;
+		margin: 0;
+	}
+
+	ul {
+		width: 100%;
+		margin: 18px 0 30px 0;
+		padding-left: 0;
+		border-top: 1px solid #dadce0;
+		list-style-type: none;
+		overflow: auto;
+	}
+
+	li {
+		line-height: 48px;
+		color: brown;
+		border-bottom: 1px solid #dadce0;
+		display: flex;
+		align-items: center;
+	}
+
+	li:before {
+		content: 'W';
+		width: 28px;
+		height: 28px;
+		border-radius: 50%;
+		border: 2px solid currentColor;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 14px;
+		margin-right: 10px;
+	}
+
+	li.readonly {
+		color: darkgreen;
+	}
+
+	li.readonly:before {
+		content: 'R';
+	}
+
+	a {
+		width: 50%;
+		padding: 0 24px;
+		line-height: 36px;
+		margin: auto;
+		color: #ffffff;
+		background: #1a73e8;
+		border-radius: 4px;
+		outline: none;
+		display: block;
+		text-align: center;
+		text-decoration: none;
+		font-weight: bold;
+		font-size: 15px;
+	}
+</style>