add cloudflare-utils and vitest-config (#221)

package.json

@@ -61,9 +61,9 @@
     "@babel/preset-typescript": "^7.24.1",
     "@eslint/js": "^9.1.1",
     "@microsoft/eslint-formatter-sarif": "^3.1.0",
-    "@monorepo-template/eslint-config": "^1.0.7",
     "@monorepo-template/test": "workspace:^",
     "@quisido/eslint-config": "workspace:^",
+    "@quisido/vitest-config": "workspace:^",
     "@types/babel__core": "^7.20.5",
     "@types/babel__preset-env": "^7.9.6",
     "@types/eslint": "^8.56.10",

packages/authn-shared/package.json

@@ -43,6 +43,7 @@
     "@babel/preset-typescript": "^7.24.1",
     "@microsoft/eslint-formatter-sarif": "^3.1.0",
     "@quisido/eslint-config": "workspace:^",
+    "@quisido/vitest-config": "workspace:^",
     "@types/node": "^20.12.7",
     "@typescript-eslint/eslint-plugin": "patch:@typescript-eslint/eslint-plugin@npm%3A7.7.0#~/.yarn/patches/@typescript-eslint-eslint-plugin-npm-7.7.0-de43f1e757.patch",
     "@typescript-eslint/parser": "^7.7.0",
@@ -57,6 +58,7 @@
     "prettier": "^3.2.5",
     "tslib": "^2.6.2",
     "typescript": "^5.4.5",
+    "vite": "^5.2.11",
     "vitest": "^1.6.0"
   }
 }

packages/authn-shared/vitest.config.ts

@@ -1,25 +1 @@
-import { defineConfig } from 'vitest/config';
-
-export default defineConfig({
-  test: {
-    clearMocks: true,
-    environment: 'node',
-    mockReset: true,
-    restoreMocks: true,
-
-    coverage: {
-      all: true,
-      clean: true,
-      enabled: true,
-      provider: 'istanbul',
-      skipFull: true,
-
-      thresholds: {
-        branches: 100,
-        functions: 100,
-        lines: 100,
-        statements: 100,
-      },
-    },
-  },
-});
+export { default } from '@quisido/vitest-config';

packages/authn/package.json

@@ -38,6 +38,7 @@
   "dependencies": {
     "@quisido/authn-shared": "workspace:^",
     "@quisido/workers-shared": "workspace:^",
+    "cloudflare-utils": "workspace:^",
     "cookie": "^0.6.0",
     "fmrs": "workspace:^",
     "form-urlencoded": "^6.1.4",
@@ -49,9 +50,10 @@
     "@babel/preset-env": "^7.24.4",
     "@babel/preset-react": "^7.24.1",
     "@babel/preset-typescript": "^7.24.1",
-    "@cloudflare/workers-types": "^4.20240419.0",
+    "@cloudflare/workers-types": "^4.20240512.0",
     "@microsoft/eslint-formatter-sarif": "^3.1.0",
     "@quisido/eslint-config": "workspace:^",
+    "@quisido/vitest-config": "workspace:^",
     "@types/cookie": "^0.6.0",
     "@types/eslint": "^8.56.10",
     "@vitest/coverage-istanbul": "^1.6.0",
@@ -60,6 +62,7 @@
     "concurrently": "^8.2.2",
     "eslint": "^9.1.1",
     "typescript": "^5.4.5",
+    "vite": "^5.2.11",
     "vitest": "^1.6.0",
     "wrangler": "^3.51.2"
   }

packages/authn/src/constants/metric-name.ts

@@ -48,9 +48,7 @@ enum MetricName {
   // quisi.do
   AuthnIdCreated = 'authn-id.created',
   AuthnIdError = 'authn-id.error',
-  InvalidConsole = 'console.invalid',
   InvalidUsageDataset = 'dataset.usage.invalid',
-  MissingConsole = 'console.missing',
   MissingUsageDataset = 'dataset.usage.missing',
 }
 

packages/authn/src/features/get-console.ts

