Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions crates/bindings-typescript/src/server/procedures.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,13 @@ function registerProcedure<
Ret extends TypeBuilder<any, any>,
>(
ctx: SchemaInner,
name: string,
exportName: string,
params: Params,
ret: Ret,
fn: ProcedureFn<S, Params, Ret>
fn: ProcedureFn<S, Params, Ret>,
opts?: ProcedureOpts
) {
ctx.defineFunction(name);
ctx.defineFunction(exportName);
const paramsType: ProductType = {
elements: Object.entries(params).map(([n, c]) => ({
name: n,
Expand All @@ -118,12 +119,21 @@ function registerProcedure<
const returnType = ctx.registerTypesRecursively(ret).algebraicType;

ctx.moduleDef.procedures.push({
sourceName: name,
sourceName: exportName,
params: paramsType,
returnType,
visibility: FunctionVisibility.ClientCallable,
});

if (opts?.name != null) {
ctx.moduleDef.explicitNames.entries.push({
tag: 'Function',
value: {
sourceName: exportName,
canonicalName: opts.name,
},
});
}
const { typespace } = ctx;

ctx.procedures.push({
Expand Down
29 changes: 19 additions & 10 deletions crates/bindings-typescript/src/server/reducers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,13 @@ export function makeReducerExport<
fn: Reducer<any, any>,
lifecycle?: Lifecycle
): ReducerExport<S, Params> {
const name = opts?.name;

const reducerExport: ReducerExport<S, Params> = (...args) => fn(...args);
reducerExport[exportContext] = ctx;
reducerExport[registerExport] = (ctx, exportName) => {
registerReducer(ctx, name ?? exportName, params, fn, lifecycle);
registerReducer(ctx, exportName, params, fn, opts, lifecycle);
ctx.functionExports.set(
reducerExport as ReducerExport<any, any>,
name ?? exportName
exportName
);
};

Expand All @@ -56,27 +54,28 @@ export function makeReducerExport<
*/
export function registerReducer(
ctx: SchemaInner,
name: string,
exportName: string,
params: RowObj | RowBuilder<RowObj>,
fn: Reducer<any, any>,
opts?: ReducerOpts,
lifecycle?: Lifecycle
): void {
ctx.defineFunction(name);
ctx.defineFunction(exportName);

if (!(params instanceof RowBuilder)) {
params = new RowBuilder(params);
}

if (params.typeName === undefined) {
params.typeName = toPascalCase(name);
params.typeName = toPascalCase(exportName);
}

const ref = ctx.registerTypesRecursively(params);
const paramsType = ctx.resolveType(ref).value;
const isLifecycle = lifecycle != null;

ctx.moduleDef.reducers.push({
sourceName: name,
sourceName: exportName,
params: paramsType,
//ModuleDef validation code is responsible to mark private reducers
visibility: FunctionVisibility.ClientCallable,
Expand All @@ -85,17 +84,27 @@ export function registerReducer(
errReturnType: AlgebraicType.String,
});

if (opts?.name != null) {
ctx.moduleDef.explicitNames.entries.push({
tag: 'Function',
value: {
sourceName: exportName,
canonicalName: opts.name,
},
});
}

if (isLifecycle) {
ctx.moduleDef.lifeCycleReducers.push({
lifecycleSpec: lifecycle,
functionName: name,
functionName: exportName,
});
}

// If the function isn't named (e.g. `function foobar() {}`), give it the same
// name as the reducer so that it's clear what it is in in backtraces.
if (!fn.name) {
Object.defineProperty(fn, 'name', { value: name, writable: false });
Object.defineProperty(fn, 'name', { value: exportName, writable: false });
}

ctx.reducers.push(fn);
Expand Down
4 changes: 2 additions & 2 deletions crates/codegen/src/rust.rs
Original file line number Diff line number Diff line change
Expand Up @@ -735,7 +735,7 @@ pub struct {cols_ix} {{"
.iter()
.find(|col| col.col_id == cols.as_singleton().expect("singleton column"))
.unwrap();
let field_name = column.accessor_name.deref();
let field_name = column.accessor_name.deref().to_case(Case::Snake);
let field_type = type_name(module, &column.ty_for_generate);

writeln!(
Expand Down Expand Up @@ -763,7 +763,7 @@ impl __sdk::__query_builder::HasIxCols for {struct_name} {{
.iter()
.find(|col| col.col_id == cols.as_singleton().expect("singleton column"))
.expect("singleton column");
let field_name = column.accessor_name.deref();
let field_name = column.accessor_name.deref().to_case(Case::Snake);
let col_name = column.name.deref();

writeln!(
Expand Down
Loading