Skip to content

Commit 2d5e098

Browse files
committed
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.
1 parent 4aca61c commit 2d5e098

9 files changed

Lines changed: 23 additions & 27 deletions

File tree

job/worker/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
"@constructive-io/job-pg": "^2.5.4",
2020
"@constructive-io/job-utils": "^2.5.4",
2121
"@constructive-io/module-loader": "workspace:^",
22-
"@constructive-io/usage-loader": "workspace:^",
2322
"@pgpmjs/logger": "^2.4.3",
2423
"pg": "8.20.0"
2524
},

job/worker/src/compute-meter.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
/**
22
* Compute metering — fire-and-forget usage logging for every job.
33
*
4-
* Delegates to @constructive-io/usage-loader which resolves table names
4+
* Delegates to @constructive-io/module-loader which resolves table names
55
* dynamically from MetaSchema module registration tables.
66
*
77
* All writes are non-blocking: errors are logged and swallowed so
88
* metering never affects job throughput or latency.
99
*/
1010

1111
import type { Pool } from 'pg';
12-
import { UsageLoader } from '@constructive-io/usage-loader';
13-
import type { MeterEntry } from '@constructive-io/usage-loader';
12+
import { UsageLoader } from '@constructive-io/module-loader';
13+
import type { MeterEntry } from '@constructive-io/module-loader';
1414

1515
export type { MeterEntry };
1616

job/worker/src/storage-meter.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
/**
22
* Storage metering — fire-and-forget usage logging for S3/MinIO operations.
33
*
4-
* Delegates to @constructive-io/usage-loader which resolves table names
4+
* Delegates to @constructive-io/module-loader which resolves table names
55
* dynamically from MetaSchema module registration tables.
66
*
77
* All writes are non-blocking: errors are logged and swallowed so
88
* metering never affects function execution or storage latency.
99
*/
1010

1111
import type { Pool } from 'pg';
12-
import { UsageLoader } from '@constructive-io/usage-loader';
13-
import type { StorageEntry } from '@constructive-io/usage-loader';
12+
import { UsageLoader } from '@constructive-io/module-loader';
13+
import type { StorageEntry } from '@constructive-io/module-loader';
1414

1515
export type { StorageEntry };
1616

job/worker/src/usage-client.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
/**
2-
* Re-export from @constructive-io/usage-loader for backward compatibility.
2+
* Re-export from @constructive-io/module-loader for backward compatibility.
33
*
4-
* The canonical implementation is in packages/usage-loader.
4+
* The canonical implementation is in packages/module-loader.
55
* This file exists so existing imports from within job/worker/ continue working.
66
*/
77

88
export {
99
UsageLoader as UsageClient,
1010
UsageLoader,
11-
getLoader,
12-
_resetLoaderCache,
13-
DEFAULTS,
14-
} from '@constructive-io/usage-loader';
11+
getModuleLoader as getLoader,
12+
_resetModuleLoaderCache as _resetLoaderCache,
13+
USAGE_DEFAULTS as DEFAULTS,
14+
} from '@constructive-io/module-loader';
1515

1616
export type {
1717
UsageTableConfig as UsageModuleConfig,
1818
UsageTableConfig,
1919
MeterEntry,
2020
InferenceEntry,
2121
StorageEntry,
22-
} from '@constructive-io/usage-loader';
22+
} from '@constructive-io/module-loader';

packages/agentic-server/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"start": "node dist/standalone.js"
2020
},
2121
"dependencies": {
22-
"@constructive-io/usage-loader": "workspace:^",
22+
"@constructive-io/module-loader": "workspace:^",
2323
"@pgpmjs/logger": "^2.4.3",
2424
"express": "5.2.1"
2525
},

packages/agentic-server/src/inference-meter.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
/**
22
* Inference metering — fire-and-forget usage logging for LLM calls.
33
*
4-
* Delegates to @constructive-io/usage-loader which resolves table names
4+
* Delegates to @constructive-io/module-loader which resolves table names
55
* dynamically from MetaSchema module registration tables.
66
*
77
* All writes are non-blocking: errors are logged and swallowed so
88
* metering never affects inference latency or response delivery.
99
*/
1010

1111
import type { Pool } from 'pg';
12-
import { UsageLoader, getLoader, _resetLoaderCache } from '@constructive-io/usage-loader';
13-
import type { InferenceEntry } from '@constructive-io/usage-loader';
12+
import { UsageLoader, getModuleLoader as getLoader, _resetModuleLoaderCache as _resetLoaderCache } from '@constructive-io/module-loader';
13+
import type { InferenceEntry } from '@constructive-io/module-loader';
1414

1515
export type { InferenceEntry };
1616

packages/fn-runtime/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"@aws-sdk/client-s3": "^3.1066.0",
2222
"@constructive-io/fn-types": "workspace:^",
2323
"@constructive-io/knative-job-fn": "workspace:^",
24-
"@constructive-io/usage-loader": "workspace:^",
24+
"@constructive-io/module-loader": "workspace:^",
2525
"@pgpmjs/logger": "^2.4.3",
2626
"graphql-request": "^7.1.2"
2727
},

packages/fn-runtime/src/storage.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
PutObjectCommand,
66
DeleteObjectCommand
77
} from '@aws-sdk/client-s3';
8-
import { UsageLoader } from '@constructive-io/usage-loader';
8+
import { UsageLoader } from '@constructive-io/module-loader';
99

1010
export type StorageMeterCallback = (info: {
1111
databaseId?: string;

pnpm-lock.yaml

Lines changed: 4 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)