From 2d5e098af46d757156cca45d35b0f8d338d2a330 Mon Sep 17 00:00:00 2001 From: Dan Lynch Date: Mon, 15 Jun 2026 05:37:01 +0000 Subject: [PATCH] fix: migrate all imports from usage-loader to module-loader All consumers now import directly from @constructive-io/module-loader instead of going through the @constructive-io/usage-loader shim. Fixes CI build order issue where fn-runtime failed to find usage-loader types before they were compiled. --- job/worker/package.json | 1 - job/worker/src/compute-meter.ts | 6 +++--- job/worker/src/storage-meter.ts | 6 +++--- job/worker/src/usage-client.ts | 14 +++++++------- packages/agentic-server/package.json | 2 +- packages/agentic-server/src/inference-meter.ts | 6 +++--- packages/fn-runtime/package.json | 2 +- packages/fn-runtime/src/storage.ts | 2 +- pnpm-lock.yaml | 11 ++++------- 9 files changed, 23 insertions(+), 27 deletions(-) diff --git a/job/worker/package.json b/job/worker/package.json index 5e9943a5..0c875dde 100644 --- a/job/worker/package.json +++ b/job/worker/package.json @@ -19,7 +19,6 @@ "@constructive-io/job-pg": "^2.5.4", "@constructive-io/job-utils": "^2.5.4", "@constructive-io/module-loader": "workspace:^", - "@constructive-io/usage-loader": "workspace:^", "@pgpmjs/logger": "^2.4.3", "pg": "8.20.0" }, diff --git a/job/worker/src/compute-meter.ts b/job/worker/src/compute-meter.ts index 0f0a3c46..3f23db85 100644 --- a/job/worker/src/compute-meter.ts +++ b/job/worker/src/compute-meter.ts @@ -1,7 +1,7 @@ /** * Compute metering — fire-and-forget usage logging for every job. * - * Delegates to @constructive-io/usage-loader which resolves table names + * Delegates to @constructive-io/module-loader which resolves table names * dynamically from MetaSchema module registration tables. * * All writes are non-blocking: errors are logged and swallowed so @@ -9,8 +9,8 @@ */ import type { Pool } from 'pg'; -import { UsageLoader } from '@constructive-io/usage-loader'; -import type { MeterEntry } from '@constructive-io/usage-loader'; +import { UsageLoader } from '@constructive-io/module-loader'; +import type { MeterEntry } from '@constructive-io/module-loader'; export type { MeterEntry }; diff --git a/job/worker/src/storage-meter.ts b/job/worker/src/storage-meter.ts index 2f21155f..9176bc44 100644 --- a/job/worker/src/storage-meter.ts +++ b/job/worker/src/storage-meter.ts @@ -1,7 +1,7 @@ /** * Storage metering — fire-and-forget usage logging for S3/MinIO operations. * - * Delegates to @constructive-io/usage-loader which resolves table names + * Delegates to @constructive-io/module-loader which resolves table names * dynamically from MetaSchema module registration tables. * * All writes are non-blocking: errors are logged and swallowed so @@ -9,8 +9,8 @@ */ import type { Pool } from 'pg'; -import { UsageLoader } from '@constructive-io/usage-loader'; -import type { StorageEntry } from '@constructive-io/usage-loader'; +import { UsageLoader } from '@constructive-io/module-loader'; +import type { StorageEntry } from '@constructive-io/module-loader'; export type { StorageEntry }; diff --git a/job/worker/src/usage-client.ts b/job/worker/src/usage-client.ts index 4e9cf5a3..8c017eca 100644 --- a/job/worker/src/usage-client.ts +++ b/job/worker/src/usage-client.ts @@ -1,17 +1,17 @@ /** - * Re-export from @constructive-io/usage-loader for backward compatibility. + * Re-export from @constructive-io/module-loader for backward compatibility. * - * The canonical implementation is in packages/usage-loader. + * The canonical implementation is in packages/module-loader. * This file exists so existing imports from within job/worker/ continue working. */ export { UsageLoader as UsageClient, UsageLoader, - getLoader, - _resetLoaderCache, - DEFAULTS, -} from '@constructive-io/usage-loader'; + getModuleLoader as getLoader, + _resetModuleLoaderCache as _resetLoaderCache, + USAGE_DEFAULTS as DEFAULTS, +} from '@constructive-io/module-loader'; export type { UsageTableConfig as UsageModuleConfig, @@ -19,4 +19,4 @@ export type { MeterEntry, InferenceEntry, StorageEntry, -} from '@constructive-io/usage-loader'; +} from '@constructive-io/module-loader'; diff --git a/packages/agentic-server/package.json b/packages/agentic-server/package.json index 6e93891d..b32aa373 100644 --- a/packages/agentic-server/package.json +++ b/packages/agentic-server/package.json @@ -19,7 +19,7 @@ "start": "node dist/standalone.js" }, "dependencies": { - "@constructive-io/usage-loader": "workspace:^", + "@constructive-io/module-loader": "workspace:^", "@pgpmjs/logger": "^2.4.3", "express": "5.2.1" }, diff --git a/packages/agentic-server/src/inference-meter.ts b/packages/agentic-server/src/inference-meter.ts index 32ef19d3..99aa67e6 100644 --- a/packages/agentic-server/src/inference-meter.ts +++ b/packages/agentic-server/src/inference-meter.ts @@ -1,7 +1,7 @@ /** * Inference metering — fire-and-forget usage logging for LLM calls. * - * Delegates to @constructive-io/usage-loader which resolves table names + * Delegates to @constructive-io/module-loader which resolves table names * dynamically from MetaSchema module registration tables. * * All writes are non-blocking: errors are logged and swallowed so @@ -9,8 +9,8 @@ */ import type { Pool } from 'pg'; -import { UsageLoader, getLoader, _resetLoaderCache } from '@constructive-io/usage-loader'; -import type { InferenceEntry } from '@constructive-io/usage-loader'; +import { UsageLoader, getModuleLoader as getLoader, _resetModuleLoaderCache as _resetLoaderCache } from '@constructive-io/module-loader'; +import type { InferenceEntry } from '@constructive-io/module-loader'; export type { InferenceEntry }; diff --git a/packages/fn-runtime/package.json b/packages/fn-runtime/package.json index 8b7abd89..4ff16f2d 100644 --- a/packages/fn-runtime/package.json +++ b/packages/fn-runtime/package.json @@ -21,7 +21,7 @@ "@aws-sdk/client-s3": "^3.1066.0", "@constructive-io/fn-types": "workspace:^", "@constructive-io/knative-job-fn": "workspace:^", - "@constructive-io/usage-loader": "workspace:^", + "@constructive-io/module-loader": "workspace:^", "@pgpmjs/logger": "^2.4.3", "graphql-request": "^7.1.2" }, diff --git a/packages/fn-runtime/src/storage.ts b/packages/fn-runtime/src/storage.ts index 2514cf1b..e5885d60 100644 --- a/packages/fn-runtime/src/storage.ts +++ b/packages/fn-runtime/src/storage.ts @@ -5,7 +5,7 @@ import { PutObjectCommand, DeleteObjectCommand } from '@aws-sdk/client-s3'; -import { UsageLoader } from '@constructive-io/usage-loader'; +import { UsageLoader } from '@constructive-io/module-loader'; export type StorageMeterCallback = (info: { databaseId?: string; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 055e452c..4a828d20 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -337,9 +337,6 @@ importers: '@constructive-io/module-loader': specifier: workspace:^ version: link:../../packages/module-loader - '@constructive-io/usage-loader': - specifier: workspace:^ - version: link:../../packages/usage-loader '@pgpmjs/logger': specifier: ^2.4.3 version: 2.5.2 @@ -362,9 +359,9 @@ importers: packages/agentic-server: dependencies: - '@constructive-io/usage-loader': + '@constructive-io/module-loader': specifier: workspace:^ - version: link:../usage-loader + version: link:../module-loader '@pgpmjs/logger': specifier: ^2.4.3 version: 2.12.0 @@ -558,9 +555,9 @@ importers: '@constructive-io/knative-job-fn': specifier: workspace:^ version: link:../fn-app - '@constructive-io/usage-loader': + '@constructive-io/module-loader': specifier: workspace:^ - version: link:../usage-loader + version: link:../module-loader '@pgpmjs/logger': specifier: ^2.4.3 version: 2.5.2