@columnus/shared 0.1.56 → 0.1.59

package/dist/schemaGenerator.d.ts

@@ -1,13 +1,4 @@
 import { type Manifest } from "./schemaTypes.ts";
-/**
- * How `image`/`file` fields are validated in generated `schema.ts`.
- *
- * `storage-or-assets` is the G14 cutover window: Convex will not push a
- * schema that existing documents fail, so the first deploy must still accept
- * legacy `_storage` ids. After `migrateLegacyAssetFieldsPage` rewrites those
- * values, the second deploy uses `assets`.
- */
-export type AssetFieldIdContract = "assets" | "storage-or-assets";
 export type GenerateSchemaOptions = {
     includeColumnusTables?: boolean;
     /** @deprecated Use includeColumnusTables */
@@ -20,14 +11,6 @@ export type GenerateSchemaOptions = {
     includeAuditTable?: boolean;
     /** When includeColumnusTables, omit columnus_display_values (owned by @columnus/component). Default true. */
     includeDisplayValuesTable?: boolean;
-    /** Default `assets`. Use `storage-or-assets` only for the G14 first push. */
-    assetFieldIds?: AssetFieldIdContract;
-    /**
-     * Convex document validation on push. Default true. The G14 first push sets
-     * this false so existing `_storage` field values cannot block the kernel that
-     * contains the migrator.
-     */
-    schemaValidation?: boolean;
 };
 /** User tables only — component tables live in @columnus/component. */
 export declare const HOST_SCHEMA_PROFILE: {
@@ -51,5 +34,3 @@ export declare const ASSET_REFS_TABLE_NAME = "columnus_asset_refs";
 export declare const ASSET_PROFILES_TABLE_NAME = "columnus_asset_profiles";
 export declare const ASSET_SETTINGS_TABLE_NAME = "columnus_asset_settings";
 export declare function generateSchemaTs(manifest: Manifest, opts?: GenerateSchemaOptions): string;
-/** True when G14 must loosen `image`/`file` validators before rewriting `_storage` ids. */
-export declare function manifestHasFileOrImageFields(manifest: Manifest): boolean;

package/dist/schemaGenerator.js

@@ -4591,9 +4591,8 @@ function generateSchemaTs(manifest, opts) {
   const includeManifestTable = opts?.includeManifestTable ?? true;
   const includeAuditTable = opts?.includeAuditTable ?? true;
   const includeDisplayValuesTable = opts?.includeDisplayValuesTable ?? true;
-  const assetFieldIds = opts?.assetFieldIds ?? "assets";
   const userTables = [...manifest.tables].sort((a, b) => a.name.localeCompare(b.name));
-  const userBody = userTables.map((t) => `  ${t.name}: ${renderTable(t, assetFieldIds)},`).join("\n");
+  const userBody = userTables.map((t) => `  ${t.name}: ${renderTable(t)},`).join("\n");
   let body;
   if (includeColumnusTables) {
     const columnusSource = columnusTablesSource({
@@ -4609,15 +4608,14 @@ function generateSchemaTs(manifest, opts) {
   const banner = includeColumnusTables ? BANNER : CONSUMER_BANNER;
   const schemaBody = body ? `${body}
 ` : "";
-  const schemaOpts = opts?.schemaValidation === false ? ", { schemaValidation: false }" : "";
   return `${banner}import { defineSchema, defineTable } from "convex/server";
 import { v } from "convex/values";
 
 export default defineSchema({
-${schemaBody}}${schemaOpts});
+${schemaBody}});
 `;
 }
-function renderTable(t, assetFieldIds) {
+function renderTable(t) {
   const fields = isAssetTable(t) ? [
     ...t.fields,
     {
@@ -4628,7 +4626,7 @@ function renderTable(t, assetFieldIds) {
   ] : t.fields;
   const fieldsBlock = fields.length ? `{
 ${fields.map((f) => {
-    const inner = renderType(f.type, assetFieldIds);
+    const inner = renderType(f.type);
     const value = f.optional ? `v.optional(${inner})` : inner;
     return `    ${f.name}: ${value},`;
   }).join("\n")}
@@ -4652,20 +4650,7 @@ ${fields.map((f) => {
   }
   return out;
 }
-function renderAssetIdType(assetFieldIds) {
-  const assetId = `v.id(${JSON.stringify(ASSETS_TABLE_NAME)})`;
-  switch (assetFieldIds) {
-    case "storage-or-assets":
-      return `v.union(v.id("_storage"), ${assetId})`;
-    case "assets":
-      return assetId;
-    default: {
-      const _exhaustive = assetFieldIds;
-      return _exhaustive;
-    }
-  }
-}
-function renderType(t, assetFieldIds) {
+function renderType(t) {
   switch (t.kind) {
     case "string":
     case "markdown":
@@ -4687,63 +4672,28 @@ function renderType(t, assetFieldIds) {
       return "v.bytes()";
     case "file":
     case "image":
-      return renderAssetIdType(assetFieldIds);
+      return `v.id(${JSON.stringify(ASSETS_TABLE_NAME)})`;
     case "id":
       return `v.id(${JSON.stringify(t.table)})`;
     case "literal":
       return `v.literal(${JSON.stringify(t.value)})`;
     case "array":
-      return `v.array(${renderType(t.element, assetFieldIds)})`;
+      return `v.array(${renderType(t.element)})`;
     case "object": {
       if (t.fields.length === 0) return `v.object({})`;
       const inner = t.fields.map((f) => {
-        const inner2 = renderType(f.type, assetFieldIds);
+        const inner2 = renderType(f.type);
         const value = f.optional ? `v.optional(${inner2})` : inner2;
         return `${f.name}: ${value}`;
       }).join(", ");
       return `v.object({ ${inner} })`;
     }
     case "union":
-      return `v.union(${t.options.map((option) => renderType(option, assetFieldIds)).join(", ")})`;
+      return `v.union(${t.options.map((option) => renderType(option)).join(", ")})`;
   }
   throw new Error(`unknown field kind: ${t.kind}`);
 }
-function fieldTypeContainsFileOrImage(t) {
-  switch (t.kind) {
-    case "file":
-    case "image":
-      return true;
-    case "array":
-      return fieldTypeContainsFileOrImage(t.element);
-    case "object":
-      return t.fields.some((field) => fieldTypeContainsFileOrImage(field.type));
-    case "union":
-      return t.options.some(fieldTypeContainsFileOrImage);
-    case "string":
-    case "markdown":
-    case "number":
-    case "boolean":
-    case "bigint":
-    case "null":
-    case "any":
-    case "bytes":
-    case "date":
-    case "datetime":
-    case "id":
-    case "literal":
-      return false;
-    default: {
-      const _exhaustive = t;
-      return _exhaustive;
-    }
-  }
-}
-function manifestHasFileOrImageFields(manifest) {
-  return manifest.tables.some(
-    (table) => table.fields.some((field) => fieldTypeContainsFileOrImage(field.type))
-  );
-}
 
-export { API_DELIVERY_TABLE_NAME, API_OUTBOX_TABLE_NAME, API_OUTPUTS_TABLE_NAME, API_OUTPUT_SECRETS_TABLE_NAME, API_PROFILES_TABLE_NAME, API_SYNC_ROUTES_TABLE_NAME, API_TOKENS_TABLE_NAME, ASSETS_TABLE_NAME, ASSET_PROFILES_TABLE_NAME, ASSET_REFS_TABLE_NAME, ASSET_SETTINGS_TABLE_NAME, ASSET_VERSIONS_TABLE_NAME, AUDIT_TABLE_NAME, DISPLAY_VALUES_TABLE_NAME, HOST_SCHEMA_PROFILE, INCOMING_REFS_TABLE_NAME, MANIFEST_TABLE_NAME, SPACES_TABLE_NAME, generateSchemaTs, manifestHasFileOrImageFields };
+export { API_DELIVERY_TABLE_NAME, API_OUTBOX_TABLE_NAME, API_OUTPUTS_TABLE_NAME, API_OUTPUT_SECRETS_TABLE_NAME, API_PROFILES_TABLE_NAME, API_SYNC_ROUTES_TABLE_NAME, API_TOKENS_TABLE_NAME, ASSETS_TABLE_NAME, ASSET_PROFILES_TABLE_NAME, ASSET_REFS_TABLE_NAME, ASSET_SETTINGS_TABLE_NAME, ASSET_VERSIONS_TABLE_NAME, AUDIT_TABLE_NAME, DISPLAY_VALUES_TABLE_NAME, HOST_SCHEMA_PROFILE, INCOMING_REFS_TABLE_NAME, MANIFEST_TABLE_NAME, SPACES_TABLE_NAME, generateSchemaTs };
 //# sourceMappingURL=schemaGenerator.js.map
 //# sourceMappingURL=schemaGenerator.js.map