Various minor changes

.gitignore

@@ -27,3 +27,5 @@ private
 dist.zip
 
 .clasp.json
+
+*~

.yarnrc.yml

@@ -1,2 +1,10 @@
+approvedGitRepositories:
+  - "**"
+
 enableGlobalCache: true
+
+enableScripts: true
+
 nodeLinker: node-modules
+
+npmMinimalAgeGate: 0

package.json

@@ -2,11 +2,11 @@
   "name": "empower-poster",
   "private": true,
   "license": "MIT",
-  "packageManager": "yarn@4.11.0",
+  "packageManager": "yarn@4.17.0",
   "workspaces": [
     "packages/*"
   ],
   "scripts": {
-    "ci": "yarn workspaces foreach -A run ci"
+    "ci": "yarn workspaces foreach -A install && yarn workspaces foreach -A run ci"
   }
 }

packages/apps-script-sample/clasp-redeploy.sh

@@ -6,12 +6,12 @@ clasp push -f
 # Find the single non-HEAD deployment
 deployments_output=$(clasp list-deployments)
 deployment_id=$(echo "$deployments_output" |
-		    grep -e '^-' | 
+		    grep -e '^-' |
 		    awk '$3 != "@HEAD" {print $2}')
-[[ $(echo "$deployment_id" | wc -w) -eq 1 ]] || { 
+[[ $(echo "$deployment_id" | wc -w) -eq 1 ]] || {
     echo "FAILED. Script only works with exactly 1 non-HEAD deployment:
     $deployments_output";
-    exit 1; 
+    exit 1;
 }
 
 version_output=$(clasp create-version 'Untitled')

packages/apps-script-sample/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "apps-script-samples",
+  "name": "apps-script-sample",
   "private": true,
   "version": "0.2.9",
   "description": "Sample Apps Script Web App for use with Empower Poster extension",
@@ -15,7 +15,7 @@
     "build:redeploy": "yarn build:check && yarn redeploy",
     "redeploy": "./clasp-redeploy.sh",
     "typecheck": "tsc --noEmit",
-    "lint": "eslint '{src,tests}/**/*.{js,ts}'",
+    "lint": "eslint './*.{js,ts}' '{src,tests}/**/*.{js,ts}'",
     "lint:fix": "yarn lint --fix",
     "format:check": "prettier './*.{js,ts}' '{src,tests}/**/*.{js,ts}' --check",
     "format": "prettier './*.{js,ts}' '{src,tests}/**/*.{js,ts}' --write",
@@ -32,7 +32,6 @@
     "eslint": "^10.1.0",
     "prettier": "^3.8.1",
     "rollup": "^4.61.1",
-    "tslib": "^2.8.1",
     "typescript": "^6.0.2",
     "typescript-eslint": "^8.57.2",
     "vitest": "^4.1.8"

packages/apps-script-sample/src/app.ts

@@ -116,18 +116,18 @@ export function doPost(e: GoogleAppsScript.Events.DoPost) {
       classifications,
       accounts,
     } = JSON.parse(e.postData.contents) as PostPayload;
-    console.log(`API version: ${major}.${minor}`);
+    Logger.log(`API version: ${major}.${minor}`);
     const supported = { major: 0, minor: 6 };
     if (major !== supported.major || minor < supported.minor) {
       throw new Error(
         `data version ${major}.${minor} not supported, expected at least ${supported.major}.${supported.minor}`,
       );
     }
-    console.log(`Received ${holdings.length} holdings`);
-    console.log(
+    Logger.log(`Received ${holdings.length} holdings`);
+    Logger.log(
       `Classifications for ${Object.keys(classifications).length} tickers`,
     );
-    console.log(`${accounts.length} accounts`);
+    Logger.log(`${accounts.length} accounts`);
     // Write data to sheets
     const spreadsheet = SpreadsheetApp.getActiveSpreadsheet();
     const classificationsSheet = spreadsheet.getSheetByName("classifications");

packages/extension/cli/cli.ts

@@ -19,6 +19,6 @@ async function main() {
   const holdingsIn = getHoldings(spData.holdings);
   const holdings = getHoldings(holdingsIn);
   const classifications = getClassifications(classificationsIn);
-  console.log(JSON.stringify({ holdings, classifications }));
+  Logger.log(JSON.stringify({ holdings, classifications }));
 }
 await main();

packages/extension/package.json

@@ -25,7 +25,7 @@
     "dist": "rm -f dist.zip && yarn build && cd dist && zip -r ../dist.zip *",
     "clean": "rm -rf dist",
     "typecheck": "tsc --noEmit",
-    "lint": "eslint '{.,src,tests}/**/*.{js,ts}'",
+    "lint": "eslint './*.{js,ts}' '{src,tests}/**/*.{js,ts}'",
     "lint:fix": "yarn lint --fix",
     "format:check": "prettier --no-error-on-unmatched-pattern './*.{js,ts}' '{src,tests}/**/*.{js,ts}' --check",
     "format": "prettier --no-error-on-unmatched-pattern './*.{js,ts}' '{src,tests}/**/*.{js,ts}' --write",

packages/extension/src/background.ts

@@ -9,10 +9,10 @@ import type {
 } from "./types";
 import { getPostUrls } from "./util";
 
-console.log(`Background script started at ${new Date()}`);
+Logger.log(`Background script started at ${new Date()}`);
 
 chrome.runtime.onInstalled.addListener(async (details) => {
-  console.log(`Extension installed at ${new Date()}`, details);
+  Logger.log(`Extension installed at ${new Date()}`, details);
   if ((await getPostUrls()).length === 0) {
     chrome.tabs.create({ url: "src/onboarding.html" });
   }
@@ -25,7 +25,7 @@ chrome.webRequest.onBeforeRequest.addListener(
     const csrfVal = details?.requestBody?.formData?.["csrf"]?.[0];
     if (csrfVal && csrfVal !== csrf) {
       csrf = csrfVal as string;
-      console.log("Saved token");
+      Logger.log("Saved token");
       // Send CSRF token to all tabs with content script
       const message: TokenUpdate = {
         type: "TOKEN_UPDATE",
@@ -92,7 +92,7 @@ async function postData(
       throw new Error("No POST URLs configured, can't post data");
     }
     if (!data.holdings || !data.classifications || !data.accounts) {
-      console.log(`data=${JSON.stringify(data)}`);
+      Logger.log(`data=${JSON.stringify(data)}`);
       throw new Error(
         "holdings, classifications, or accounts missing from processed data",
       );

packages/extension/src/config-form.ts

@@ -91,7 +91,7 @@ export function initConfigForm({ prefill, savedMessage }: ConfigFormOptions) {
     } catch (e) {
       const msg = `Failed: ${e instanceof Error ? e.message : e}`;
       showStatus(msg, "error");
-      console.log(msg);
+      Logger.log(msg);
     }
   });
 }

packages/extension/src/content.ts

@@ -108,7 +108,7 @@ button.onclick = async () => {
     if (classificationsErrors.length > 0) {
       if (classificationsErrors.length > 20) {
         statusLine.innerHTML = `${classificationsErrors.length} negative categorizations found, see console for details`;
-        console.log("Negative categorizations:", classificationsErrors);
+        Logger.log("Negative categorizations:", classificationsErrors);
       } else {
         const errorList = classificationsErrors
           .map((error) => {
@@ -220,9 +220,7 @@ setTimeout(async () => {
         csrf = response.csrf;
       }
     } catch (e) {
-      console.log(
-        `token request failed: ${e instanceof Error ? e.message : e}`,
-      );
+      Logger.log(`token request failed: ${e instanceof Error ? e.message : e}`);
     }
   }
 }, 5000);

packages/extension/tests/processing.test.ts

@@ -134,7 +134,7 @@ describe("getClassifications", () => {
       ) as ClassificationIn[];
       // const smallFile = inputFile.replace('-input','-small');
       // writeFileSync(smallFile, JSON.stringify(input.map(c => smallifyClassification(c)), null, 2));
-      // console.log(`wrote ${smallFile}`);
+      // Logger.log(`wrote ${smallFile}`);
       const actual = getClassifications(input);
       // const actualFile = inputFile.replace("-input", "-actual");
       // writeFileSync(actualFile, JSON.stringify(actual, null, 2));

yarn.lock

@@ -2,7 +2,7 @@
 # Manual changes might be lost - proceed with caution!
 
 __metadata:
-  version: 8
+  version: 10
   cacheKey: 10c0
 
 "@emnapi/core@npm:1.10.0":
@@ -950,17 +950,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"apps-script-samples@workspace:packages/apps-script-sample":
+"apps-script-sample@workspace:packages/apps-script-sample":
   version: 0.0.0-use.local
-  resolution: "apps-script-samples@workspace:packages/apps-script-sample"
+  resolution: "apps-script-sample@workspace:packages/apps-script-sample"
   dependencies:
     "@rollup/plugin-node-resolve": "npm:^16.0.3"
     "@rollup/plugin-typescript": "npm:^12.3.0"
     "@types/google-apps-script": "npm:^2.0.11"
     eslint: "npm:^10.1.0"
     prettier: "npm:^3.8.1"
     rollup: "npm:^4.61.1"
-    tslib: "npm:^2.8.1"
     typescript: "npm:^6.0.2"
     typescript-eslint: "npm:^8.57.2"
     vitest: "npm:^4.1.8"
@@ -2333,7 +2332,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tslib@npm:^2.4.0, tslib@npm:^2.8.1":
+"tslib@npm:^2.4.0":
   version: 2.8.1
   resolution: "tslib@npm:2.8.1"
   checksum: 10c0/9c4759110a19c53f992d9aae23aac5ced636e99887b51b9e61def52611732872ff7668757d4e4c61f19691e36f4da981cd9485e869b4a7408d689f6bf1f14e62