rebase cleanup

Author: Yostra

apps/supabase/src/edge-functions/stripe-worker.ts

@@ -26,7 +26,7 @@ const pool = new pg.Pool({ connectionString: dbUrl, max: 2 })
 const resolved = await resolveOpenApiSpec({ apiVersion: '2020-08-27' })
 const registry = buildResourceRegistry(resolved.spec, stripeKey, resolved.apiVersion)
 
- Deno.serve(async (req) => {
+Deno.serve(async (req) => {
   // Auth: validate Bearer token against vault worker secret
   const authHeader = req.headers.get('Authorization')
   if (!authHeader?.startsWith('Bearer ')) {

packages/openapi/jsonSchemaConverter.ts

@@ -1,4 +1,4 @@
-import type { ParsedResourceTable, ScalarType } from './types'
+import type { ParsedResourceTable, ScalarType } from './types.js'
 
 const SCALAR_TYPE_TO_JSON_SCHEMA: Record<ScalarType, { type: string; format?: string }> = {
   text: { type: 'string' },

packages/openapi/listFnResolver.ts

@@ -1,5 +1,5 @@
-import type { OpenApiSchemaObject, OpenApiSpec } from './types'
-import { OPENAPI_RESOURCE_TABLE_ALIASES } from './runtimeMappings'
+import type { OpenApiSchemaObject, OpenApiSpec } from './types.js'
+import { OPENAPI_RESOURCE_TABLE_ALIASES } from './runtimeMappings.js'
 
 const SCHEMA_REF_PREFIX = '#/components/schemas/'
 

packages/openapi/package.json

@@ -3,16 +3,23 @@
   "version": "0.1.0",
   "private": true,
   "type": "module",
-  "main": "./dist/index.cjs",
   "exports": {
     ".": {
       "types": "./index.ts",
-      "import": "./dist/index.js",
-      "require": "./dist/index.cjs"
+      "import": "./index.ts",
+      "default": "./index.ts"
+    }
+  },
+  "publishConfig": {
+    "exports": {
+      ".": {
+        "types": "./dist/index.d.ts",
+        "import": "./dist/index.js"
+      }
     }
   },
   "scripts": {
-    "build": "tsup index.ts --format esm,cjs --dts",
+    "build": "tsc",
     "test": "vitest --passWithNoTests"
   },
   "files": [

packages/openapi/runtimeMappings.ts

@@ -1,4 +1,4 @@
-import type { ParsedColumn } from './types'
+import type { ParsedColumn } from './types.js'
 
 /**
  * Overrides for x-resourceId values whose table name cannot be inferred by the

packages/openapi/specFetchHelper.ts

@@ -1,7 +1,7 @@
 import os from 'node:os'
 import fs from 'node:fs/promises'
 import path from 'node:path'
-import type { OpenApiSpec, ResolveSpecConfig, ResolvedOpenApiSpec } from './types'
+import type { OpenApiSpec, ResolveSpecConfig, ResolvedOpenApiSpec } from './types.js'
 
 const DEFAULT_CACHE_DIR = path.join(os.tmpdir(), 'stripe-sync-openapi-cache')
 

packages/openapi/specParser.ts

@@ -6,8 +6,8 @@ import type {
   ParsedColumn,
   ParsedOpenApiSpec,
   ScalarType,
-} from './types'
-import { OPENAPI_COMPATIBILITY_COLUMNS, OPENAPI_RESOURCE_TABLE_ALIASES } from './runtimeMappings'
+} from './types.js'
+import { OPENAPI_COMPATIBILITY_COLUMNS, OPENAPI_RESOURCE_TABLE_ALIASES } from './runtimeMappings.js'
 
 const SCHEMA_REF_PREFIX = '#/components/schemas/'
 

packages/openapi/tsconfig.json

@@ -1,9 +1,10 @@
 {
   "compilerOptions": {
     "target": "esnext",
-    "module": "esnext",
-    "moduleResolution": "bundler",
+    "module": "nodenext",
+    "moduleResolution": "nodenext",
     "declaration": true,
+    "declarationMap": true,
     "outDir": "dist",
     "esModuleInterop": true,
     "skipLibCheck": true,

packages/source-stripe/src/process-event.ts

@@ -150,7 +150,7 @@ export async function* processStripeEvent(
     resourceConfig.isFinalState &&
     !resourceConfig.isFinalState(dataObject)
   ) {
-    data = (await resourceConfig.retrieveFn(dataObject.id)) as Record<string, unknown>
+    data = (await resourceConfig.retrieveFn!(dataObject.id)) as Record<string, unknown>
   }
 
   // 6. Yield main record

packages/source-stripe/tsconfig.json

@@ -13,5 +13,5 @@
     "rootDir": "src"
   },
   "include": ["src/**/*"],
-  "exclude": ["src/server", "src/**/*.test.ts", "src/**/__tests__/**"]
+  "exclude": ["src/server", "src/openapi", "src/**/*.test.ts", "src/**/__tests__/**"]
 }