@tinybirdco/sdk 0.0.67 → 0.0.68

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (16) hide show
  1. package/dist/generator/pipe.d.ts.map +1 -1
  2. package/dist/generator/pipe.js +45 -17
  3. package/dist/generator/pipe.js.map +1 -1
  4. package/dist/generator/pipe.test.js +61 -4
  5. package/dist/generator/pipe.test.js.map +1 -1
  6. package/dist/schema/params.d.ts +4 -0
  7. package/dist/schema/params.d.ts.map +1 -1
  8. package/dist/schema/params.js +8 -0
  9. package/dist/schema/params.js.map +1 -1
  10. package/dist/schema/params.test.js +5 -0
  11. package/dist/schema/params.test.js.map +1 -1
  12. package/package.json +1 -1
  13. package/src/generator/pipe.test.ts +75 -4
  14. package/src/generator/pipe.ts +64 -20
  15. package/src/schema/params.test.ts +6 -0
  16. package/src/schema/params.ts +14 -0
package/dist/generator/pipe.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"pipe.d.ts","sourceRoot":"","sources":["../../src/generator/pipe.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EACV,cAAc,EAOf,MAAM,mBAAmB,CAAC;AAU3B;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,gBAAgB;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,uCAAuC;IACvC,OAAO,EAAE,MAAM,CAAC;CACjB;AA4PD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgDG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,cAAc,GAAG,aAAa,CAyDhE;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,GACpC,aAAa,EAAE,CAEjB"}
1
+ {"version":3,"file":"pipe.d.ts","sourceRoot":"","sources":["../../src/generator/pipe.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EACV,cAAc,EAOf,MAAM,mBAAmB,CAAC;AAe3B;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,gBAAgB;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,uCAAuC;IACvC,OAAO,EAAE,MAAM,CAAC;CACjB;AAmSD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgDG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,cAAc,GAAG,aAAa,CAyDhE;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,GACpC,aAAa,EAAE,CAEjB"}
package/dist/generator/pipe.js CHANGED
@@ -3,7 +3,7 @@
3
3
  * Converts PipeDefinition to native .pipe file format
4
4
  */
5
5
  import { getEndpointConfig, getMaterializedConfig, getCopyConfig, getSinkConfig, } from "../schema/pipe.js";
6
- import { getParamDefault } from "../schema/params.js";
6
+ import { getParamDefault, getParamDescription, getParamRequiredModifier, isParamRequired, } from "../schema/params.js";
7
7
  /**
8
8
  * Check if SQL contains Jinja template syntax like {{...}} or {%...%}
9
9
  */
@@ -59,18 +59,42 @@ function toTemplateDefaultLiteral(value) {
59
59
  }
60
60
  return String(value);
61
61
  }
