Revert "libsql-client-core package"

This reverts commit 6715838.

package.json

@@ -1,3 +1,3 @@
 {
-  "workspaces": [ "packages/libsql-client-core", "packages/libsql-client" ]
+  "workspaces": [ "packages/libsql-client" ]
 }

packages/libsql-client/package.json

@@ -99,7 +99,6 @@
         "typedoc": "rm -rf ./docs && typedoc"
     },
     "dependencies": {
-        "@libsql/client-core": "^0.4.0-pre.7",
         "@libsql/hrana-client": "^0.5.5",
         "js-base64": "^3.7.5",
         "libsql": "^0.2.0-pre.7"

packages/libsql-client-core/src/config.ts → packages/libsql-client/src/config.ts

@@ -1,5 +1,5 @@
-import type { Config, IntMode } from "./api";
-import { LibsqlError } from "./api";
+import type { Config, IntMode } from "./api.js";
+import { LibsqlError } from "./api.js";
 import type { Authority } from "./uri.js";
 import { parseUri } from "./uri.js";
 import { supportedUrlLink } from "./util.js";

packages/libsql-client/src/hrana.ts

@@ -1,8 +1,8 @@
 import * as hrana from "@libsql/hrana-client";
-import type { InStatement, ResultSet, Transaction, TransactionMode } from "@libsql/client-core/api";
-import { LibsqlError } from "@libsql/client-core/api";
-import type { SqlCache } from "@libsql/client-core/sql_cache";
-import { transactionModeToBegin, ResultSetImpl } from "@libsql/client-core/util";
+import type { InStatement, ResultSet, Transaction, TransactionMode } from "./api.js";
+import { LibsqlError } from "./api.js";
+import type { SqlCache } from "./sql_cache.js";
+import { transactionModeToBegin, ResultSetImpl } from "./util.js";
 
 export abstract class HranaTransaction implements Transaction {
     #mode: TransactionMode;

packages/libsql-client/src/http.ts

@@ -1,19 +1,19 @@
 import * as hrana from "@libsql/hrana-client";
 
-import type { Config, Client } from "@libsql/client-core/api";
-import type { InStatement, ResultSet, Transaction, IntMode } from "@libsql/client-core/api";
-import { TransactionMode, LibsqlError } from "@libsql/client-core/api";
-import type { ExpandedConfig } from "@libsql/client-core/config";
-import { expandConfig } from "@libsql/client-core/config";
+import type { Config, Client } from "./api.js";
+import type { InStatement, ResultSet, Transaction, IntMode } from "./api.js";
+import { TransactionMode, LibsqlError } from "./api.js";
+import type { ExpandedConfig } from "./config.js";
+import { expandConfig } from "./config.js";
 import {
     HranaTransaction, executeHranaBatch,
     stmtToHrana, resultSetFromHrana, mapHranaError,
 } from "./hrana.js";
-import { SqlCache } from "@libsql/client-core/sql_cache";
-import { encodeBaseUrl } from "@libsql/client-core/uri";
-import { supportedUrlLink } from "@libsql/client-core/util";
+import { SqlCache } from "./sql_cache.js";
+import { encodeBaseUrl } from "./uri.js";
+import { supportedUrlLink } from "./util.js";
 
-export * from "@libsql/client-core/api";
+export * from "./api.js";
 
 export function createClient(config: Config): Client {
     return _createClient(expandConfig(config, true));

packages/libsql-client/src/node.ts

@@ -1,12 +1,12 @@
-import type { Config, Client } from "@libsql/client-core/api";
-import { LibsqlError } from "@libsql/client-core/api";
-import type { ExpandedConfig } from "@libsql/client-core/config";
-import { expandConfig } from "@libsql/client-core/config";
+import type { Config, Client } from "./api.js";
+import { LibsqlError } from "./api.js";
+import type { ExpandedConfig } from "./config.js";
+import { expandConfig } from "./config.js";
 import { _createClient as _createSqlite3Client } from "./sqlite3.js";
 import { _createClient as _createWsClient } from "./ws.js";
 import { _createClient as _createHttpClient } from "./http.js";
 
-export * from "@libsql/client-core/api";
+export * from "./api.js";
 
 /** Creates a {@link Client} object.
  *

packages/libsql-client/src/sqlite3.ts

@@ -4,13 +4,13 @@ import { Buffer } from "node:buffer";
 import type {
     Config, IntMode, Client, Transaction, TransactionMode,
     ResultSet, Row, Value, InValue, InStatement,
-} from "@libsql/client-core/api";
-import { LibsqlError } from "@libsql/client-core/api";
-import type { ExpandedConfig } from "@libsql/client-core/config";
-import { expandConfig } from "@libsql/client-core/config";
-import { supportedUrlLink, transactionModeToBegin, ResultSetImpl } from "@libsql/client-core/util";
+} from "./api.js";
+import { LibsqlError } from "./api.js";
+import type { ExpandedConfig } from "./config.js";
+import { expandConfig } from "./config.js";
+import { supportedUrlLink, transactionModeToBegin, ResultSetImpl } from "./util.js";
 
-export * from "@libsql/client-core/api";
+export * from "./api.js";
 
 export function createClient(config: Config): Client {
     return _createClient(expandConfig(config, true));

packages/libsql-client-core/src/uri.ts → packages/libsql-client/src/uri.ts

@@ -3,7 +3,7 @@
 // `file:relative/path/database.db`, which are not correct according to RFC 8089, which standardizes the
 // `file` scheme.
 
-import { LibsqlError } from "./api";
+import { LibsqlError } from "./api.js";
 
 export interface Uri {
     scheme: string;

packages/libsql-client-core/src/util.ts → packages/libsql-client/src/util.ts

@@ -1,5 +1,5 @@
 import { Base64 } from "js-base64";
-import { ResultSet, Row, Value, TransactionMode, InStatement, LibsqlError } from "./api";
+import { ResultSet, Row, Value, TransactionMode, InStatement, LibsqlError } from "./api.js";
 
 export const supportedUrlLink = "https://github.com/libsql/libsql-client-ts#supported-urls";
 

packages/libsql-client/src/web.ts

@@ -1,13 +1,13 @@
-import type { Config, Client } from "@libsql/client-core/api";
-import { LibsqlError } from "@libsql/client-core/api";
-import type { ExpandedConfig } from "@libsql/client-core/config";
-import { expandConfig } from "@libsql/client-core/config";
-import { supportedUrlLink } from "@libsql/client-core/util";
+import type { Config, Client } from "./api.js";
+import { LibsqlError } from "./api.js";
+import type { ExpandedConfig } from "./config.js";
+import { expandConfig } from "./config.js";
+import { supportedUrlLink } from "./util.js";
 
 import { _createClient as _createWsClient } from "./ws.js";
 import { _createClient as _createHttpClient } from "./http.js";
 
-export * from "@libsql/client-core/api";
+export * from "./api.js";
 
 export function createClient(config: Config): Client {
     return _createClient(expandConfig(config, true));

packages/libsql-client/src/ws.ts

@@ -1,18 +1,18 @@
 import * as hrana from "@libsql/hrana-client";
 
-import type { Config, IntMode, Client, Transaction, ResultSet, InStatement } from "@libsql/client-core/api";
-import { TransactionMode, LibsqlError } from "@libsql/client-core/api";
-import type { ExpandedConfig } from "@libsql/client-core/config";
-import { expandConfig } from "@libsql/client-core/config";
+import type { Config, IntMode, Client, Transaction, ResultSet, InStatement } from "./api.js";
+import { TransactionMode, LibsqlError } from "./api.js";
+import type { ExpandedConfig } from "./config.js";
+import { expandConfig } from "./config.js";
 import {
     HranaTransaction, executeHranaBatch,
     stmtToHrana, resultSetFromHrana, mapHranaError,
 } from "./hrana.js";
-import { SqlCache } from "@libsql/client-core/sql_cache";
-import { encodeBaseUrl } from "@libsql/client-core/uri";
-import { supportedUrlLink } from "@libsql/client-core/util";
+import { SqlCache } from "./sql_cache.js";
+import { encodeBaseUrl } from "./uri.js";
+import { supportedUrlLink } from "./util.js";
 
-export * from "@libsql/client-core/api";
+export * from "./api.js";
 
 export function createClient(config: Config): WsClient {
     return _createClient(expandConfig(config, false));