@edgestore/server 0.1.5-alpha.14 → 0.1.5-alpha.16

package/dist/providers/edgestore/index.js

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('../../index-a2e7ca9e.js');
-require('@swc/helpers/_/_define_property');
+var shared = require('@edgestore/shared');
+var index = require('../../index-4491caf0.js');
 
 const DEFAULT_BASE_URL = 'https://files.edgestore.dev';
 function EdgeStoreProvider(options) {
@@ -82,7 +82,7 @@ function EdgeStoreProvider(options) {
                         thumbnailUrl: res.thumbnailUrl
                     };
                 } else {
-                    throw new index.EdgeStoreError({
+                    throw new shared.EdgeStoreError({
                         message: 'Could not get upload url',
                         code: 'SERVER_ERROR'
                     });
@@ -100,7 +100,7 @@ function EdgeStoreProvider(options) {
                     thumbnailUrl: res.thumbnailUrl
                 };
             }
-            throw new index.EdgeStoreError({
+            throw new shared.EdgeStoreError({
                 message: 'Could not get upload url',
                 code: 'SERVER_ERROR'
             });

package/dist/providers/edgestore/index.mjs

@@ -1,5 +1,5 @@
-import { b as EdgeStoreCredentialsError, i as initEdgeStoreSdk, E as EdgeStoreError } from '../../index-23d1ede9.mjs';
-import '@swc/helpers/_/_define_property';
+import { EdgeStoreError } from '@edgestore/shared';
+import { E as EdgeStoreCredentialsError, i as initEdgeStoreSdk } from '../../index-28efdacf.mjs';
 
 const DEFAULT_BASE_URL = 'https://files.edgestore.dev';
 function EdgeStoreProvider(options) {

package/dist/{shared-d7ea66fb.mjs → shared-039276af.mjs}

@@ -1,8 +1,8 @@
+import { EdgeStoreError } from '@edgestore/shared';
 import { hkdf } from '@panva/hkdf';
 import { serialize } from 'cookie';
 import { EncryptJWT, jwtDecrypt } from 'jose';
 import { v4 } from 'uuid';
-import { E as EdgeStoreError } from './index-23d1ede9.mjs';
 
 const IMAGE_MIME_TYPES = [
     'image/jpeg',

package/dist/{shared-06cb0d86.js → shared-7c700083.js}

@@ -1,10 +1,10 @@
 'use strict';
 
+var shared = require('@edgestore/shared');
 var hkdf = require('@panva/hkdf');
 var cookie = require('cookie');
 var jose = require('jose');
 var uuid = require('uuid');
-var index = require('./index-a2e7ca9e.js');
 
 const IMAGE_MIME_TYPES = [
     'image/jpeg',
@@ -64,7 +64,7 @@ async function requestUpload(params) {
         fileInfo
     });
     if (!ctxToken) {
-        throw new index.EdgeStoreError({
+        throw new shared.EdgeStoreError({
             message: 'Missing edgestore-ctx cookie',
             code: 'UNAUTHORIZED'
         });
@@ -75,7 +75,7 @@ async function requestUpload(params) {
     });
     const bucket = router.buckets[bucketName];
     if (!bucket) {
-        throw new index.EdgeStoreError({
+        throw new shared.EdgeStoreError({
             message: `Bucket ${bucketName} not found`,
             code: 'BAD_REQUEST'
         });
@@ -98,7 +98,7 @@ async function requestUpload(params) {
             canUpload
         });
         if (!canUpload) {
-            throw new index.EdgeStoreError({
+            throw new shared.EdgeStoreError({
                 message: 'Upload not allowed for the current context',
                 code: 'UPLOAD_NOT_ALLOWED'
             });
@@ -106,7 +106,7 @@ async function requestUpload(params) {
     }
     if (bucket._def.type === 'IMAGE') {
         if (!IMAGE_MIME_TYPES.includes(fileInfo.type)) {
-            throw new index.EdgeStoreError({
+            throw new shared.EdgeStoreError({
                 code: 'MIME_TYPE_NOT_ALLOWED',
                 message: 'Only images are allowed in this bucket',
                 details: {
@@ -118,7 +118,7 @@ async function requestUpload(params) {
     }
     if (bucket._def.bucketConfig?.maxSize) {
         if (fileInfo.size > bucket._def.bucketConfig.maxSize) {
-            throw new index.EdgeStoreError({
+            throw new shared.EdgeStoreError({
                 code: 'FILE_TOO_LARGE',
                 message: `File size is too big. Max size is ${bucket._def.bucketConfig.maxSize}`,
                 details: {
@@ -144,7 +144,7 @@ async function requestUpload(params) {
             }
         }
         if (!accepted) {
-            throw new index.EdgeStoreError({
+            throw new shared.EdgeStoreError({
                 code: 'MIME_TYPE_NOT_ALLOWED',
                 message: `"${fileInfo.type}" is not allowed. Accepted types are ${JSON.stringify(accept)}`,
                 details: {
@@ -202,7 +202,7 @@ async function requestUploadParts(params) {
         path
     });
     if (!ctxToken) {
-        throw new index.EdgeStoreError({
+        throw new shared.EdgeStoreError({
             message: 'Missing edgestore-ctx cookie',
             code: 'UNAUTHORIZED'
         });
@@ -224,7 +224,7 @@ async function completeMultipartUpload(params) {
         key
     });
     if (!ctxToken) {
-        throw new index.EdgeStoreError({
+        throw new shared.EdgeStoreError({
             message: 'Missing edgestore-ctx cookie',
             code: 'UNAUTHORIZED'
         });
@@ -232,7 +232,7 @@ async function completeMultipartUpload(params) {
     await getContext(ctxToken); // just to check if the token is valid
     const bucket = router.buckets[bucketName];
     if (!bucket) {
-        throw new index.EdgeStoreError({
+        throw new shared.EdgeStoreError({
             message: `Bucket ${bucketName} not found`,
             code: 'BAD_REQUEST'
         });
@@ -253,7 +253,7 @@ async function confirmUpload(params) {
         url
     });
     if (!ctxToken) {
-        throw new index.EdgeStoreError({
+        throw new shared.EdgeStoreError({
             message: 'Missing edgestore-ctx cookie',
             code: 'UNAUTHORIZED'
         });
@@ -261,7 +261,7 @@ async function confirmUpload(params) {
     await getContext(ctxToken); // just to check if the token is valid
     const bucket = router.buckets[bucketName];
     if (!bucket) {
-        throw new index.EdgeStoreError({
+        throw new shared.EdgeStoreError({
             message: `Bucket ${bucketName} not found`,
             code: 'BAD_REQUEST'
         });
@@ -281,7 +281,7 @@ async function deleteFile(params) {
         url
     });
     if (!ctxToken) {
-        throw new index.EdgeStoreError({
+        throw new shared.EdgeStoreError({
             message: 'Missing edgestore-ctx cookie',
             code: 'UNAUTHORIZED'
         });
@@ -289,13 +289,13 @@ async function deleteFile(params) {
     const ctx = await getContext(ctxToken);
     const bucket = router.buckets[bucketName];
     if (!bucket) {
-        throw new index.EdgeStoreError({
+        throw new shared.EdgeStoreError({
             message: `Bucket ${bucketName} not found`,
             code: 'BAD_REQUEST'
         });
     }
     if (!bucket._def.beforeDelete) {
-        throw new index.EdgeStoreError({
+        throw new shared.EdgeStoreError({
             message: 'You need to define beforeDelete if you want to delete files directly from the frontend.',
             code: 'SERVER_ERROR'
         });
@@ -308,7 +308,7 @@ async function deleteFile(params) {
         fileInfo
     });
     if (!canDelete) {
-        throw new index.EdgeStoreError({
+        throw new shared.EdgeStoreError({
             message: 'Delete not allowed for the current context',
             code: 'DELETE_NOT_ALLOWED'
         });
@@ -323,7 +323,7 @@ async function deleteFile(params) {
 async function encryptJWT(ctx) {
     const secret = process.env.EDGE_STORE_JWT_SECRET ?? process.env.EDGE_STORE_SECRET_KEY;
     if (!secret) {
-        throw new index.EdgeStoreError({
+        throw new shared.EdgeStoreError({
             message: 'EDGE_STORE_JWT_SECRET or EDGE_STORE_SECRET_KEY is not defined',
             code: 'SERVER_ERROR'
         });
@@ -337,7 +337,7 @@ async function encryptJWT(ctx) {
 async function decryptJWT(token) {
     const secret = process.env.EDGE_STORE_JWT_SECRET ?? process.env.EDGE_STORE_SECRET_KEY;
     if (!secret) {
-        throw new index.EdgeStoreError({
+        throw new shared.EdgeStoreError({
             message: 'EDGE_STORE_JWT_SECRET or EDGE_STORE_SECRET_KEY is not defined',
             code: 'SERVER_ERROR'
         });
@@ -357,7 +357,7 @@ function buildPath(params) {
     const path = pathParams.map((param)=>{
         const paramEntries = Object.entries(param);
         if (paramEntries[0] === undefined) {
-            throw new index.EdgeStoreError({
+            throw new shared.EdgeStoreError({
                 message: `Empty path param found in: ${JSON.stringify(pathParams)}`,
                 code: 'SERVER_ERROR'
             });
@@ -366,7 +366,7 @@ function buildPath(params) {
         // this is a string like: "ctx.xxx" or "input.yyy.zzz"
         const currParamVal = value().split('.').reduce((acc2, key)=>{
             if (acc2[key] === undefined) {
-                throw new index.EdgeStoreError({
+                throw new shared.EdgeStoreError({
                     message: `Missing key ${key} in ${JSON.stringify(acc2)}`,
                     code: 'BAD_REQUEST'
                 });

package/dist/{shared-d474acc6.js → shared-83f288f6.js}

@@ -1,8 +1,8 @@
+import { EdgeStoreError } from '@edgestore/shared';
 import { hkdf } from '@panva/hkdf';
 import { serialize } from 'cookie';
 import { EncryptJWT, jwtDecrypt } from 'jose';
 import { v4 } from 'uuid';
-import { E as EdgeStoreError } from './index-0c401ce1.js';
 
 const IMAGE_MIME_TYPES = [
     'image/jpeg',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@edgestore/server",
-  "version": "0.1.5-alpha.14",
+  "version": "0.1.5-alpha.16",
   "description": "Upload files with ease from React/Next.js",
   "homepage": "https://edgestore.dev",
   "repository": "https://github.com/edgestorejs/edgestore.git",
@@ -37,11 +37,6 @@
       "require": "./dist/core/index.js",
       "default": "./dist/core/index.js"
     },
-    "./adapters": {
-      "import": "./dist/adapters/index.mjs",
-      "require": "./dist/adapters/index.js",
-      "default": "./dist/adapters/index.js"
-    },
     "./adapters/express": {
       "import": "./dist/adapters/express/index.mjs",
       "require": "./dist/adapters/express/index.js",
@@ -71,11 +66,6 @@
       "import": "./dist/providers/edgestore/index.mjs",
       "require": "./dist/providers/edgestore/index.js",
       "default": "./dist/providers/edgestore/index.js"
-    },
-    "./providers": {
-      "import": "./dist/providers/index.mjs",
-      "require": "./dist/providers/index.js",
-      "default": "./dist/providers/index.js"
     }
   },
   "files": [
@@ -103,6 +93,7 @@
     "@aws-sdk/client-s3": ">=3.0.0",
     "@aws-sdk/s3-request-presigner": ">=3.0.0",
     "@azure/storage-blob": "^12.17.0",
+    "@edgestore/shared": "0.1.5-alpha.16",
     "zod": ">=3.0.0"
   },
   "peerDependenciesMeta": {
@@ -123,6 +114,7 @@
     "@aws-sdk/client-s3": "^3.420.0",
     "@aws-sdk/s3-request-presigner": "^3.420.0",
     "@azure/storage-blob": "^12.17.0",
+    "@edgestore/shared": "0.1.5-alpha.16",
     "@types/cookie": "^0.5.1",
     "@types/node": "^18.11.18",
     "@types/uuid": "^9.0.1",
@@ -130,7 +122,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "typescript": "^5.1.6",
-    "zod": "^3.21.4"
+    "zod": "3.21.4"
   },
-  "gitHead": "443a96fea331ba76622c2a428e1dd41db2694eeb"
+  "gitHead": "2f11a326b8412df19c375a75f1f8a329b6b9287b"
 }

package/src/adapters/express/index.ts

@@ -1,13 +1,14 @@
-import { type Request, type Response } from 'express';
-import { type EdgeStoreRouter } from '../../core/internals/bucketBuilder';
-import EdgeStoreError, {
+import {
   EDGE_STORE_ERROR_CODES,
+  EdgeStoreError,
   type EdgeStoreErrorCodeKey,
-} from '../../libs/errors/EdgeStoreError';
+  type EdgeStoreRouter,
+  type MaybePromise,
+  type Provider,
+} from '@edgestore/shared';
+import { type Request, type Response } from 'express';
 import Logger, { type LogLevel } from '../../libs/logger';
 import { EdgeStoreProvider } from '../../providers/edgestore';
-import { type Provider } from '../../providers/types';
-import { type MaybePromise } from '../../types';
 import {
   completeMultipartUpload,
   confirmUpload,

package/src/adapters/next/app/index.ts

@@ -1,13 +1,14 @@
-import { type NextRequest } from 'next/server';
-import { type EdgeStoreRouter } from '../../../core/internals/bucketBuilder';
-import EdgeStoreError, {
+import {
   EDGE_STORE_ERROR_CODES,
+  EdgeStoreError,
   type EdgeStoreErrorCodeKey,
-} from '../../../libs/errors/EdgeStoreError';
+  type EdgeStoreRouter,
+  type MaybePromise,
+  type Provider,
+} from '@edgestore/shared';
+import { type NextRequest } from 'next/server';
 import Logger, { type LogLevel } from '../../../libs/logger';
 import { EdgeStoreProvider } from '../../../providers/edgestore';
-import { type Provider } from '../../../providers/types';
-import { type MaybePromise } from '../../../types';
 import {
   completeMultipartUpload,
   confirmUpload,

package/src/adapters/next/pages/index.ts

@@ -1,13 +1,14 @@
-import { type NextApiRequest, type NextApiResponse } from 'next/types';
-import { type EdgeStoreRouter } from '../../../core/internals/bucketBuilder';
-import EdgeStoreError, {
+import {
   EDGE_STORE_ERROR_CODES,
+  EdgeStoreError,
   type EdgeStoreErrorCodeKey,
-} from '../../../libs/errors/EdgeStoreError';
+  type EdgeStoreRouter,
+  type MaybePromise,
+  type Provider,
+} from '@edgestore/shared';
+import { type NextApiRequest, type NextApiResponse } from 'next/types';
 import Logger, { type LogLevel } from '../../../libs/logger';
 import { EdgeStoreProvider } from '../../../providers/edgestore';
-import { type Provider } from '../../../providers/types';
-import { type MaybePromise } from '../../../types';
 import {
   completeMultipartUpload,
   confirmUpload,

package/src/adapters/shared.ts

@@ -1,14 +1,18 @@
+import {
+  EdgeStoreError,
+  type AnyBuilder,
+  type EdgeStoreRouter,
+  type Provider,
+  type SharedDeleteFileRes,
+  type SharedInitRes,
+  type SharedRequestUploadPartsRes,
+  type SharedRequestUploadRes,
+} from '@edgestore/shared';
 import { hkdf } from '@panva/hkdf';
 import { serialize } from 'cookie';
 import { EncryptJWT, jwtDecrypt } from 'jose';
 import { v4 as uuidv4 } from 'uuid';
-import {
-  type AnyBuilder,
-  type EdgeStoreRouter,
-} from '../core/internals/bucketBuilder';
-import EdgeStoreError from '../libs/errors/EdgeStoreError';
 import type Logger from '../libs/logger';
-import { type Provider } from '../providers/types';
 import { IMAGE_MIME_TYPES } from './imageTypes';
 
 // TODO: change it to 1 hour when we have a way to refresh the token
@@ -22,7 +26,7 @@ export async function init<TCtx>(params: {
   provider: Provider;
   router: EdgeStoreRouter<TCtx>;
   ctx: TCtx;
-}) {
+}): Promise<SharedInitRes> {
   const log = globalThis._EDGE_STORE_LOGGER;
   const { ctx, provider, router } = params;
   log.debug('Running [init]', { ctx });
@@ -74,7 +78,7 @@ export async function requestUpload<TCtx>(params: {
   router: EdgeStoreRouter<TCtx>;
   ctxToken: string | undefined;
   body: RequestUploadBody;
-}) {
+}): Promise<SharedRequestUploadRes> {
   const {
     provider,
     router,
@@ -231,7 +235,7 @@ export async function requestUploadParts<TCtx>(params: {
   router: EdgeStoreRouter<TCtx>;
   ctxToken: string | undefined;
   body: RequestUploadPartsParams;
-}) {
+}): Promise<SharedRequestUploadPartsRes> {
   const {
     provider,
     ctxToken,
@@ -370,7 +374,7 @@ export async function deleteFile<TCtx>(params: {
   router: EdgeStoreRouter<TCtx>;
   ctxToken: string | undefined;
   body: DeleteFileBody;
-}) {
+}): Promise<SharedDeleteFileRes> {
   const {
     provider,
     router,
@@ -544,10 +548,3 @@ function unproxyUrl(url: string) {
   }
   return url;
 }
-
-export type InitRes = Awaited<ReturnType<typeof init>>;
-export type RequestUploadRes = Awaited<ReturnType<typeof requestUpload>>;
-export type RequestUploadPartsRes = Awaited<
-  ReturnType<typeof requestUploadParts>
->;
-export type DeleteFileRes = Awaited<ReturnType<typeof deleteFile>>;

package/src/core/client/index.ts

@@ -1,14 +1,16 @@
 /* eslint-disable @typescript-eslint/ban-types */
-import { type z, type ZodNever } from 'zod';
-import { type AnyRouter, type Comparison } from '..';
-import { buildPath, parsePath } from '../../adapters/shared';
-import { type Prettify, type Simplify } from '../../types';
 import {
   type AnyBuilder,
+  type AnyRouter,
   type InferBucketPathKeys,
   type InferBucketPathObject,
   type InferMetadataObject,
-} from '../internals/bucketBuilder';
+  type Prettify,
+  type Simplify,
+} from '@edgestore/shared';
+import { type z, type ZodNever } from 'zod';
+import { type Comparison } from '..';
+import { buildPath, parsePath } from '../../adapters/shared';
 import { initEdgeStoreSdk } from '../sdk';
 
 export type GetFileRes<TBucket extends AnyBuilder> = {

package/src/core/index.ts

@@ -1,17 +1,2 @@
-import { type EdgeStoreRouter } from './internals/bucketBuilder';
-
 export * from './client';
 export * from './sdk';
-export type {
-  InferBucketPathKeys,
-  InferBucketPathObject,
-  InferMetadataObject,
-} from './internals/bucketBuilder';
-export type {
-  EdgeStoreErrorCodeKey,
-  EdgeStoreErrorDetails,
-  EdgeStoreJsonResponse,
-} from '../libs/errors/EdgeStoreError';
-export { EdgeStoreApiClientError } from '../libs/errors/EdgeStoreApiClientError';
-
-export type AnyRouter = EdgeStoreRouter<any>;

package/src/core/sdk/index.ts

@@ -1,7 +1,10 @@
-import { type AnyRouter } from '..';
+import {
+  EdgeStoreError,
+  type AnyContext,
+  type AnyMetadata,
+  type AnyRouter,
+} from '@edgestore/shared';
 import EdgeStoreCredentialsError from '../../libs/errors/EdgeStoreCredentialsError';
-import EdgeStoreError from '../../libs/errors/EdgeStoreError';
-import { type AnyContext, type AnyMetadata } from '../internals/bucketBuilder';
 
 const API_ENDPOINT =
   process.env.EDGE_STORE_API_ENDPOINT ?? 'https://api.edgestore.dev';

package/src/index.ts

@@ -1 +1 @@
-export { initEdgeStore } from './core/internals/bucketBuilder';
+export { initEdgeStore } from '@edgestore/shared';

package/src/providers/aws/index.ts

@@ -5,8 +5,8 @@ import {
   S3Client,
 } from '@aws-sdk/client-s3';
 import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
+import { type Provider } from '@edgestore/shared';
 import { v4 as uuidv4 } from 'uuid';
-import { type Provider } from '../types';
 
 export type AWSProviderOptions = {
   /**

package/src/providers/azure/index.ts

@@ -1,6 +1,6 @@
 import { BlobServiceClient } from '@azure/storage-blob';
+import { type Provider } from '@edgestore/shared';
 import { v4 as uuidv4 } from 'uuid';
-import { type Provider } from '../types';
 
 export type AzureProviderOptions = {
   /**

package/src/providers/edgestore/index.ts

@@ -1,7 +1,10 @@
+import {
+  EdgeStoreError,
+  type Provider,
+  type RequestUploadRes,
+} from '@edgestore/shared';
 import { initEdgeStoreSdk } from '../../core/sdk';
 import EdgeStoreCredentialsError from '../../libs/errors/EdgeStoreCredentialsError';
-import EdgeStoreError from '../../libs/errors/EdgeStoreError';
-import { type Provider, type RequestUploadRes } from '../types';
 
 const DEFAULT_BASE_URL = 'https://files.edgestore.dev';
 

package/dist/adapters/index.d.ts

@@ -1,2 +0,0 @@
-export type { InitRes, RequestUploadRes, RequestUploadPartsRes, DeleteFileRes, } from './shared';
-//# sourceMappingURL=index.d.ts.map

package/dist/adapters/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/adapters/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,OAAO,EACP,gBAAgB,EAChB,qBAAqB,EACrB,aAAa,GACd,MAAM,UAAU,CAAC"}

package/dist/adapters/index.js

@@ -1,2 +0,0 @@
-'use strict';
-

package/dist/adapters/index.mjs

@@ -1 +0,0 @@
-