@@ -1,35 +1,6 @@
-import { mapUnknownToString } from 'fmrs';
-import MetricName from '../constants/metric-name.js';
 import getState from '../utils/get-state.js';
-import getTelemetry from '../utils/get-telemetry.js';
-import isConsole from '../utils/is-console.js';
 
 export default function getConsole(): Console {
   const { console } = getState();
-
-  if (isConsole(console)) {
-    return console;
-  }
-
-  const { emitPublicMetric, logPrivateError, logPublicError } = getTelemetry();
-  if (typeof console === 'undefined') {
-    emitPublicMetric({ name: MetricName.MissingConsole });
-    return console;
-  }
-
-  emitPublicMetric({ name: MetricName.InvalidConsole });
-
-  logPrivateError(
-    new Error('Invalid console', {
-      cause: mapUnknownToString(console),
-    }),
-  );
-
-  logPublicError(
-    new Error('Invalid console', {
-      cause: typeof console,
-    }),
-  );
-
   return console;
 }

packages/authn/src/features/get-data-bucket.ts

@@ -1,8 +1,8 @@
+import { isR2Bucket } from 'cloudflare-utils';
 import { mapUnknownToString } from 'fmrs';
 import MetricName from '../constants/metric-name.js';
 import getEnv from '../utils/get-env.js';
 import getTelemetry from '../utils/get-telemetry.js';