62
- function applyParamDefaultsToSql(sql, params) {
63
- if (!params) {
64
- return sql;
65
- }
66
- const defaults = new Map();
67
- for (const [name, validator] of Object.entries(params)) {
68
- const defaultValue = getParamDefault(validator);
69
- if (defaultValue !== undefined) {
70
- defaults.set(name, toTemplateDefaultLiteral(defaultValue));
62
+ function toTemplateStringLiteral(value) {
63
+ return JSON.stringify(value);
64
+ }
65
+ function hasKeywordArg(args, key) {
66
+ const keyLower = key.toLowerCase();
67
+ return args.some((arg) => {
68
+ const equalsIndex = arg.indexOf("=");
69
+ if (equalsIndex <= 0) {
70
+ return false;
71
71
  }
72
+ return arg.slice(0, equalsIndex).trim().toLowerCase() === keyLower;
73
+ });
74
+ }
75
+ function hasPositionalDefaultArg(args) {
76
+ return args.slice(1).some((arg) => !/^[a-zA-Z_][a-zA-Z0-9_]*\s*=/.test(arg.trim()));
77
+ }
78
+ function buildParamTemplateArgs(args, validator) {
79
+ const nextArgs = [...args];
80
+ const defaultValue = getParamDefault(validator);
81
+ if (defaultValue !== undefined &&
82
+ !hasPositionalDefaultArg(nextArgs) &&
83
+ !hasKeywordArg(nextArgs, "default")) {
84
+ nextArgs.push(toTemplateDefaultLiteral(defaultValue));
72
85
  }
73
- if (defaults.size === 0) {
86
+ const requiredModifier = getParamRequiredModifier(validator);
87
+ if (requiredModifier && !hasKeywordArg(nextArgs, "required")) {
88
+ nextArgs.push(`required=${isParamRequired(validator) ? "True" : "False"}`);
89
+ }
90
+ const description = getParamDescription(validator);
91
+ if (description !== undefined && !hasKeywordArg(nextArgs, "description")) {
92
+ nextArgs.push(`description=${toTemplateStringLiteral(description)}`);
93
+ }
94
+ return nextArgs;
95
+ }
96
+ function applyParamMetadataToSql(sql, params) {
97
+ if (!params) {
74
98
  return sql;
75
99
  }
76
100
  const placeholderRegex = /\{\{\s*([^{}]+?)\s*\}\}/g;
@@ -78,18 +102,22 @@ function applyParamDefaultsToSql(sql, params) {
78
102
  const expression = String(rawExpression);
79
103
  const rewritten = expression.replace(/([a-zA-Z_][a-zA-Z0-9_]*)\s*\(([^()]*)\)/g, (call, _functionName, rawArgs) => {
80
104
  const args = splitTopLevelComma(String(rawArgs));
81
- if (args.length !== 1) {
105
+ if (args.length === 0) {
82
106
  return call;
83
107
  }
84
108
  const paramName = args[0]?.trim() ?? "";
85
109
  if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(paramName)) {
86
110
  return call;
87
111
  }
88
- const defaultLiteral = defaults.get(paramName);
89
- if (!defaultLiteral) {
112
+ const validator = params[paramName];
113
+ if (!validator) {
114
+ return call;
115
+ }
116
+ const nextArgs = buildParamTemplateArgs(args, validator);
117
+ if (nextArgs.length === args.length) {
90
118
  return call;
91
119
  }
92
- return call.replace(/\)\s*$/, `, ${defaultLiteral})`);
120
+ return call.replace(/\([^()]*\)\s*$/, `(${nextArgs.join(", ")})`);
93
121
  });
94
122
  if (rewritten === expression) {
95
123
  return fullMatch;
@@ -113,8 +141,8 @@ function generateNode(node, params) {
113
141
  if (isDynamic) {
114
142
  parts.push(` %`);
115
143
  }
116
- const sqlWithDefaults = applyParamDefaultsToSql(node.sql, params);
117
- const sqlLines = sqlWithDefaults.trim().split("\n");
144
+ const sqlWithParamMetadata = applyParamMetadataToSql(node.sql, params);
145
+ const sqlLines = sqlWithParamMetadata.trim().split("\n");
118
146
  sqlLines.forEach((line) => {
119
147
  parts.push(` ${line}`);
120
148
  });
package/dist/generator/pipe.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"pipe.js","sourceRoot":"","sources":["../../src/generator/pipe.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"pipe.js","sourceRoot":"","sources":["../../src/generator/pipe.ts"],"names":[],"mappings":"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"}
package/dist/generator/pipe.test.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import { describe, it, expect } from 'vitest';
2
2
  import { generatePipe, generateAllPipes } from './pipe.js';
3
- import { definePipe, defineMaterializedView, defineSinkPipe, node } from '../schema/pipe.js';
3
+ import { definePipe, defineEndpoint, defineMaterializedView, defineSinkPipe, node } from '../schema/pipe.js';
4
4
  import { defineDatasource } from '../schema/datasource.js';
5
5
  import { defineKafkaConnection, defineS3Connection } from '../schema/connection.js';
6
6
  import { defineToken } from '../schema/token.js';
@@ -159,8 +159,8 @@ describe('Pipe Generator', () => {
159
159
  endpoint: true,
160
160
  });
161
161
  const result = generatePipe(pipe);
162
- expect(result.content).toContain("{{ Date(start_date, '2025-03-01') }}");
163
- expect(result.content).toContain('{{ Int32(page, 0) }}');
162
+ expect(result.content).toContain("{{ Date(start_date, '2025-03-01', required=False) }}");
163
+ expect(result.content).toContain('{{ Int32(page, 0, required=False) }}');
164
164
  });
165
165
  });
166
166
  describe('Multiple nodes', () => {
@@ -223,6 +223,63 @@ describe('Pipe Generator', () => {
223
223
  const result = generatePipe(pipe);
224
224
  expect(result.content).toContain('CACHE 60');
225
225
  });
226
+ it('emits explicit required and description metadata for endpoint params', () => {
227
+ const pipe = definePipe('account_demos', {
228
+ params: {
229
+ id: p.string().required().describe('The company account ID'),
230
+ workspaceId: p.string().required().describe('The workspace ID'),
231
+ },
232
+ nodes: [
233
+ node({
234
+ name: 'endpoint',
235
+ sql: `
236
+ SELECT *
237
+ FROM events
238
+ WHERE workspaceId = {{ String(workspaceId) }}
239
+ AND companyAccountId = {{ String(id) }}
240
+ `.trim(),
241
+ }),
242
+ ],
243
+ output: simpleOutput,
244
+ endpoint: true,
245
+ });
246
+ const result = generatePipe(pipe);
247
+ expect(result.content).toContain('{{ String(workspaceId, required=True, description="The workspace ID") }}');
248
+ expect(result.content).toContain('{{ String(id, required=True, description="The company account ID") }}');
249
+ });
250
+ it('emits optional metadata without duplicating existing default or description args', () => {
251
+ const pipe = definePipe('test_pipe', {
252
+ params: {
253
+ limit: p.int32().optional(10).describe('Number of rows'),
254
+ },
255
+ nodes: [
256
+ node({
257
+ name: 'endpoint',
258
+ sql: 'SELECT * FROM events LIMIT {{ Int32(limit, 10, description="Existing") }}',
259
+ }),
260
+ ],
261
+ output: simpleOutput,
262
+ endpoint: true,
263
+ });
264
+ const result = generatePipe(pipe);
265
+ expect(result.content).toContain('{{ Int32(limit, 10, description="Existing", required=False) }}');
266
+ });
267
+ it('emits param metadata for defineEndpoint helper', () => {
268
+ const pipe = defineEndpoint('test_endpoint', {
269
+ params: {
270
+ workspaceId: p.string().required().describe('The workspace ID'),
271
+ },
272
+ nodes: [
273
+ node({
274
+ name: 'endpoint',
275
+ sql: 'SELECT * FROM events WHERE workspaceId = {{ String(workspaceId) }}',
276
+ }),
277
+ ],
278
+ output: simpleOutput,
279
+ });
280
+ const result = generatePipe(pipe);
281
+ expect(result.content).toContain('{{ String(workspaceId, required=True, description="The workspace ID") }}');
282
+ });
226
283
  });
227
284
  describe('generateAllPipes', () => {
228
285
  it('generates all pipes', () => {
@@ -281,7 +338,7 @@ LIMIT {{Int32(limit, 10)}}
281
338
  expect(result.content).toContain(' %\n');
282
339
  expect(result.content).toContain('pathname');
283
340
  expect(result.content).toContain('{{DateTime(start_date)}}');
284
- expect(result.content).toContain('{{Int32(limit, 10)}}');
341
+ expect(result.content).toContain('{{ Int32(limit, 10, required=False) }}');
285
342
  expect(result.content).toContain('TYPE endpoint');
286
343
  });
287
344
  });
package/dist/generator/pipe.test.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"pipe.test.js","sourceRoot":"","sources":["../../src/generator/pipe.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"pipe.test.js","sourceRoot":"","sources":["../../src/generator/pipe.test.ts"],"names":[],"mappings":"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"}
package/dist/schema/params.d.ts CHANGED
@@ -18,6 +18,8 @@ export interface ParamValidator<TType, TTinybirdType extends string = string, TR
18
18
  readonly _default?: TType;
19
19
  /** Description for documentation */
20
20
  readonly _description?: string;
21
+ /** Whether required/optional was explicitly set by a modifier */
22
+ readonly _requiredModifier?: "required" | "optional";
21
23
  /** Make this parameter optional with an optional default value */
22
24
  optional<TDefault extends TType | undefined = undefined>(defaultValue?: TDefault): ParamValidator<TDefault extends undefined ? TType | undefined : TType, TTinybirdType, false>;
23
25
  /** Make this parameter required (default) */
@@ -102,5 +104,7 @@ export declare function isParamRequired(validator: AnyParamValidator): boolean;
102
104
  export declare function getParamDefault<T>(validator: ParamValidator<T, string, boolean>): T | undefined;
103
105
  /** Get the description of a parameter */
104
106
  export declare function getParamDescription(validator: AnyParamValidator): string | undefined;
107
+ /** Check whether required/optional was explicitly set by a modifier */
108
+ export declare function getParamRequiredModifier(validator: AnyParamValidator): "required" | "optional" | undefined;
105
109
  export {};
106
110
  //# sourceMappingURL=params.d.ts.map
package/dist/schema/params.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"params.d.ts","sourceRoot":"","sources":["../../src/schema/params.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,QAAA,MAAM,WAAW,eAA+B,CAAC;AAEjD;;GAEG;AACH,MAAM,WAAW,cAAc,CAC7B,KAAK,EACL,aAAa,SAAS,MAAM,GAAG,MAAM,EACrC,SAAS,SAAS,OAAO,GAAG,IAAI;IAEhC,QAAQ,CAAC,CAAC,WAAW,CAAC,EAAE,IAAI,CAAC;IAC7B,mCAAmC;IACnC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IACtB,iDAAiD;IACjD,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IACtC,yCAAyC;IACzC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IAC9B,gCAAgC;IAChC,QAAQ,CAAC,QAAQ,CAAC,EAAE,KAAK,CAAC;IAC1B,oCAAoC;IACpC,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAE/B,kEAAkE;IAClE,QAAQ,CAAC,QAAQ,SAAS,KAAK,GAAG,SAAS,GAAG,SAAS,EACrD,YAAY,CAAC,EAAE,QAAQ,GACtB,cAAc,CACf,QAAQ,SAAS,SAAS,GAAG,KAAK,GAAG,SAAS,GAAG,KAAK,EACtD,aAAa,EACb,KAAK,CACN,CAAC;IAEF,6CAA6C;IAC7C,QAAQ,IAAI,cAAc,CAAC,KAAK,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC;IAEvD,2CAA2C;IAC3C,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,cAAc,CAAC,KAAK,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC;CAChF;AAoED;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,CAAC;IAGZ,uBAAuB;;IAGvB,qBAAqB;;IAKrB,qBAAqB;;IAGrB,sBAAsB;;IAGtB,sBAAsB;;IAGtB,sBAAsB;;IAGtB,sBAAsB;;IAGtB,uBAAuB;;IAGvB,uBAAuB;;IAGvB,uBAAuB;;IAKvB,wBAAwB;;IAGxB,wBAAwB;;IAKxB,wBAAwB;;IAKxB,0DAA0D;;IAG1D,gFAAgF;;IAGhF,iGAAiG;;IAKjG;;;;OAIG;qBACK,QAAQ,SAAS,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,YACrD,QAAQ,eACL,MAAM,KAClB,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC;IAOrD;;;OAGG;;IAGH;;OAEG;oBACI,MAAM;CACL,CAAC;AAEX,6CAA6C;AAC7C,MAAM,MAAM,iBAAiB,GAAG,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;AAEzE,6DAA6D;AAC7D,MAAM,MAAM,cAAc,CAAC,CAAC,SAAS,iBAAiB,IAAI,CAAC,CAAC,WAAW,CAAC,SAAS,IAAI,GACjF,CAAC,CAAC,OAAO,CAAC,GACV,CAAC,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC;AAE3B,gDAAgD;AAChD,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,iBAAiB,CAO3E;AAED,8DAA8D;AAC9D,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,iBAAiB,GAAG,MAAM,CAEzE;AAED,uCAAuC;AACvC,wBAAgB,eAAe,CAAC,SAAS,EAAE,iBAAiB,GAAG,OAAO,CAErE;AAED,2CAA2C;AAC3C,wBAAgB,eAAe,CAAC,CAAC,EAAE,SAAS,EAAE,cAAc,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,SAAS,CAE/F;AAED,yCAAyC;AACzC,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,iBAAiB,GAAG,MAAM,GAAG,SAAS,CAEpF"}
1
+ {"version":3,"file":"params.d.ts","sourceRoot":"","sources":["../../src/schema/params.ts"],"names":[],"mappings":"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"}
package/dist/schema/params.js CHANGED
@@ -14,6 +14,7 @@ function createParamValidator(tinybirdType, options = {}) {
14
14
  _required: isRequired,
15
15
  _default: options.defaultValue,
16
16
  _description: options.description,
17
+ _requiredModifier: options.requiredModifier,
17
18
  tinybirdType,
18
19
  isRequired,
19
20
  defaultValue: options.defaultValue,
@@ -23,12 +24,14 @@ function createParamValidator(tinybirdType, options = {}) {
23
24
  required: false,
24
25
  defaultValue: defaultValue,
25
26
  description: options.description,
27
+ requiredModifier: "optional",
26
28
  });
27
29
  },
28
30
  required() {
29
31
  return createParamValidator(tinybirdType, {
30
32
  required: true,
31
33
  description: options.description,
34
+ requiredModifier: "required",
32
35
  });
33
36
  },
34
37
  describe(description) {
@@ -36,6 +39,7 @@ function createParamValidator(tinybirdType, options = {}) {
36
39
  required: isRequired,
37
40
  defaultValue: options.defaultValue,
38
41
  description,
42
+ requiredModifier: options.requiredModifier,
39
43
  });
40
44
  },
41
45
  };
@@ -136,4 +140,8 @@ export function getParamDefault(validator) {
136
140
  export function getParamDescription(validator) {
137
141
  return validator._description;
138
142
  }
143
+ /** Check whether required/optional was explicitly set by a modifier */
144
+ export function getParamRequiredModifier(validator) {
145
+ return validator._requiredModifier;
146
+ }
139
147
  //# sourceMappingURL=params.js.map
package/dist/schema/params.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"params.js","sourceRoot":"","sources":["../../src/schema/params.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"params.js","sourceRoot":"","sources":["../../src/schema/params.ts"],"names":[],"mappings":"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"}
package/dist/schema/params.test.js CHANGED
@@ -92,6 +92,7 @@ describe('Parameter Validators (p.*)', () => {
92
92
  const param = p.int32().optional();
93
93
  expect(param._required).toBe(false);
94
94
  expect(param._default).toBeUndefined();
95
+ expect(param._requiredModifier).toBe('optional');
95
96
  });
96
97
  it('makes parameter optional with default value', () => {
97
98
  const param = p.int32().optional(10);
@@ -109,6 +110,10 @@ describe('Parameter Validators (p.*)', () => {
109
110
  const param = p.int32().optional(10).required();
110
111
  expect(param._required).toBe(true);
111
112
  });
113
+ it('tracks explicit required modifier separately from required by default', () => {
114
+ expect(p.string()._requiredModifier).toBeUndefined();
115
+ expect(p.string().required()._requiredModifier).toBe('required');
116
+ });
112
117
  });
113
118
  describe('Description modifier', () => {
114
119
  it('sets description', () => {
package/dist/schema/params.test.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"params.test.js","sourceRoot":"","sources":["../../src/schema/params.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,CAAC,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,eAAe,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAE/H,QAAQ,CAAC,4BAA4B,EAAE,GAAG,EAAE;IAC1C,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;QAC5B,EAAE,CAAC,4BAA4B,EAAE,GAAG,EAAE;YACpC,MAAM,KAAK,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC;YACzB,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,0BAA0B,EAAE,GAAG,EAAE;YAClC,MAAM,KAAK,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;YACvB,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;QAC7B,EAAE,CAAC,0BAA0B,EAAE,GAAG,EAAE;YAClC,MAAM,KAAK,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;YACvB,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,2BAA2B,EAAE,GAAG,EAAE;YACnC,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC;YACxB,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,2BAA2B,EAAE,GAAG,EAAE;YACnC,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC;YACxB,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,2BAA2B,EAAE,GAAG,EAAE;YACnC,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC;YACxB,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,2BAA2B,EAAE,GAAG,EAAE;YACnC,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC;YACxB,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,4BAA4B,EAAE,GAAG,EAAE;YACpC,MAAM,KAAK,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC;YACzB,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,4BAA4B,EAAE,GAAG,EAAE;YACpC,MAAM,KAAK,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC;YACzB,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,4BAA4B,EAAE,GAAG,EAAE;YACpC,MAAM,KAAK,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC;YACzB,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;QAC3B,EAAE,CAAC,6BAA6B,EAAE,GAAG,EAAE;YACrC,MAAM,KAAK,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC;YAC1B,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC9C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,6BAA6B,EAAE,GAAG,EAAE;YACrC,MAAM,KAAK,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC;YAC1B,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC9C,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;QAC5B,EAAE,CAAC,6BAA6B,EAAE,GAAG,EAAE;YACrC,MAAM,KAAK,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC;YAC1B,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC9C,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;QAC/B,EAAE,CAAC,0BAA0B,EAAE,GAAG,EAAE;YAClC,MAAM,KAAK,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;YACvB,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;YACtC,MAAM,KAAK,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC;YAC3B,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC/C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;YACxC,MAAM,KAAK,GAAG,CAAC,CAAC,UAAU,EAAE,CAAC;YAC7B,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;QAC7B,EAAE,CAAC,4BAA4B,EAAE,GAAG,EAAE;YACpC,MAAM,KAAK,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC;YACzB,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;QACnC,EAAE,CAAC,oCAAoC,EAAE,GAAG,EAAE;YAC5C,MAAM,KAAK,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC;YACzB,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;QACjC,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;YAClD,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,CAAC;YACnC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACpC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,aAAa,EAAE,CAAC;QACzC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;YACrD,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YACrC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACpC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;YACtC,MAAM,KAAK,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YAC7C,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC3C,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;QACjC,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE;YACjD,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;YAChD,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;QACpC,EAAE,CAAC,kBAAkB,EAAE,GAAG,EAAE;YAC1B,MAAM,KAAK,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YAC7C,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;YAC7C,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YAC7D,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;QAClC,EAAE,CAAC,oCAAoC,EAAE,GAAG,EAAE;YAC5C,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;YACvD,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACpC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAChC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,oCAAoC,EAAE,GAAG,EAAE;YAC5C,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YACvD,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACpC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAChC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;QAChC,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;YACtD,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;YAC3D,MAAM,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC/C,MAAM,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACzC,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;YAClD,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC1D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE;YACjD,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC/C,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC7D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,uCAAuC,EAAE,GAAG,EAAE;YAC/C,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACzD,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;QACrD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE;YACjD,MAAM,CAAC,mBAAmB,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACtE,MAAM,CAAC,mBAAmB,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;QAC1D,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;QAC/B,EAAE,CAAC,yBAAyB,EAAE,GAAG,EAAE;YACjC,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;YAClC,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;QAC9B,EAAE,CAAC,wBAAwB,EAAE,GAAG,EAAE;YAChC,MAAM,KAAK,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;YACvB,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"params.test.js","sourceRoot":"","sources":["../../src/schema/params.test.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tinybirdco/sdk",
3
- "version": "0.0.67",
3
+ "version": "0.0.68",
4
4
  "description": "TypeScript SDK for Tinybird Forward - define datasources and pipes as TypeScript",
5
5
  "type": "module",
6
6
  "main": "./dist/index.js",
package/src/generator/pipe.test.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { describe, it, expect } from 'vitest';
2
2
  import { generatePipe, generateAllPipes } from './pipe.js';
3
- import { definePipe, defineMaterializedView, defineSinkPipe, node } from '../schema/pipe.js';
3
+ import { definePipe, defineEndpoint, defineMaterializedView, defineSinkPipe, node } from '../schema/pipe.js';
4
4
  import { defineDatasource } from '../schema/datasource.js';
5
5
  import { defineKafkaConnection, defineS3Connection } from '../schema/connection.js';
6
6
  import { defineToken } from '../schema/token.js';
@@ -182,8 +182,8 @@ describe('Pipe Generator', () => {
182
182
  });
183
183
 
184
184
  const result = generatePipe(pipe);
185
- expect(result.content).toContain("{{ Date(start_date, '2025-03-01') }}");
186
- expect(result.content).toContain('{{ Int32(page, 0) }}');
185
+ expect(result.content).toContain("{{ Date(start_date, '2025-03-01', required=False) }}");
186
+ expect(result.content).toContain('{{ Int32(page, 0, required=False) }}');
187
187
  });
188
188
  });
189
189
 
@@ -254,6 +254,77 @@ describe('Pipe Generator', () => {
254
254
  const result = generatePipe(pipe);
255
255
  expect(result.content).toContain('CACHE 60');
256
256
  });
257
+
258
+ it('emits explicit required and description metadata for endpoint params', () => {
259
+ const pipe = definePipe('account_demos', {
260
+ params: {
261
+ id: p.string().required().describe('The company account ID'),
262
+ workspaceId: p.string().required().describe('The workspace ID'),
263
+ },
264
+ nodes: [
265
+ node({
266
+ name: 'endpoint',
267
+ sql: `
268
+ SELECT *
269
+ FROM events
270
+ WHERE workspaceId = {{ String(workspaceId) }}
271
+ AND companyAccountId = {{ String(id) }}
272
+ `.trim(),
273
+ }),
274
+ ],
275
+ output: simpleOutput,
276
+ endpoint: true,
277
+ });
278
+
279
+ const result = generatePipe(pipe);
280
+ expect(result.content).toContain(
281
+ '{{ String(workspaceId, required=True, description="The workspace ID") }}'
282
+ );
283
+ expect(result.content).toContain(
284
+ '{{ String(id, required=True, description="The company account ID") }}'
285
+ );
286
+ });
287
+
288
+ it('emits optional metadata without duplicating existing default or description args', () => {
289
+ const pipe = definePipe('test_pipe', {
290
+ params: {
291
+ limit: p.int32().optional(10).describe('Number of rows'),
292
+ },
293
+ nodes: [
294
+ node({
295
+ name: 'endpoint',
296
+ sql: 'SELECT * FROM events LIMIT {{ Int32(limit, 10, description="Existing") }}',
297
+ }),
298
+ ],
299
+ output: simpleOutput,
300
+ endpoint: true,
301
+ });
302
+
303
+ const result = generatePipe(pipe);
304
+ expect(result.content).toContain(
305
+ '{{ Int32(limit, 10, description="Existing", required=False) }}'
306
+ );
307
+ });
308
+
309
+ it('emits param metadata for defineEndpoint helper', () => {
310
+ const pipe = defineEndpoint('test_endpoint', {
311
+ params: {
312
+ workspaceId: p.string().required().describe('The workspace ID'),
313
+ },
314
+ nodes: [
315
+ node({
316
+ name: 'endpoint',
317
+ sql: 'SELECT * FROM events WHERE workspaceId = {{ String(workspaceId) }}',
318
+ }),
319
+ ],
320
+ output: simpleOutput,
321
+ });
322
+
323
+ const result = generatePipe(pipe);
324
+ expect(result.content).toContain(
325
+ '{{ String(workspaceId, required=True, description="The workspace ID") }}'
326
+ );
327
+ });
257
328
  });
258
329
 
259
330
  describe('generateAllPipes', () => {
@@ -317,7 +388,7 @@ LIMIT {{Int32(limit, 10)}}
317
388
  expect(result.content).toContain(' %\n');
318
389
  expect(result.content).toContain('pathname');
319
390
  expect(result.content).toContain('{{DateTime(start_date)}}');
320
- expect(result.content).toContain('{{Int32(limit, 10)}}');
391
+ expect(result.content).toContain('{{ Int32(limit, 10, required=False) }}');
321
392
  expect(result.content).toContain('TYPE endpoint');
322
393
  });
323
394
  });
package/src/generator/pipe.ts CHANGED
@@ -19,7 +19,12 @@ import {
19
19
  getSinkConfig,
20
20
  } from "../schema/pipe.js";
21
21
  import type { AnyParamValidator } from "../schema/params.js";
22
- import { getParamDefault } from "../schema/params.js";
22
+ import {
23
+ getParamDefault,
24
+ getParamDescription,
25
+ getParamRequiredModifier,
26
+ isParamRequired,
27
+ } from "../schema/params.js";
23
28
 
24
29
  /**
25
30
  * Generated pipe content
@@ -96,23 +101,57 @@ function toTemplateDefaultLiteral(value: string | number | boolean): string {
96
101
  return String(value);
97
102
  }
98
103
 
99
- function applyParamDefaultsToSql(
100
- sql: string,
101
- params?: Record<string, AnyParamValidator>
102
- ): string {
103
- if (!params) {
104
- return sql;
105
- }
104
+ function toTemplateStringLiteral(value: string): string {
105
+ return JSON.stringify(value);
106
+ }
106
107
 
107
- const defaults = new Map<string, string>();
108
- for (const [name, validator] of Object.entries(params)) {
109
- const defaultValue = getParamDefault(validator);
110
- if (defaultValue !== undefined) {
111
- defaults.set(name, toTemplateDefaultLiteral(defaultValue as string | number | boolean));
108
+ function hasKeywordArg(args: string[], key: string): boolean {
109
+ const keyLower = key.toLowerCase();
110
+ return args.some((arg) => {
111
+ const equalsIndex = arg.indexOf("=");
112
+ if (equalsIndex <= 0) {
113
+ return false;
112
114
  }
115
+ return arg.slice(0, equalsIndex).trim().toLowerCase() === keyLower;
116
+ });
117
+ }
118
+
119
+ function hasPositionalDefaultArg(args: string[]): boolean {
120
+ return args.slice(1).some((arg) => !/^[a-zA-Z_][a-zA-Z0-9_]*\s*=/.test(arg.trim()));
121
+ }
122
+
123
+ function buildParamTemplateArgs(
124
+ args: string[],
125
+ validator: AnyParamValidator
126
+ ): string[] {
127
+ const nextArgs = [...args];
128
+ const defaultValue = getParamDefault(validator);
129
+ if (
130
+ defaultValue !== undefined &&
131
+ !hasPositionalDefaultArg(nextArgs) &&
132
+ !hasKeywordArg(nextArgs, "default")
133
+ ) {
134
+ nextArgs.push(toTemplateDefaultLiteral(defaultValue as string | number | boolean));
113
135
  }
114
136
 
115
- if (defaults.size === 0) {
137
+ const requiredModifier = getParamRequiredModifier(validator);
138
+ if (requiredModifier && !hasKeywordArg(nextArgs, "required")) {
139
+ nextArgs.push(`required=${isParamRequired(validator) ? "True" : "False"}`);
140
+ }
141
+
142
+ const description = getParamDescription(validator);
143
+ if (description !== undefined && !hasKeywordArg(nextArgs, "description")) {
144
+ nextArgs.push(`description=${toTemplateStringLiteral(description)}`);
145
+ }
146
+
147
+ return nextArgs;
148
+ }
149
+
150
+ function applyParamMetadataToSql(
151
+ sql: string,
152
+ params?: Record<string, AnyParamValidator>
153
+ ): string {
154
+ if (!params) {
116
155
  return sql;
117
156
  }
118
157
 
@@ -123,7 +162,7 @@ function applyParamDefaultsToSql(
123
162
  /([a-zA-Z_][a-zA-Z0-9_]*)\s*\(([^()]*)\)/g,
124
163
  (call, _functionName, rawArgs) => {
125
164
  const args = splitTopLevelComma(String(rawArgs));
126
- if (args.length !== 1) {
165
+ if (args.length === 0) {
127
166
  return call;
128
167
  }
129
168
 
@@ -132,12 +171,17 @@ function applyParamDefaultsToSql(
132
171
  return call;
133
172
  }
134
173
 
135
- const defaultLiteral = defaults.get(paramName);
136
- if (!defaultLiteral) {
174
+ const validator = params[paramName];
175
+ if (!validator) {
176
+ return call;
177
+ }
178
+
179
+ const nextArgs = buildParamTemplateArgs(args, validator);
180
+ if (nextArgs.length === args.length) {
137
181
  return call;
138
182
  }
139
183
 
140
- return call.replace(/\)\s*$/, `, ${defaultLiteral})`);
184
+ return call.replace(/\([^()]*\)\s*$/, `(${nextArgs.join(", ")})`);
141
185
  }
142
186
  );
143
187
 
@@ -172,8 +216,8 @@ function generateNode(
172
216
  parts.push(` %`);
173
217
  }
174
218
 
175
- const sqlWithDefaults = applyParamDefaultsToSql(node.sql, params);
176
- const sqlLines = sqlWithDefaults.trim().split("\n");
219
+ const sqlWithParamMetadata = applyParamMetadataToSql(node.sql, params);
220
+ const sqlLines = sqlWithParamMetadata.trim().split("\n");
177
221
  sqlLines.forEach((line) => {
178
222
  parts.push(` ${line}`);
179
223
  });
package/src/schema/params.test.ts CHANGED
@@ -111,6 +111,7 @@ describe('Parameter Validators (p.*)', () => {
111
111
  const param = p.int32().optional();
112
112
  expect(param._required).toBe(false);
113
113
  expect(param._default).toBeUndefined();
114
+ expect(param._requiredModifier).toBe('optional');
114
115
  });
115
116
 
116
117
  it('makes parameter optional with default value', () => {
@@ -131,6 +132,11 @@ describe('Parameter Validators (p.*)', () => {
131
132
  const param = p.int32().optional(10).required();
132
133
  expect(param._required).toBe(true);
133
134
  });
135
+
136
+ it('tracks explicit required modifier separately from required by default', () => {
137
+ expect(p.string()._requiredModifier).toBeUndefined();
138
+ expect(p.string().required()._requiredModifier).toBe('required');
139
+ });
134
140
  });
135
141
 
136
142
  describe('Description modifier', () => {
package/src/schema/params.ts CHANGED
@@ -26,6 +26,8 @@ export interface ParamValidator<
26
26
  readonly _default?: TType;
27
27
  /** Description for documentation */
28
28
  readonly _description?: string;
29
+ /** Whether required/optional was explicitly set by a modifier */
30
+ readonly _requiredModifier?: "required" | "optional";
29
31
 
30
32
  /** Make this parameter optional with an optional default value */
31
33
  optional<TDefault extends TType | undefined = undefined>(
@@ -62,6 +64,7 @@ function createParamValidator<
62
64
  required?: TRequired;
63
65
  defaultValue?: TType;
64
66
  description?: string;
67
+ requiredModifier?: "required" | "optional";
65
68
  } = {}
66
69
  ): ParamValidator<TType, TTinybirdType, TRequired> {
67
70
  const isRequired = (options.required ?? true) as TRequired;
@@ -73,6 +76,7 @@ function createParamValidator<
73
76
  _required: isRequired,
74
77
  _default: options.defaultValue,
75
78
  _description: options.description,
79
+ _requiredModifier: options.requiredModifier,
76
80
  tinybirdType,
77
81
  isRequired,
78
82
  defaultValue: options.defaultValue,
@@ -87,6 +91,7 @@ function createParamValidator<
87
91
  required: false,
88
92
  defaultValue: defaultValue as TDefault extends undefined ? TType | undefined : TType,
89
93
  description: options.description,
94
+ requiredModifier: "optional",
90
95
  });
91
96
  },
92
97
 
@@ -94,6 +99,7 @@ function createParamValidator<
94
99
  return createParamValidator<TType, TTinybirdType, true>(tinybirdType, {
95
100
  required: true,
96
101
  description: options.description,
102
+ requiredModifier: "required",
97
103
  });
98
104
  },
99
105
 
@@ -102,6 +108,7 @@ function createParamValidator<
102
108
  required: isRequired,
103
109
  defaultValue: options.defaultValue,
104
110
  description,
111
+ requiredModifier: options.requiredModifier,
105
112
  });
106
113
  },
107
114
  };
@@ -248,3 +255,10 @@ export function getParamDefault<T>(validator: ParamValidator<T, string, boolean>
248
255
  export function getParamDescription(validator: AnyParamValidator): string | undefined {
249
256
  return validator._description;
250
257
  }
258
+
259
+ /** Check whether required/optional was explicitly set by a modifier */
260
+ export function getParamRequiredModifier(
261
+ validator: AnyParamValidator
262
+ ): "required" | "optional" | undefined {
263
+ return validator._requiredModifier;
264
+ }