@redmix/api 9.0.0-canary.586 → 9.0.0-canary.588

package/dist/auth/index.js

@@ -1,4 +1,3 @@
-import bannerPath from "node:path"; import bannerUrl from "node:url"; const __filename = bannerUrl.fileURLToPath(import.meta.url); const __dirname = bannerPath.dirname(__filename);
 export * from "./parseJWT.js";
 import * as cookie from "cookie";
 import { getEventHeader } from "../event.js";

package/dist/auth/parseJWT.js

@@ -1,4 +1,3 @@
-import bannerPath from "node:path"; import bannerUrl from "node:url"; const __filename = bannerUrl.fileURLToPath(import.meta.url); const __dirname = bannerPath.dirname(__filename);
 function isTokenWithRoles(token) {
   return !!token.decoded?.roles;
 }

package/dist/auth/verifiers/base64Sha1Verifier.js

@@ -1,4 +1,3 @@
-import bannerPath from "node:path"; import bannerUrl from "node:url"; const __filename = bannerUrl.fileURLToPath(import.meta.url); const __dirname = bannerPath.dirname(__filename);
 import { createHmac, timingSafeEqual } from "crypto";
 import {
   WebhookVerificationError,

package/dist/auth/verifiers/base64Sha256Verifier.js

@@ -1,4 +1,3 @@
-import bannerPath from "node:path"; import bannerUrl from "node:url"; const __filename = bannerUrl.fileURLToPath(import.meta.url); const __dirname = bannerPath.dirname(__filename);
 import { createHmac, timingSafeEqual } from "crypto";
 import {
   WebhookVerificationError,

package/dist/auth/verifiers/common.js

@@ -1,4 +1,3 @@
-import bannerPath from "node:path"; import bannerUrl from "node:url"; const __filename = bannerUrl.fileURLToPath(import.meta.url); const __dirname = bannerPath.dirname(__filename);
 import base64Sha1Verifier from "./base64Sha1Verifier.js";
 import base64Sha256Verifier from "./base64Sha256Verifier.js";
 import jwtVerifier from "./jwtVerifier.js";

package/dist/auth/verifiers/index.js

@@ -1,4 +1,3 @@
-import bannerPath from "node:path"; import bannerUrl from "node:url"; const __filename = bannerUrl.fileURLToPath(import.meta.url); const __dirname = bannerPath.dirname(__filename);
 import { verifierLookup } from "./common.js";
 const createVerifier = (type, options) => {
   if (options) {

package/dist/auth/verifiers/jwtVerifier.js

@@ -1,4 +1,3 @@
-import bannerPath from "node:path"; import bannerUrl from "node:url"; const __filename = bannerUrl.fileURLToPath(import.meta.url); const __dirname = bannerPath.dirname(__filename);
 import jwt from "jsonwebtoken";
 import {
   WebhookSignError,

package/dist/auth/verifiers/secretKeyVerifier.js

@@ -1,4 +1,3 @@
-import bannerPath from "node:path"; import bannerUrl from "node:url"; const __filename = bannerUrl.fileURLToPath(import.meta.url); const __dirname = bannerPath.dirname(__filename);
 import { WebhookVerificationError, DEFAULT_WEBHOOK_SECRET } from "./common.js";
 const secretKeyVerifier = (_options) => {
   return {

package/dist/auth/verifiers/sha1Verifier.js

@@ -1,4 +1,3 @@
-import bannerPath from "node:path"; import bannerUrl from "node:url"; const __filename = bannerUrl.fileURLToPath(import.meta.url); const __dirname = bannerPath.dirname(__filename);
 import { createHmac, timingSafeEqual } from "crypto";
 import {
   WebhookVerificationError,

package/dist/auth/verifiers/sha256Verifier.js

@@ -1,4 +1,3 @@
-import bannerPath from "node:path"; import bannerUrl from "node:url"; const __filename = bannerUrl.fileURLToPath(import.meta.url); const __dirname = bannerPath.dirname(__filename);
 import { createHmac, timingSafeEqual } from "crypto";
 import {
   WebhookVerificationError,

package/dist/auth/verifiers/skipVerifier.js

@@ -1,4 +1,3 @@
-import bannerPath from "node:path"; import bannerUrl from "node:url"; const __filename = bannerUrl.fileURLToPath(import.meta.url); const __dirname = bannerPath.dirname(__filename);
 const skipVerifier = (_options) => {
   return {
     sign: () => {

package/dist/auth/verifiers/timestampSchemeVerifier.js

@@ -1,4 +1,3 @@
-import bannerPath from "node:path"; import bannerUrl from "node:url"; const __filename = bannerUrl.fileURLToPath(import.meta.url); const __dirname = bannerPath.dirname(__filename);
 import { createHmac } from "crypto";
 import {
   WebhookVerificationError,

package/dist/cache/clients/BaseClient.js

@@ -1,4 +1,3 @@
-import bannerPath from "node:path"; import bannerUrl from "node:url"; const __filename = bannerUrl.fileURLToPath(import.meta.url); const __dirname = bannerPath.dirname(__filename);
 class BaseClient {
   constructor() {
   }

package/dist/cache/clients/InMemoryClient.js

@@ -1,4 +1,3 @@
-import bannerPath from "node:path"; import bannerUrl from "node:url"; const __filename = bannerUrl.fileURLToPath(import.meta.url); const __dirname = bannerPath.dirname(__filename);
 import BaseClient from "./BaseClient.js";
 class InMemoryClient extends BaseClient {
   storage;

package/dist/cache/clients/MemcachedClient.js

@@ -1,4 +1,3 @@
-import bannerPath from "node:path"; import bannerUrl from "node:url"; const __filename = bannerUrl.fileURLToPath(import.meta.url); const __dirname = bannerPath.dirname(__filename);
 import BaseClient from "./BaseClient.js";
 class MemcachedClient extends BaseClient {
   client;

package/dist/cache/clients/RedisClient.js

@@ -1,4 +1,3 @@
-import bannerPath from "node:path"; import bannerUrl from "node:url"; const __filename = bannerUrl.fileURLToPath(import.meta.url); const __dirname = bannerPath.dirname(__filename);
 import BaseClient from "./BaseClient.js";
 class RedisClient extends BaseClient {
   client;

package/dist/cache/errors.js

@@ -1,4 +1,3 @@
-import bannerPath from "node:path"; import bannerUrl from "node:url"; const __filename = bannerUrl.fileURLToPath(import.meta.url); const __dirname = bannerPath.dirname(__filename);
 class CacheTimeoutError extends Error {
   constructor() {
     super("Timed out waiting for response from the cache server");

package/dist/cache/index.js

@@ -1,4 +1,3 @@
-import bannerPath from "node:path"; import bannerUrl from "node:url"; const __filename = bannerUrl.fileURLToPath(import.meta.url); const __dirname = bannerPath.dirname(__filename);
 import { CacheTimeoutError } from "./errors.js";
 import { default as default2 } from "./clients/MemcachedClient.js";
 import { default as default3 } from "./clients/RedisClient.js";

package/dist/cjs/index.d.ts

@@ -8,6 +8,4 @@ export * from './cors.js';
 export * from './event.js';
 export declare const prismaVersion: any;
 export declare const redwoodVersion: any;
-export declare function getPrismaVersion(): Promise<string>;
-export declare function getRedwoodVersion(): Promise<string>;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAA;AAC/B,cAAc,aAAa,CAAA;AAC3B,cAAc,8BAA8B,CAAA;AAC5C,cAAc,yBAAyB,CAAA;AACvC,cAAc,YAAY,CAAA;AAC1B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,WAAW,CAAA;AACzB,cAAc,YAAY,CAAA;AAM1B,eAAO,MAAM,aAAa,KAAgD,CAAA;AAC1E,eAAO,MAAM,cAAc,KAAuB,CAAA;AAGlD,wBAAsB,gBAAgB,oBAIrC;AAGD,wBAAsB,iBAAiB,oBAItC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAEA,cAAc,iBAAiB,CAAA;AAC/B,cAAc,aAAa,CAAA;AAC3B,cAAc,8BAA8B,CAAA;AAC5C,cAAc,yBAAyB,CAAA;AACvC,cAAc,YAAY,CAAA;AAC1B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,WAAW,CAAA;AACzB,cAAc,YAAY,CAAA;AAsB1B,eAAO,MAAM,aAAa,KAA8C,CAAA;AACxE,eAAO,MAAM,cAAc,KAAuB,CAAA"}

package/dist/cjs/index.js

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -18,23 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var index_exports = {};
 __export(index_exports, {
-  getPrismaVersion: () => getPrismaVersion,
-  getRedwoodVersion: () => getRedwoodVersion,
   prismaVersion: () => prismaVersion,
   redwoodVersion: () => redwoodVersion
 });
 module.exports = __toCommonJS(index_exports);
+var import_node_module = require("node:module");
 __reExport(index_exports, require("./auth/index.js"), module.exports);
 __reExport(index_exports, require("./errors.js"), module.exports);
 __reExport(index_exports, require("./validations/validations.js"), module.exports);
@@ -43,21 +32,20 @@ __reExport(index_exports, require("./types.js"), module.exports);
 __reExport(index_exports, require("./transforms.js"), module.exports);
 __reExport(index_exports, require("./cors.js"), module.exports);
 __reExport(index_exports, require("./event.js"), module.exports);
-const packageJson = typeof require === "function" ? require("../package.json") : {};
-const prismaVersion = packageJson?.dependencies?.["@prisma/client"];
-const redwoodVersion = packageJson?.version;
-async function getPrismaVersion() {
-  const { default: apiPackageJson } = await import("@redmix/api/package.json");
-  return apiPackageJson?.dependencies?.["@prisma/client"];
+const customRequire = typeof require === "function" ? require : (0, import_node_module.createRequire)(process.env.RWJS_CWD || process.cwd());
+const rxApiPath = customRequire.resolve("@redmix/api");
+const rxApiRequire = (0, import_node_module.createRequire)(rxApiPath);
+let packageJson = rxApiRequire("./package.json");
+if (packageJson?.name !== "@redmix/api") {
+  packageJson = rxApiRequire("../package.json");
 }
-async function getRedwoodVersion() {
-  const { default: apiPackageJson } = await import("@redmix/api/package.json");
-  return apiPackageJson?.version;
+if (packageJson?.name !== "@redmix/api") {
+  packageJson = rxApiRequire("../../package.json");
 }
+const prismaVersion = packageJson?.dependencies["@prisma/client"];
+const redwoodVersion = packageJson?.version;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  getPrismaVersion,
-  getRedwoodVersion,
   prismaVersion,
   redwoodVersion,
   ...require("./auth/index.js"),

package/dist/cors.js

@@ -1,4 +1,3 @@
-import bannerPath from "node:path"; import bannerUrl from "node:url"; const __filename = bannerUrl.fileURLToPath(import.meta.url); const __dirname = bannerPath.dirname(__filename);
 import { Headers } from "@whatwg-node/fetch";
 function createCorsContext(cors) {
   const corsHeaders = new Headers();

package/dist/errors.js

@@ -1,4 +1,3 @@
-import bannerPath from "node:path"; import bannerUrl from "node:url"; const __filename = bannerUrl.fileURLToPath(import.meta.url); const __dirname = bannerPath.dirname(__filename);
 class RedwoodError extends Error {
   extensions;
   constructor(message, extensions) {

package/dist/event.js

@@ -1,4 +1,3 @@
-import bannerPath from "node:path"; import bannerUrl from "node:url"; const __filename = bannerUrl.fileURLToPath(import.meta.url); const __dirname = bannerPath.dirname(__filename);
 import { isFetchApiRequest } from "./transforms.js";
 const getEventHeader = (event, headerName) => {
   if (isFetchApiRequest(event)) {

package/dist/functions/fixtures/apiGatewayProxyEvent.fixture.js

@@ -1,4 +1,3 @@
-import bannerPath from "node:path"; import bannerUrl from "node:url"; const __filename = bannerUrl.fileURLToPath(import.meta.url); const __dirname = bannerPath.dirname(__filename);
 const mockedAPIGatewayProxyEvent = {
   body: "MOCKED_BODY",
   headers: {},

package/dist/index.d.ts

@@ -8,6 +8,4 @@ export * from './cors.js';
 export * from './event.js';
 export declare const prismaVersion: any;
 export declare const redwoodVersion: any;
-export declare function getPrismaVersion(): Promise<string>;
-export declare function getRedwoodVersion(): Promise<string>;
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAA;AAC/B,cAAc,aAAa,CAAA;AAC3B,cAAc,8BAA8B,CAAA;AAC5C,cAAc,yBAAyB,CAAA;AACvC,cAAc,YAAY,CAAA;AAC1B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,WAAW,CAAA;AACzB,cAAc,YAAY,CAAA;AAM1B,eAAO,MAAM,aAAa,KAAgD,CAAA;AAC1E,eAAO,MAAM,cAAc,KAAuB,CAAA;AAGlD,wBAAsB,gBAAgB,oBAIrC;AAGD,wBAAsB,iBAAiB,oBAItC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,cAAc,iBAAiB,CAAA;AAC/B,cAAc,aAAa,CAAA;AAC3B,cAAc,8BAA8B,CAAA;AAC5C,cAAc,yBAAyB,CAAA;AACvC,cAAc,YAAY,CAAA;AAC1B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,WAAW,CAAA;AACzB,cAAc,YAAY,CAAA;AAsB1B,eAAO,MAAM,aAAa,KAA8C,CAAA;AACxE,eAAO,MAAM,cAAc,KAAuB,CAAA"}

package/dist/index.js

@@ -1,4 +1,4 @@
-import bannerPath from "node:path"; import bannerUrl from "node:url"; const __filename = bannerUrl.fileURLToPath(import.meta.url); const __dirname = bannerPath.dirname(__filename);
+import { createRequire } from "node:module";
 export * from "./auth/index.js";
 export * from "./errors.js";
 export * from "./validations/validations.js";
@@ -7,20 +7,19 @@ export * from "./types.js";
 export * from "./transforms.js";
 export * from "./cors.js";
 export * from "./event.js";
-const packageJson = typeof require === "function" ? require("../package.json") : {};
-const prismaVersion = packageJson?.dependencies?.["@prisma/client"];
-const redwoodVersion = packageJson?.version;
-async function getPrismaVersion() {
-  const { default: apiPackageJson } = await import("@redmix/api/package.json");
-  return apiPackageJson?.dependencies?.["@prisma/client"];
+const customRequire = typeof require === "function" ? require : createRequire(process.env.RWJS_CWD || process.cwd());
+const rxApiPath = customRequire.resolve("@redmix/api");
+const rxApiRequire = createRequire(rxApiPath);
+let packageJson = rxApiRequire("./package.json");
+if (packageJson?.name !== "@redmix/api") {
+  packageJson = rxApiRequire("../package.json");
 }
-async function getRedwoodVersion() {
-  const { default: apiPackageJson } = await import("@redmix/api/package.json");
-  return apiPackageJson?.version;
+if (packageJson?.name !== "@redmix/api") {
+  packageJson = rxApiRequire("../../package.json");
 }
+const prismaVersion = packageJson?.dependencies["@prisma/client"];
+const redwoodVersion = packageJson?.version;
 export {
-  getPrismaVersion,
-  getRedwoodVersion,
   prismaVersion,
   redwoodVersion
 };

package/dist/logger/index.js

@@ -1,4 +1,3 @@
-import bannerPath from "node:path"; import bannerUrl from "node:url"; const __filename = bannerUrl.fileURLToPath(import.meta.url); const __dirname = bannerPath.dirname(__filename);
 import pino from "pino";
 const isDevelopment = process.env.NODE_ENV === "development";
 const isTest = process.env.NODE_ENV === "test";

package/dist/package.json

@@ -1 +1 @@
-{"type":"module","version":"9.0.0-canary.586+d9813c80b","dependencies":{"@prisma/client":"5.20.0","@whatwg-node/fetch":"0.9.21","cookie":"1.0.2","humanize-string":"2.1.0","jsonwebtoken":"9.0.2","pascalcase":"1.0.0","pino":"9.4.0","title-case":"3.0.3"}}
+{"type":"module"}

package/dist/transforms.js

@@ -1,4 +1,3 @@
-import bannerPath from "node:path"; import bannerUrl from "node:url"; const __filename = bannerUrl.fileURLToPath(import.meta.url); const __dirname = bannerPath.dirname(__filename);
 import { Headers, Request as PonyfillRequest } from "@whatwg-node/fetch";
 const parseLambdaEventBody = (event) => {
   if (!event.body) {

package/dist/types.js

@@ -1 +0,0 @@
-import bannerPath from "node:path"; import bannerUrl from "node:url"; const __filename = bannerUrl.fileURLToPath(import.meta.url); const __dirname = bannerPath.dirname(__filename);

package/dist/validations/errors.js

@@ -1,4 +1,3 @@
-import bannerPath from "node:path"; import bannerUrl from "node:url"; const __filename = bannerUrl.fileURLToPath(import.meta.url); const __dirname = bannerPath.dirname(__filename);
 import humanize from "humanize-string";
 import { titleCase } from "title-case";
 import { RedwoodError } from "../errors.js";

package/dist/validations/validations.js

@@ -1,4 +1,3 @@
-import bannerPath from "node:path"; import bannerUrl from "node:url"; const __filename = bannerUrl.fileURLToPath(import.meta.url); const __dirname = bannerPath.dirname(__filename);
 import { PrismaClient } from "@prisma/client";
 import pascalcase from "pascalcase";
 import * as ValidationErrors from "./errors.js";

package/dist/webhooks/index.js

@@ -1,4 +1,3 @@
-import bannerPath from "node:path"; import bannerUrl from "node:url"; const __filename = bannerUrl.fileURLToPath(import.meta.url); const __dirname = bannerPath.dirname(__filename);
 import {
   createVerifier,
   WebhookVerificationError,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redmix/api",
-  "version": "9.0.0-canary.586+d9813c80b",
+  "version": "9.0.0-canary.588+fb40c52b1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/redmix-run/redmix.git",
@@ -95,7 +95,7 @@
     "title-case": "3.0.3"
   },
   "devDependencies": {
-    "@redmix/framework-tools": "9.0.0-canary.586",
+    "@redmix/framework-tools": "9.0.0-canary.588",
     "@types/aws-lambda": "8.10.145",
     "@types/jsonwebtoken": "9.0.8",
     "@types/memjs": "1",
@@ -123,5 +123,5 @@
       "optional": true
     }
   },
-  "gitHead": "d9813c80b3beedff5fd8d85ac51b1a83617ebd97"
+  "gitHead": "fb40c52b11d08dec4eb8c4037e68238a4d2ad8b0"
 }