-import isR2Bucket from '../utils/is-r2-bucket.js';
 
 export default function getDataBucket(): R2Bucket | null {
   const { AUTHN_DATA } = getEnv();

packages/authn/src/features/get-database.ts

@@ -1,6 +1,6 @@
 import { ErrorCode } from '@quisido/authn-shared';
+import { isD1Database } from 'cloudflare-utils';
 import getEnv from '../utils/get-env.js';
-import isD1Database from '../utils/is-d1-database.js';
 import mapCauseToError from '../utils/map-cause-to-error.js';
 
 export default function getDatabase(): D1Database {

packages/authn/src/features/get-usage.ts

@@ -1,8 +1,8 @@
 import { ErrorCode } from '@quisido/authn-shared';
 import { Product, type UsageType } from '@quisido/workers-shared';
+import { isAnalyticsEngineDataset } from 'cloudflare-utils';
 import EnvironmentName from '../constants/environment-name.js';
 import getEnv from '../utils/get-env.js';
-import isAnaylticsEngineDataset from '../utils/is-analytics-engine-dataset.js';
 import mapCauseToError from '../utils/map-cause-to-error.js';
 import getConsole from './get-console.js';
 import getEnvironmentName from './get-environment-name.js';
@@ -21,7 +21,7 @@ const SINGLE = 1;
 export default function getUsage(): (options: Options) => void {
   const { USAGE } = getEnv();
   const ENVIRONMENT_NAME: EnvironmentName = getEnvironmentName();
-  if (!isAnaylticsEngineDataset(USAGE)) {
+  if (!isAnalyticsEngineDataset(USAGE)) {
     if (ENVIRONMENT_NAME === EnvironmentName.Development) {
       const console: Console = getConsole();
       return function useDev({

packages/authn/src/features/telemetry-queue.ts

@@ -1,9 +1,9 @@
 import { AccountNumber, UsageType } from '@quisido/workers-shared';
+import { isAnalyticsEngineDataset } from 'cloudflare-utils';
 import { mapUnknownToError } from 'fmrs';
 import MetricName from '../constants/metric-name.js';
 import type { TraceParent } from '../modules/trace-parent/index.js';
 import type { Metric } from '../types/metric.js';
-import isAnaylticsEngineDataset from '../utils/is-analytics-engine-dataset.js';
 import mapAnalyticsEngineDatasetToEmitter from '../utils/map-analytics-dataset-engine-to-emitter.js';
 import mapRequestToTraceParent from '../utils/map-request-to-trace-parent.js';
 import TelemetryQueue from '../utils/telemetry-queue.js';
@@ -94,7 +94,7 @@ export default class AuthenticationTelemetryQueue extends TelemetryQueue<Metric>
       return;
     }
 
-    if (!isAnaylticsEngineDataset(dataset)) {
+    if (!isAnalyticsEngineDataset(dataset)) {
       this.emitPublicMetric({
         name: MetricName.InvalidPrivateDataset,
         type: typeof dataset,
@@ -119,7 +119,7 @@ export default class AuthenticationTelemetryQueue extends TelemetryQueue<Metric>
       return;
     }
 
-    if (!isAnaylticsEngineDataset(dataset)) {
+    if (!isAnalyticsEngineDataset(dataset)) {
       this.emitPublicMetric({
         name: MetricName.InvalidPublicDataset,
         type: typeof dataset,
@@ -163,7 +163,7 @@ export default class AuthenticationTelemetryQueue extends TelemetryQueue<Metric>
       return;
     }
 
-    if (!isAnaylticsEngineDataset(dataset)) {
+    if (!isAnalyticsEngineDataset(dataset)) {
       this.emitPublicMetric({
         name: MetricName.InvalidUsageDataset,
         type: typeof dataset,

packages/aws-rum-react/package.json

@@ -40,8 +40,8 @@
     "@babel/preset-react": "^7.24.1",
     "@babel/preset-typescript": "^7.24.1",
     "@microsoft/eslint-formatter-sarif": "^3.1.0",
-    "@monorepo-template/eslint-config": "^1.0.7",
     "@quisido/eslint-config": "workspace:^",
+    "@quisido/vitest-config": "workspace:^",
     "@testing-library/react": "^15.0.7",
     "@types/babel__core": "^7.20.5",
     "@types/babel__preset-env": "^7.9.6",
@@ -67,6 +67,7 @@
     "react-dom": "^18.2.0",
     "typescript": "^5.4.5",
     "unknown2string": "workspace:^",
+    "vite": "^5.2.11",
     "vitest": "^1.6.0",
     "whatwg-fetch": "^3.6.20"
   },

packages/aws-rum-react/vitest.config.ts

@@ -1,25 +1,10 @@
+import CONFIG, { INLINE_CONFIG } from '@quisido/vitest-config';
 import { defineConfig } from 'vitest/config';
 
 export default defineConfig({
+  ...CONFIG,
   test: {
-    clearMocks: true,
+    ...INLINE_CONFIG,
     environment: 'jsdom',
-    mockReset: true,
-    restoreMocks: true,
-
-    coverage: {
-      all: true,
-      clean: true,
-      enabled: true,
-      provider: 'istanbul',
-      skipFull: true,
-
-      thresholds: {
-        branches: 100,
-        functions: 100,
-        lines: 100,
-        statements: 100,
-      },
-    },
   },
 });

packages/cloudflare-utils/.attw.json

@@ -0,0 +1,5 @@
+{
+  "format": "table-flipped",
+  "ignoreRules": ["cjs-resolves-to-esm"],
+  "pack": "."
+}

packages/cloudflare-utils/.gitignore

@@ -0,0 +1,8 @@
+/coverage/
+/dist/
+/node_modules/
+/.eslintcache
+/*.cpuprofile
+/*.iml
+/*.tsbuildinfo
+/*-*.*.*.tgz

packages/cloudflare-utils/.npmignore

@@ -0,0 +1,15 @@
+/.vscode/
+/coverage/
+/node_modules/
+/src/
+/.*.json
+/.*ignore
+/.*rc.*
+/.eslintcache
+/*.config.*
+/*.cpuprofile
+/*.iml
+/*.tsbuildinfo
+/*-*.*.*.tgz
+/tsconfig.*
+.DS_Store

packages/cloudflare-utils/.vscode/settings.json

@@ -0,0 +1,12 @@
+{
+  "files.exclude": {
+    "coverage/": true,
+    "dist/": true,
+    "node_modules/": true,
+    ".attw.json": true,
+    ".eslintcache": true,
+    "*.cpuprofile": true,
+    "*.tsbuildinfo": true,
+    "vitest.config.ts.timestamp-*-*.mjs": true
+  }
+}