@cedarjs/cli 7.0.1-next.467 → 7.1.0-rc.34

package/dist/commands/setup/uploads/serverFile.js

@@ -1,217 +0,0 @@
-import { isBuiltin } from "node:module";
-const START_LINE = /^([ \t]*)await server\.start\(\)/m;
-const FACTORY_IMPORT = /import\s*\{[^}]*\bcreateAuthDecoder\b[^}]*\}\s*from\s*['"](@cedarjs\/auth-[a-z0-9-]+-api)['"]/;
-const DECODER_IMPORT = /import\s*\{[^}]*\bauthDecoder\b[^}]*\}\s*from\s*['"](@cedarjs\/auth-[a-z0-9-]+-api)['"]/;
-function detectServerAuth(graphqlSource) {
-  const factory = FACTORY_IMPORT.exec(graphqlSource);
-  if (factory) {
-    return { decoderPackage: factory[1], usesFactory: true };
-  }
-  const decoder = DECODER_IMPORT.exec(graphqlSource);
-  if (decoder) {
-    return { decoderPackage: decoder[1], usesFactory: false };
-  }
-  return null;
-}
-function importedBindings(source) {
-  const names = /* @__PURE__ */ new Set();
-  const statements = source.matchAll(
-    /^import\s+(type\s+)?([^;]*?)\s+from\s+['"][^'"]+['"]/gm
-  );
-  for (const [, typeOnly, clause] of statements) {
-    if (typeOnly) {
-      continue;
-    }
-    const braces = /\{([^}]*)\}/.exec(clause);
-    const defaultOrNamespace = clause.replace(/\{[^}]*\}/, "");
-    for (const part of defaultOrNamespace.split(",")) {
-      const local = part.replace(/^\s*\*\s+as\s+/, "").trim();
-      if (local) {
-        names.add(local);
-      }
-    }
-    for (const specifier of braces?.[1].split(",") ?? []) {
-      const trimmed = specifier.trim();
-      if (!trimmed || trimmed.startsWith("type ")) {
-        continue;
-      }
-      const alias = / as (\w+)$/.exec(trimmed);
-      names.add(alias ? alias[1] : trimmed);
-    }
-  }
-  return names;
-}
-function hasBinding(source, name) {
-  const declared = new RegExp(
-    `^(?:export\\s+)?(?:const|let|var|function)\\s+${name}\\b`,
-    "m"
-  );
-  return importedBindings(source).has(name) || declared.test(source);
-}
-function uploadsServerImports(source, auth) {
-  const specs = [];
-  if (auth) {
-    if (auth.usesFactory) {
-      if (!hasBinding(source, "authDecoder")) {
-        specs.push({
-          names: ["createAuthDecoder"],
-          from: auth.decoderPackage
-        });
-      }
-    } else {
-      specs.push({ names: ["authDecoder"], from: auth.decoderPackage });
-    }
-  }
-  specs.push({
-    names: auth ? ["cedarUploadsPlugin", "createUploadAuthenticator"] : ["cedarUploadsPlugin"],
-    from: "@cedarjs/uploads"
-  });
-  if (auth) {
-    const authNames = ["getCurrentUser"];
-    if (auth.usesFactory && !hasBinding(source, "authDecoder")) {
-      authNames.unshift("cookieName");
-    }
-    specs.push({ names: authNames, from: "src/lib/auth" });
-  }
-  specs.push({ names: ["db"], from: "src/lib/db" });
-  specs.push({ names: ["targets"], from: "src/lib/uploads" });
-  return specs.map((spec) => ({
-    ...spec,
-    names: spec.names.filter((name) => !hasBinding(source, name))
-  })).filter((spec) => spec.names.length > 0).map((spec) => ({
-    line: `import { ${spec.names.join(", ")} } from '${spec.from}'`,
-    from: spec.from
-  }));
-}
-function findImports(lines) {
-  const imports = [];
-  for (let start = 0; start < lines.length; start++) {
-    if (!/^import\b/.test(lines[start])) {
-      continue;
-    }
-    const sideEffect = /^import\s*['"]([^'"]+)['"]/.exec(lines[start]);
-    if (sideEffect) {
-      imports.push({ start, end: start, from: sideEffect[1] });
-      continue;
-    }
-    for (let end = start; end < lines.length; end++) {
-      const from = /\bfrom\s*['"]([^'"]+)['"]/.exec(lines[end]);
-      if (from) {
-        imports.push({ start, end, from: from[1] });
-        start = end;
-        break;
-      }
-    }
-  }
-  return imports;
-}
-function importGroup(from) {
-  if (isBuiltin(from)) {
-    return 0;
-  }
-  if (from === "react") {
-    return 1;
-  }
-  if (from.startsWith("@cedarjs/")) {
-    return 3;
-  }
-  if (from.startsWith("src/")) {
-    return /^src\/[^/]+\/.+\.(?:sdl\.)?(?:js|ts)$/.test(from) ? 4 : 5;
-  }
-  if (from === ".." || from.startsWith("../")) {
-    return 6;
-  }
-  if (/^\.\/?(?:index(?:\.[jt]sx?)?)?$/.test(from)) {
-    return 8;
-  }
-  if (from.startsWith("./")) {
-    return 7;
-  }
-  return 2;
-}
-function compareSpecifiers(a, b) {
-  const segmentsA = a.toLowerCase().split("/");
-  const segmentsB = b.toLowerCase().split("/");
-  for (let i = 0; i < Math.min(segmentsA.length, segmentsB.length); i++) {
-    if (segmentsA[i] !== segmentsB[i]) {
-      return segmentsA[i] < segmentsB[i] ? -1 : 1;
-    }
-  }
-  return segmentsA.length - segmentsB.length;
-}
-function insertImport(lines, serverImport) {
-  const imports = findImports(lines);
-  const group = importGroup(serverImport.from);
-  const sameGroup = imports.filter((i) => importGroup(i.from) === group);
-  if (sameGroup.length > 0) {
-    const next = sameGroup.find(
-      (i) => compareSpecifiers(i.from, serverImport.from) > 0
-    );
-    const at2 = next ? next.start : sameGroup[sameGroup.length - 1].end + 1;
-    return [...lines.slice(0, at2), serverImport.line, ...lines.slice(at2)];
-  }
-  const earlier = imports.filter((i) => importGroup(i.from) < group);
-  if (earlier.length > 0) {
-    const at2 = Math.max(...earlier.map((i) => i.end)) + 1;
-    const inserted = ["", serverImport.line];
-    if (at2 < lines.length && lines[at2].trim() !== "") {
-      inserted.push("");
-    }
-    return [...lines.slice(0, at2), ...inserted, ...lines.slice(at2)];
-  }
-  const later = imports.find((i) => importGroup(i.from) > group);
-  const at = later ? later.start : 0;
-  return [...lines.slice(0, at), serverImport.line, "", ...lines.slice(at)];
-}
-function uploadsServerRegistration(source, auth) {
-  if (!auth) {
-    return `  await server.register(cedarUploadsPlugin, {
-    tokenSecret: process.env.UPLOAD_TOKEN_SECRET,
-    targets,
-    db,
-    // Once the app has auth, bind upload tokens to the logged-in user:
-    //
-    //   authenticate: createUploadAuthenticator({ authDecoder, getCurrentUser }),
-  })
-`;
-  }
-  const decoder = auth.usesFactory && !hasBinding(source, "authDecoder") ? "  const authDecoder = createAuthDecoder(cookieName)\n\n" : "";
-  return `${decoder}  await server.register(cedarUploadsPlugin, {
-    tokenSecret: process.env.UPLOAD_TOKEN_SECRET,
-    targets,
-    db,
-    // Binds upload tokens to the logged-in user through the same auth
-    // pipeline the GraphQL server uses
-    authenticate: createUploadAuthenticator({ authDecoder, getCurrentUser }),
-  })
-`;
-}
-function hasUploadsPlugin(source) {
-  return /^[ \t]*(?:(?:await|void)\s+|(?:const|let|var)\s+\w+\s*=\s*)?[\w.]+\.register\(\s*cedarUploadsPlugin\b/m.test(
-    source
-  );
-}
-function addUploadsPlugin(source, { auth = null } = {}) {
-  if (hasUploadsPlugin(source)) {
-    return source;
-  }
-  const start = START_LINE.exec(source);
-  if (!start) {
-    throw new Error("CEDAR_UPLOADS_ERR_NO_START");
-  }
-  const withImports = uploadsServerImports(source, auth).reduce(insertImport, source.split("\n")).join("\n");
-  return withImports.replace(
-    START_LINE,
-    (line) => `${uploadsServerRegistration(source, auth)}
-${line}`
-  );
-}
-export {
-  addUploadsPlugin,
-  detectServerAuth,
-  hasBinding,
-  hasUploadsPlugin,
-  importedBindings,
-  uploadsServerImports,
-  uploadsServerRegistration
-};

package/dist/commands/setup/uploads/templates/requireUploadToken.ts.template

@@ -1,15 +0,0 @@
-import { createRequireUploadTokenDirective } from '@cedarjs/uploads'
-
-/**
- * Requires a valid upload token in the x-upload-token request header and
- * makes its claims available to the resolver through
- * `getUploadTokenPayload(context)`. The token must have been issued to the
- * requesting user.
- */
-const requireUploadToken = createRequireUploadTokenDirective({
-  secret: process.env.UPLOAD_TOKEN_SECRET ?? '',
-})
-
-export const schema = requireUploadToken.schema
-
-export default requireUploadToken

package/dist/commands/setup/uploads/templates/uploads.sdl.ts.template

@@ -1,79 +0,0 @@
-export const schema = gql`
-  type Upload {
-    id: String!
-    target: String!
-    status: String!
-    filename: String!
-    mimeType: String!
-    size: BigInt!
-    storageKey: String
-    userId: String
-    organizationId: String
-    createdAt: DateTime!
-    updatedAt: DateTime!
-  }
-
-  type UploadToken {
-    token: String!
-    """
-    The profile's constraints, echoed for client-side UX (file-picker
-    filters, pre-upload validation). The authoritative copy is inside the
-    signed token.
-    """
-    allowedMimeTypes: [String!]!
-    maxFileSize: BigInt!
-    maxFiles: Int!
-  }
-
-  type PresignedUploadUrl {
-    uploadId: String!
-    url: String!
-    method: String!
-    headers: JSON!
-  }
-
-  input CreatePresignedUploadUrlInput {
-    filename: String!
-    contentType: String!
-    size: BigInt!
-  }
-
-  input UploadFileInput {
-    filename: String!
-    mimeType: String!
-    """
-    The file's bytes, base64-encoded. Only for profiles whose target stores
-    files inline in the database.
-    """
-    data: String!
-  }
-
-  type Query {
-    """
-    Issues an upload token for a server-defined profile. The profile name
-    must match a key of \`profiles\` in api/src/lib/uploads.
-    """
-    requestUploadToken(profile: String!): UploadToken! @requireAuth
-  }
-
-  type Mutation {
-    """
-    Direct-to-storage uploads: returns a presigned URL for one file. Send the
-    upload token in the x-upload-token header.
-    """
-    createPresignedUploadUrl(
-      input: CreatePresignedUploadUrlInput!
-    ): PresignedUploadUrl! @requireAuth @requireUploadToken
-
-    """
-    Confirms a direct-to-storage upload once the client has PUT the bytes.
-    """
-    confirmUpload(uploadId: String!): Upload! @requireAuth
-
-    """
-    Stores a small file sent as base64, for profiles whose target keeps files
-    inline in the database.
-    """
-    uploadFile(profile: String!, input: UploadFileInput!): Upload! @requireAuth
-  }
-`

package/dist/commands/setup/uploads/templates/uploads.ts.template

@@ -1,98 +0,0 @@
-import {
-  acceptedContentType,
-  confirmUpload as confirmUploadRecord,
-  createPresignedUpload,
-  getUploadTokenPayload,
-  issueUploadToken,
-  resolveProfile,
-  resolveTarget,
-  storeFile,
-  UploadError,
-} from '@cedarjs/uploads'
-
-import { db } from 'src/lib/db'
-import { profiles, targets } from 'src/lib/uploads'
-
-const secret = () => {
-  if (!process.env.UPLOAD_TOKEN_SECRET) {
-    throw new Error(
-      'UPLOAD_TOKEN_SECRET is not set. Generate one with `yarn cedar generate secret` and add it to .env.',
-    )
-  }
-
-  return process.env.UPLOAD_TOKEN_SECRET
-}
-
-export const requestUploadToken = ({ profile }: { profile: string }) => {
-  return issueUploadToken({
-    profiles,
-    profile,
-    secret: secret(),
-    currentUser: context.currentUser,
-  })
-}
-
-export const createPresignedUploadUrl = ({
-  input,
-}: {
-  input: { filename: string; contentType: string; size: bigint | number }
-}) => {
-  return createPresignedUpload({
-    db,
-    targets,
-    tokenPayload: getUploadTokenPayload(context),
-    input,
-  })
-}
-
-export const confirmUpload = ({ uploadId }: { uploadId: string }) => {
-  return confirmUploadRecord({
-    db,
-    targets,
-    uploadId,
-    currentUser: context.currentUser,
-  })
-}
-
-export const uploadFile = async ({
-  profile: profileName,
-  input,
-}: {
-  profile: string
-  input: { filename: string; mimeType: string; data: string }
-}) => {
-  const profile = resolveProfile(profiles, profileName)
-  const target = resolveTarget(targets, profile.target)
-
-  if (target.providerType !== 'db') {
-    throw new UploadError(
-      'NOT_SUPPORTED',
-      `Upload profile '${profile.name}' does not store files in the database. Use an upload token instead.`,
-    )
-  }
-
-  // Checked by what the bytes are, not the type the client claimed, and
-  // stored under the type returned
-  const data = Buffer.from(input.data, 'base64')
-  const mimeType = acceptedContentType(
-    data,
-    profile.allowedMimeTypes,
-    input.mimeType,
-  )
-
-  if (!mimeType) {
-    throw new UploadError(
-      'MIME_TYPE_NOT_ALLOWED',
-      `That file is not a type allowed for upload profile '${profile.name}'.`,
-    )
-  }
-
-  return storeFile(target, {
-    db,
-    filename: input.filename,
-    mimeType,
-    data,
-    maxSize: profile.maxFileSize,
-    userId: context.currentUser ? String(context.currentUser.id) : undefined,
-  })
-}

package/dist/commands/setup/uploads/templates/withDataUri.ts.template

@@ -1,14 +0,0 @@
-import { createWithDataUriDirective } from '@cedarjs/uploads'
-
-import { db } from 'src/lib/db'
-import { targets } from 'src/lib/uploads'
-
-/**
- * Resolves a field holding an Upload id to a base64 data: URI of the file.
- * Every resolved field embeds the whole file, so use it for small files only.
- */
-const withDataUri = createWithDataUriDirective({ db, targets })
-
-export const schema = withDataUri.schema
-
-export default withDataUri

package/dist/commands/setup/uploads/templates/withSignedUrl.ts.template

@@ -1,16 +0,0 @@
-import { createWithSignedUrlDirective } from '@cedarjs/uploads'
-
-import { db } from 'src/lib/db'
-import { targets } from 'src/lib/uploads'
-
-/**
- * Resolves a field holding an Upload id to a time-limited URL for the file,
- * from whichever storage target holds it. Files download by default; pass
- * `disposition: 'inline'` to render them in the browser instead, and only
- * for MIME types you trust.
- */
-const withSignedUrl = createWithSignedUrlDirective({ db, targets })
-
-export const schema = withSignedUrl.schema
-
-export default withSignedUrl

package/dist/commands/test/viteVersionCheck.js

@@ -1,75 +0,0 @@
-import fs from "node:fs";
-import { createRequire } from "node:module";
-import path from "node:path";
-import { getPaths } from "@cedarjs/project-config";
-function resolvePackage(fromFile, packageName) {
-  try {
-    const require2 = createRequire(fromFile);
-    const packageJsonPath = require2.resolve(`${packageName}/package.json`);
-    const packageJson = JSON.parse(
-      fs.readFileSync(packageJsonPath, "utf-8")
-    );
-    if (typeof packageJson !== "object" || packageJson === null || !("version" in packageJson) || typeof packageJson.version !== "string") {
-      return void 0;
-    }
-    return {
-      version: packageJson.version,
-      dir: path.dirname(packageJsonPath)
-    };
-  } catch {
-    return void 0;
-  }
-}
-function resolveViteVersions({
-  projectBase,
-  webBase
-}) {
-  const vitest = resolvePackage(
-    path.join(projectBase, "package.json"),
-    "vitest"
-  );
-  const vitestVite = vitest ? resolvePackage(path.join(vitest.dir, "package.json"), "vite") : void 0;
-  const cedarVite = resolvePackage(
-    path.join(webBase, "package.json"),
-    "@cedarjs/vite"
-  );
-  const frameworkVite = cedarVite ? resolvePackage(path.join(cedarVite.dir, "package.json"), "vite") : void 0;
-  return { vitestVite, frameworkVite };
-}
-function getViteVersionMismatchMessage({
-  vitestVite,
-  frameworkVite
-}) {
-  if (!vitestVite || !frameworkVite) {
-    return void 0;
-  }
-  if (vitestVite.version === frameworkVite.version) {
-    return void 0;
-  }
-  return `Vitest is using Vite ${vitestVite.version} from
-  ${vitestVite.dir}
-but CedarJS is built against Vite ${frameworkVite.version} from
-  ${frameworkVite.dir}
-
-The CedarJS Vite plugins only work with the Vite version they're built against, so web tests can't run while Vitest uses a different copy. This happens when the project doesn't pin \`vite\`, because Vitest accepts a wide range of Vite versions and installs the newest one.
-
-Please add an override/resolution that pins vite to ${frameworkVite.version}, then reinstall your dependencies.`;
-}
-function assertSingleViteVersion() {
-  const cedarPaths = getPaths();
-  const message = getViteVersionMismatchMessage(
-    resolveViteVersions({
-      projectBase: cedarPaths.base,
-      webBase: cedarPaths.web.base
-    })
-  );
-  if (message) {
-    console.error(message);
-    process.exit(1);
-  }
-}
-export {
-  assertSingleViteVersion,
-  getViteVersionMismatchMessage,
-  resolveViteVersions
-};