@supawatch/target-valibot 0.7.1 → 0.8.0

package/dist/index.d.ts

@@ -2,13 +2,13 @@ import type { Rendered, Snapshot, Table, Target, TargetCapabilities, TargetOptio
 export interface ValibotTargetOptions extends TargetOptions {
     strict?: boolean;
 }
-export declare function exportNameFor(table: Table): string;
+export declare function exportNameFor(table: Table, snapshot: Snapshot): string;
 export declare class ValibotTarget implements Target<ValibotTargetOptions> {
     readonly name = "valibot";
     readonly fileExtension = ".mjs";
     readonly capabilities: TargetCapabilities;
-    renderTable(table: Table, _snapshot: Snapshot, opts: ValibotTargetOptions): Rendered;
-    renderTypes(table: Table, _snapshot: Snapshot, opts: ValibotTargetOptions): string;
+    renderTable(table: Table, snapshot: Snapshot, opts: ValibotTargetOptions): Rendered;
+    renderTypes(table: Table, snapshot: Snapshot, opts: ValibotTargetOptions): string;
     verifier(): Verifier;
 }
 export default ValibotTarget;

package/dist/index.js

@@ -1,5 +1,6 @@
 import { pathToFileURL } from "node:url";
 import * as v from "valibot";
+import { exportBaseName, fileBaseName } from "@supawatch/core";
 function valibotExpr(runtime) {
     switch (runtime.kind) {
         case "number":
@@ -50,11 +51,11 @@ function tsType(runtime) {
             return runtime.labels.map((l) => JSON.stringify(l)).join(" | ");
     }
 }
-export function exportNameFor(table) {
-    return table.name.replace(/[^a-zA-Z0-9_]/g, "_") + "Row";
+export function exportNameFor(table, snapshot) {
+    return exportBaseName(table, snapshot) + "Row";
 }
-function baseNameFor(table) {
-    return table.name.replace(/[^a-zA-Z0-9_]/g, "_");
+function baseNameFor(table, snapshot) {
+    return exportBaseName(table, snapshot);
 }
 function fieldSchema(col) {
     const base = valibotExpr(col.runtime);
@@ -91,30 +92,30 @@ export class ValibotTarget {
         brandedTypes: true,
         dateInstances: true,
     };
-    renderTable(table, _snapshot, opts) {
+    renderTable(table, snapshot, opts) {
         const strict = opts.strict !== false;
         const ctor = strict ? "v.strictObject" : "v.object";
         const fields = table.columns
             .map((col) => `  ${JSON.stringify(col.name)}: ${fieldSchema(col)},`)
             .join("\n");
         const parts = [
-            `export const ${exportNameFor(table)} = ${ctor}({\n${fields}\n});`,
+            `export const ${exportNameFor(table, snapshot)} = ${ctor}({\n${fields}\n});`,
         ];
         if (opts.emit?.insert && table.kind === "table") {
-            parts.push(variantBody(table, ctor, `${baseNameFor(table)}Insert`, insertOptional));
+            parts.push(variantBody(table, ctor, `${baseNameFor(table, snapshot)}Insert`, insertOptional));
         }
         if (opts.emit?.update && table.kind === "table") {
-            parts.push(variantBody(table, ctor, `${baseNameFor(table)}Update`, () => true));
+            parts.push(variantBody(table, ctor, `${baseNameFor(table, snapshot)}Update`, () => true));
         }
         return {
             imports: [{ from: "valibot", namespace: "v" }],
             body: parts.join("\n\n"),
-            exportName: exportNameFor(table),
+            exportName: exportNameFor(table, snapshot),
         };
     }
-    renderTypes(table, _snapshot, opts) {
-        const name = exportNameFor(table);
-        const base = baseNameFor(table);
+    renderTypes(table, snapshot, opts) {
+        const name = exportNameFor(table, snapshot);
+        const base = baseNameFor(table, snapshot);
         const rowType = `${base}RowType`;
         const typeOf = (col) => {
             const override = jsonOverrideFor(table, col, opts.jsonTypes);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@supawatch/target-valibot",
-  "version": "0.7.1",
+  "version": "0.8.0",
   "description": "Valibot schemas generated from live Postgres by supawatch, mapped to what the driver actually returns.",
   "keywords": [
     "supabase",
@@ -33,7 +33,7 @@
   ],
   "dependencies": {
     "valibot": "^1.1.0",
-    "@supawatch/core": "0.7.1"
+    "@supawatch/core": "0.8.0"
   },
   "peerDependencies": {
     "valibot": "^1.0.0"