drizzle-sybase 2.0.1 → 3.0.0

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 (91) hide show
  1. package/README.md +72 -6
  2. package/dist/columns/index.d.ts +186 -36
  3. package/dist/columns/index.d.ts.map +1 -1
  4. package/dist/columns/index.js +113 -23
  5. package/dist/columns/index.js.map +1 -1
  6. package/dist/connection.d.ts +77 -157
  7. package/dist/connection.d.ts.map +1 -1
  8. package/dist/connection.js +244 -506
  9. package/dist/connection.js.map +1 -1
  10. package/dist/datetime.d.ts +15 -0
  11. package/dist/datetime.d.ts.map +1 -1
  12. package/dist/datetime.js +25 -0
  13. package/dist/datetime.js.map +1 -1
  14. package/dist/db.d.ts +36 -10
  15. package/dist/db.d.ts.map +1 -1
  16. package/dist/db.js +15 -25
  17. package/dist/db.js.map +1 -1
  18. package/dist/dialect.d.ts +24 -0
  19. package/dist/dialect.d.ts.map +1 -1
  20. package/dist/dialect.js +63 -9
  21. package/dist/dialect.js.map +1 -1
  22. package/dist/index.d.ts +11 -5
  23. package/dist/index.d.ts.map +1 -1
  24. package/dist/index.js +5 -3
  25. package/dist/index.js.map +1 -1
  26. package/dist/introspect/codegen.d.ts +8 -1
  27. package/dist/introspect/codegen.d.ts.map +1 -1
  28. package/dist/introspect/codegen.js +117 -29
  29. package/dist/introspect/codegen.js.map +1 -1
  30. package/dist/introspect/fetch.d.ts +9 -2
  31. package/dist/introspect/fetch.d.ts.map +1 -1
  32. package/dist/introspect/fetch.js +37 -8
  33. package/dist/introspect/fetch.js.map +1 -1
  34. package/dist/introspect/index.d.ts +1 -0
  35. package/dist/introspect/index.d.ts.map +1 -1
  36. package/dist/introspect/index.js +8 -5
  37. package/dist/introspect/index.js.map +1 -1
  38. package/dist/introspect/type-map.d.ts +17 -8
  39. package/dist/introspect/type-map.d.ts.map +1 -1
  40. package/dist/introspect/type-map.js +28 -9
  41. package/dist/introspect/type-map.js.map +1 -1
  42. package/dist/native/index.d.ts +4 -1
  43. package/dist/native/index.d.ts.map +1 -1
  44. package/dist/native/index.js.map +1 -1
  45. package/dist/native/sybase_native.darwin-arm64.node +0 -0
  46. package/dist/native/sybase_native.darwin-x64.node +0 -0
  47. package/dist/native/sybase_native.linux-arm64.node +0 -0
  48. package/dist/native/sybase_native.linux-x64.node +0 -0
  49. package/dist/native/sybase_native.win32-x64.node +0 -0
  50. package/dist/pool.d.ts +197 -0
  51. package/dist/pool.d.ts.map +1 -0
  52. package/dist/pool.js +638 -0
  53. package/dist/pool.js.map +1 -0
  54. package/dist/query-builders/delete.d.ts +6 -4
  55. package/dist/query-builders/delete.d.ts.map +1 -1
  56. package/dist/query-builders/delete.js +4 -4
  57. package/dist/query-builders/delete.js.map +1 -1
  58. package/dist/query-builders/index.d.ts +1 -1
  59. package/dist/query-builders/index.d.ts.map +1 -1
  60. package/dist/query-builders/index.js.map +1 -1
  61. package/dist/query-builders/insert.d.ts +28 -4
  62. package/dist/query-builders/insert.d.ts.map +1 -1
  63. package/dist/query-builders/insert.js +8 -5
  64. package/dist/query-builders/insert.js.map +1 -1
  65. package/dist/query-builders/select-types.d.ts +132 -0
  66. package/dist/query-builders/select-types.d.ts.map +1 -0
  67. package/dist/query-builders/select-types.js +2 -0
  68. package/dist/query-builders/select-types.js.map +1 -0
  69. package/dist/query-builders/select.d.ts +54 -34
  70. package/dist/query-builders/select.d.ts.map +1 -1
  71. package/dist/query-builders/select.js +99 -92
  72. package/dist/query-builders/select.js.map +1 -1
  73. package/dist/query-builders/update.d.ts +7 -5
  74. package/dist/query-builders/update.d.ts.map +1 -1
  75. package/dist/query-builders/update.js +4 -4
  76. package/dist/query-builders/update.js.map +1 -1
  77. package/dist/session.d.ts +141 -14
  78. package/dist/session.d.ts.map +1 -1
  79. package/dist/session.js +456 -40
  80. package/dist/session.js.map +1 -1
  81. package/dist/sql-classify.d.ts +70 -0
  82. package/dist/sql-classify.d.ts.map +1 -0
  83. package/dist/sql-classify.js +189 -0
  84. package/dist/sql-classify.js.map +1 -0
  85. package/dist/table.d.ts +85 -3
  86. package/dist/table.d.ts.map +1 -1
  87. package/dist/table.js +8 -2
  88. package/dist/table.js.map +1 -1
  89. package/package.json +9 -8
  90. package/scripts/clean.ts +4 -3
  91. package/src/native/binding.c +463 -62
package/dist/index.js CHANGED
@@ -59,13 +59,15 @@
59
59
  export { sybaseTable } from "./table.js";
60
60
  export { SybaseTable } from "./table.js";
61
61
  // Column types
62
- export { int, bigint, smallint, tinyint, varchar, nvarchar, char, nchar, text, ntext, datetime, smalldatetime, numeric, decimal, float, real, money, smallmoney, bit, binary, varbinary, image } from "./columns/index.js";
62
+ export { SybaseColumn, SybaseColumnBuilder } from "./columns/index.js";
63
+ export { int, bigint, smallint, tinyint, unsignedSmallint, unsignedInt, unsignedBigint, varchar, nvarchar, char, nchar, univarchar, unichar, text, ntext, unitext, datetime, smalldatetime, date, time, bigdatetime, bigtime, numeric, decimal, float, real, money, smallmoney, bit, binary, varbinary, image } from "./columns/index.js";
63
64
  // Database instance
64
65
  export { createSybaseDrizzle } from "./db.js";
65
66
  // Errors
66
67
  export { SybaseError, SybaseConnectionError, SybaseQueryError, SybaseTimeoutError, SybasePoolError } from "./errors.js";
67
68
  // Connection + Pool
68
- export { SybaseConnection, SybasePool } from "./connection.js";
69
+ export { SybaseConnection } from "./connection.js";
70
+ export { SybasePool } from "./pool.js";
69
71
  // Dialect
70
72
  export { SybaseDialect, escapeName, escapeString, serializeValue } from "./dialect.js";
71
73
  // Codecs (CONVERT wrapping for exact numeric types)
@@ -73,7 +75,7 @@ export { SYBASE_CODECS, EXACT_NUMERIC_TYPES } from "./codecs.js";
73
75
  // Datetime conversion (ASE stores a naive wall clock)
74
76
  export { formatSybaseDateTime, parseSybaseDateTime, decodeDateTimeColumns, resolveTimeZone } from "./datetime.js";
75
77
  // Session
76
- export { SybaseSession, SybaseTransactionSession } from "./session.js";
78
+ export { SybaseConnectionSession, SybaseSession, SybaseTransactionSession } from "./session.js";
77
79
  // Query builders
78
80
  export { SybaseSelectBuilder, SybaseInsertBuilder, SybaseUpdateBuilder, SybaseDeleteBuilder } from "./query-builders/index.js";
79
81
  // Native binding utilities (lazy-loaded — only triggers native load on actual use)
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwDG;AAEH,QAAQ;AACR,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzC,eAAe;AACf,OAAO,EACL,GAAG,EACH,MAAM,EACN,QAAQ,EACR,OAAO,EACP,OAAO,EACP,QAAQ,EACR,IAAI,EACJ,KAAK,EACL,IAAI,EACJ,KAAK,EACL,QAAQ,EACR,aAAa,EACb,OAAO,EACP,OAAO,EACP,KAAK,EACL,IAAI,EACJ,KAAK,EACL,UAAU,EACV,GAAG,EACH,MAAM,EACN,SAAS,EACT,KAAK,EACN,MAAM,oBAAoB,CAAC;AAE5B,oBAAoB;AACpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAG9C,SAAS;AACT,OAAO,EACL,WAAW,EACX,qBAAqB,EACrB,gBAAgB,EAChB,kBAAkB,EAClB,eAAe,EAChB,MAAM,aAAa,CAAC;AAErB,oBAAoB;AACpB,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAU/D,UAAU;AACV,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAGvF,oDAAoD;AACpD,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAEjE,sDAAsD;AACtD,OAAO,EACL,oBAAoB,EACpB,mBAAmB,EACnB,qBAAqB,EACrB,eAAe,EAChB,MAAM,eAAe,CAAC;AAEvB,UAAU;AACV,OAAO,EAAE,aAAa,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAOvE,iBAAiB;AACjB,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,mBAAmB,EACnB,mBAAmB,EACpB,MAAM,2BAA2B,CAAC;AAcnC,mFAAmF;AACnF,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwDG;AAEH,QAAQ;AACR,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAWzC,eAAe;AACf,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAMvE,OAAO,EACL,GAAG,EACH,MAAM,EACN,QAAQ,EACR,OAAO,EACP,gBAAgB,EAChB,WAAW,EACX,cAAc,EACd,OAAO,EACP,QAAQ,EACR,IAAI,EACJ,KAAK,EACL,UAAU,EACV,OAAO,EACP,IAAI,EACJ,KAAK,EACL,OAAO,EACP,QAAQ,EACR,aAAa,EACb,IAAI,EACJ,IAAI,EACJ,WAAW,EACX,OAAO,EACP,OAAO,EACP,OAAO,EACP,KAAK,EACL,IAAI,EACJ,KAAK,EACL,UAAU,EACV,GAAG,EACH,MAAM,EACN,SAAS,EACT,KAAK,EACN,MAAM,oBAAoB,CAAC;AAE5B,oBAAoB;AACpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAG9C,SAAS;AACT,OAAO,EACL,WAAW,EACX,qBAAqB,EACrB,gBAAgB,EAChB,kBAAkB,EAClB,eAAe,EAChB,MAAM,aAAa,CAAC;AAErB,oBAAoB;AACpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAQnD,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAGvC,UAAU;AACV,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAGvF,oDAAoD;AACpD,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAEjE,sDAAsD;AACtD,OAAO,EACL,oBAAoB,EACpB,mBAAmB,EACnB,qBAAqB,EACrB,eAAe,EAChB,MAAM,eAAe,CAAC;AAEvB,UAAU;AACV,OAAO,EAAE,uBAAuB,EAAE,aAAa,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAOhG,iBAAiB;AACjB,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,mBAAmB,EACnB,mBAAmB,EACpB,MAAM,2BAA2B,CAAC;AAqBnC,mFAAmF;AACnF,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC"}
@@ -5,6 +5,7 @@
5
5
  * All type decisions are delegated to the shared {@link SYBASE_TYPE_MAP}
6
6
  * registry so the builder, Zod and import generators can never disagree.
7
7
  */
8
+ import { type CharSizes } from "./type-map.js";
8
9
  import type { TableMeta } from "./types.js";
9
10
  /**
10
11
  * Convert a SNAKE_CASE / snake_case catalog name to camelCase.
@@ -20,5 +21,11 @@ export interface GeneratedCode {
20
21
  /** Warnings, e.g. columns that fell back to `varchar` for an unmapped type. */
21
22
  warnings: string[];
22
23
  }
23
- export declare function generateSchemaCode(tables: TableMeta[], database: string): GeneratedCode;
24
+ /**
25
+ * @param charSizes Bytes per character of the server's national and Unicode
26
+ * char types, used to turn catalog byte lengths into character lengths.
27
+ * They depend on the server charset, so there is no safe default:
28
+ * `introspectWith` reads them from the server.
29
+ */
30
+ export declare function generateSchemaCode(tables: TableMeta[], database: string, charSizes: CharSizes): GeneratedCode;
24
31
  //# sourceMappingURL=codegen.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"codegen.d.ts","sourceRoot":"","sources":["../../src/introspect/codegen.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AASH,OAAO,KAAK,EAAc,SAAS,EAAE,MAAM,YAAY,CAAC;AAExD;;;;;;GAMG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAIhD;AA6ED,sEAAsE;AACtE,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,+EAA+E;IAC/E,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAqTD,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,QAAQ,EAAE,MAAM,GAAG,aAAa,CAiEvF"}
1
+ {"version":3,"file":"codegen.d.ts","sourceRoot":"","sources":["../../src/introspect/codegen.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAKL,KAAK,SAAS,EAEf,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAc,SAAS,EAAE,MAAM,YAAY,CAAC;AAExD;;;;;;GAMG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAIhD;AA6ED,sEAAsE;AACtE,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,+EAA+E;IAC/E,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAmaD;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,SAAS,EAAE,EACnB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,SAAS,GACnB,aAAa,CAoEf"}
@@ -91,12 +91,12 @@ const RESERVED_WORDS = new Set([
91
91
  // ---------------------------------------------------------------------------
92
92
  // Column builder rendering
93
93
  // ---------------------------------------------------------------------------
94
- function renderColumnBuilder(col, mapping) {
94
+ function renderColumnBuilder(col, mapping, charSizes) {
95
95
  const colName = JSON.stringify(col.name);
96
96
  let builder;
97
97
  switch (mapping.size) {
98
98
  case "length":
99
- builder = `${mapping.factory}(${colName}, { length: ${effectiveLength(col, mapping)} })`;
99
+ builder = `${mapping.factory}(${colName}, { length: ${effectiveLength(col, mapping, charSizes)} })`;
100
100
  break;
101
101
  case "precision": {
102
102
  // precision/scale should always be present for numeric/decimal, but guard
@@ -124,6 +124,10 @@ function renderColumnBuilder(col, mapping) {
124
124
  if (!col.isNullable) {
125
125
  builder += ".notNull()";
126
126
  }
127
+ // Mirrors the insert schema, where such a column is optional.
128
+ if (col.defaultValue) {
129
+ builder += ".hasDatabaseDefault()";
130
+ }
127
131
  return builder;
128
132
  }
129
133
  /** Identifiers emitted by {@link EXACT_NUMERIC_HELPERS} and used by insert schemas. */
@@ -192,7 +196,7 @@ function renderDecimalZodType(col, mapping, purpose) {
192
196
  return DECIMAL_LITERAL;
193
197
  }
194
198
  }
195
- function renderZodType(col, mapping, purpose) {
199
+ function renderZodType(col, mapping, purpose, charSizes) {
196
200
  let zod;
197
201
  switch (mapping.value) {
198
202
  case "number":
@@ -219,9 +223,11 @@ function renderZodType(col, mapping, purpose) {
219
223
  break;
220
224
  default: {
221
225
  zod = "z.string()";
222
- const isText = mapping.factory === "text" || mapping.factory === "ntext";
223
- if (col.length > 0 && !isText) {
224
- zod += `.max(${effectiveLength(col, mapping)})`;
226
+ // Only a declared length counts characters. For the rest the catalog
227
+ // length is storage bytes (a text pointer is 16, a date 4) and says
228
+ // nothing about how long the string form is.
229
+ if (col.length > 0 && mapping.size === "length") {
230
+ zod += `.max(${effectiveLength(col, mapping, charSizes)})`;
225
231
  }
226
232
  break;
227
233
  }
@@ -245,8 +251,85 @@ function tableVarName(table) {
245
251
  function tableTypeName(table) {
246
252
  return safeIdentifier(capitalize(toCamelCase(table.name)));
247
253
  }
248
- function generateTableDefinition(table, warnings) {
249
- const varName = tableVarName(table);
254
+ const valueNamesOf = (varName) => [
255
+ varName,
256
+ `${varName}Indexes`,
257
+ `${varName}Schema`,
258
+ `${varName}InsertSchema`
259
+ ];
260
+ const typeNamesOf = (typeName) => [`${typeName}Row`, `New${typeName}`];
261
+ /**
262
+ * Allocate every declared identifier and column key before any code is emitted.
263
+ *
264
+ * Derived names make collisions easy to hit with ordinary catalogs: `orders`
265
+ * declares `ordersSchema`, which is also the table const for `orders_schema`;
266
+ * a table named `z` would shadow the zod import; `A_B` and `a_b` both
267
+ * camel-case to `aB`. Any clash gets a numeric suffix, applied to all of that
268
+ * table's names at once so they still read as a set, plus a warning. Tables
269
+ * are taken in the given order, which is stable (the catalog query sorts by
270
+ * name), so regenerating yields the same names.
271
+ */
272
+ function planNames(tables, warnings) {
273
+ const takenValues = new Set([
274
+ "sybaseTable",
275
+ "z",
276
+ INTEGER_LITERAL,
277
+ DECIMAL_LITERAL,
278
+ ...FACTORY_ORDER
279
+ ]);
280
+ const takenTypes = new Set();
281
+ const plan = new Map();
282
+ for (const table of tables) {
283
+ const baseVar = tableVarName(table);
284
+ const baseType = tableTypeName(table);
285
+ let varName = baseVar;
286
+ let typeName = baseType;
287
+ for (let n = 2;; n++) {
288
+ const free = valueNamesOf(varName).every(name => !takenValues.has(name)) &&
289
+ typeNamesOf(typeName).every(name => !takenTypes.has(name));
290
+ if (free) {
291
+ break;
292
+ }
293
+ varName = `${baseVar}_${n}`;
294
+ typeName = `${baseType}_${n}`;
295
+ }
296
+ if (varName !== baseVar) {
297
+ warnings.push(`Table "${table.name}": generated name "${baseVar}" collides with another declaration — emitted as "${varName}".`);
298
+ }
299
+ valueNamesOf(varName).forEach(name => takenValues.add(name));
300
+ typeNamesOf(typeName).forEach(name => takenTypes.add(name));
301
+ const keys = new Map();
302
+ const takenKeys = new Set();
303
+ for (const col of table.columns) {
304
+ const base = toCamelCase(col.name);
305
+ let key = base;
306
+ for (let n = 2; takenKeys.has(key); n++) {
307
+ key = `${base}_${n}`;
308
+ }
309
+ if (key !== base) {
310
+ warnings.push(`Table "${table.name}" column "${col.name}": property "${base}" is already used — emitted as "${key}".`);
311
+ }
312
+ takenKeys.add(key);
313
+ keys.set(col.name, key);
314
+ }
315
+ plan.set(table, { varName, typeName, keys });
316
+ }
317
+ return plan;
318
+ }
319
+ /**
320
+ * Owner argument for `sybaseTable`, or "" to leave the table unqualified.
321
+ *
322
+ * dbo tables stay unqualified: an unqualified name already resolves to dbo's
323
+ * table for any user without a same-named table of their own, and it keeps the
324
+ * common case's generated code unchanged. Any other owner is only reachable
325
+ * by that user unqualified, so it is emitted.
326
+ */
327
+ function ownerOption(table) {
328
+ return table.owner && table.owner.toLowerCase() !== "dbo"
329
+ ? `, { owner: ${JSON.stringify(table.owner)} }`
330
+ : "";
331
+ }
332
+ function generateTableDefinition(table, names, warnings, charSizes) {
250
333
  const pk = findPrimaryKey(table);
251
334
  const isSingleColumnPk = pk?.columns.length === 1;
252
335
  const columnLines = table.columns.map(col => {
@@ -254,7 +337,7 @@ function generateTableDefinition(table, warnings) {
254
337
  if (isFallback) {
255
338
  warnings.push(`Table "${table.name}" column "${col.name}": unmapped Sybase type "${col.typeName}" — emitted as varchar(${col.length}). Verify the generated type.`);
256
339
  }
257
- let line = ` ${memberKey(toCamelCase(col.name))}: ${renderColumnBuilder(col, mapping)}`;
340
+ let line = ` ${memberKey(names.keys.get(col.name))}: ${renderColumnBuilder(col, mapping, charSizes)}`;
258
341
  if (isSingleColumnPk && pk.columns[0] === col.name) {
259
342
  line += ".primaryKey()";
260
343
  }
@@ -265,18 +348,18 @@ function generateTableDefinition(table, warnings) {
265
348
  // them as a comment so the information is not silently lost (it also remains
266
349
  // available in the exported `<table>Indexes` constant below).
267
350
  if (pk && pk.columns.length > 1) {
268
- lines.push(`// Composite primary key: ${pk.columns.map(c => toCamelCase(c)).join(", ")}`);
351
+ const pkKeys = pk.columns.map(c => names.keys.get(c) ?? toCamelCase(c));
352
+ lines.push(`// Composite primary key: ${pkKeys.join(", ")}`);
269
353
  }
270
- lines.push(`export const ${varName} = sybaseTable(${JSON.stringify(table.name)}, {`);
354
+ lines.push(`export const ${names.varName} = sybaseTable(${JSON.stringify(table.name)}, {`);
271
355
  lines.push(columnLines.join(",\n"));
272
- lines.push("});");
356
+ lines.push(`}${ownerOption(table)});`);
273
357
  return lines.join("\n") + "\n";
274
358
  }
275
- function generateIndexInfo(table) {
359
+ function generateIndexInfo(table, names) {
276
360
  if (table.indexes.length === 0) {
277
361
  return "";
278
362
  }
279
- const varName = tableVarName(table);
280
363
  const indexLines = table.indexes.map(idx => {
281
364
  const flags = [];
282
365
  if (idx.isPrimary) {
@@ -289,30 +372,28 @@ function generateIndexInfo(table) {
289
372
  const flagStr = flags.length > 0 ? ", " + flags.join(", ") : "";
290
373
  return ` { name: ${JSON.stringify(idx.indexName)}, columns: [${cols}]${flagStr} }`;
291
374
  });
292
- return `export const ${varName}Indexes = [\n${indexLines.join(",\n")}\n] as const;\n`;
375
+ return `export const ${names.varName}Indexes = [\n${indexLines.join(",\n")}\n] as const;\n`;
293
376
  }
294
- function generateSelectSchema(table) {
295
- const varName = tableVarName(table);
296
- const typeName = tableTypeName(table);
377
+ function generateSelectSchema(table, names, charSizes) {
378
+ const { varName, typeName } = names;
297
379
  const fieldLines = table.columns.map(col => {
298
380
  const { mapping } = resolveMapping(col.typeName);
299
- return ` ${memberKey(toCamelCase(col.name))}: ${renderZodType(col, mapping, "select")}`;
381
+ return ` ${memberKey(names.keys.get(col.name))}: ${renderZodType(col, mapping, "select", charSizes)}`;
300
382
  });
301
383
  return (`export const ${varName}Schema = z.object({\n${fieldLines.join(",\n")}\n});\n` +
302
384
  `export type ${typeName}Row = z.infer<typeof ${varName}Schema>;\n`);
303
385
  }
304
- function generateInsertSchema(table) {
305
- const varName = tableVarName(table);
306
- const typeName = tableTypeName(table);
386
+ function generateInsertSchema(table, names, charSizes) {
387
+ const { varName, typeName } = names;
307
388
  const fieldLines = table.columns
308
389
  .filter(col => !col.isIdentity)
309
390
  .map(col => {
310
391
  const { mapping } = resolveMapping(col.typeName);
311
- let zod = renderZodType(col, mapping, "insert");
392
+ let zod = renderZodType(col, mapping, "insert", charSizes);
312
393
  if (col.isNullable || col.defaultValue) {
313
394
  zod += ".optional()";
314
395
  }
315
- return ` ${memberKey(toCamelCase(col.name))}: ${zod}`;
396
+ return ` ${memberKey(names.keys.get(col.name))}: ${zod}`;
316
397
  });
317
398
  return (`export const ${varName}InsertSchema = z.object({\n${fieldLines.join(",\n")}\n});\n` +
318
399
  `export type New${typeName} = z.infer<typeof ${varName}InsertSchema>;\n`);
@@ -346,9 +427,16 @@ function collectImports(tables) {
346
427
  // Top-level generator
347
428
  // ---------------------------------------------------------------------------
348
429
  const DIVIDER = "// ═══════════════════════════════════════════════════════════════════════════════";
349
- export function generateSchemaCode(tables, database) {
430
+ /**
431
+ * @param charSizes Bytes per character of the server's national and Unicode
432
+ * char types, used to turn catalog byte lengths into character lengths.
433
+ * They depend on the server charset, so there is no safe default:
434
+ * `introspectWith` reads them from the server.
435
+ */
436
+ export function generateSchemaCode(tables, database, charSizes) {
350
437
  const warnings = [];
351
438
  const imports = collectImports(tables);
439
+ const names = planNames(tables, warnings);
352
440
  const lines = [];
353
441
  lines.push("/**");
354
442
  lines.push(" * Auto-generated Sybase schema definitions.");
@@ -367,7 +455,7 @@ export function generateSchemaCode(tables, database) {
367
455
  lines.push(DIVIDER);
368
456
  lines.push("");
369
457
  for (const table of tables) {
370
- lines.push(generateTableDefinition(table, warnings));
458
+ lines.push(generateTableDefinition(table, names.get(table), warnings, charSizes));
371
459
  lines.push("");
372
460
  }
373
461
  lines.push(DIVIDER);
@@ -375,7 +463,7 @@ export function generateSchemaCode(tables, database) {
375
463
  lines.push(DIVIDER);
376
464
  lines.push("");
377
465
  for (const table of tables) {
378
- const indexCode = generateIndexInfo(table);
466
+ const indexCode = generateIndexInfo(table, names.get(table));
379
467
  if (indexCode) {
380
468
  lines.push(indexCode);
381
469
  lines.push("");
@@ -386,14 +474,14 @@ export function generateSchemaCode(tables, database) {
386
474
  lines.push(DIVIDER);
387
475
  lines.push("");
388
476
  for (const table of tables) {
389
- lines.push(generateSelectSchema(table));
477
+ lines.push(generateSelectSchema(table, names.get(table), charSizes));
390
478
  lines.push("");
391
479
  }
392
480
  lines.push(DIVIDER);
393
481
  lines.push("// Zod Schemas (Insert)");
394
482
  lines.push(DIVIDER);
395
483
  lines.push("");
396
- const insertSchemas = tables.map(table => generateInsertSchema(table));
484
+ const insertSchemas = tables.map(table => generateInsertSchema(table, names.get(table), charSizes));
397
485
  // Emitted only when referenced, so a schema with no exact numeric columns does
398
486
  // not carry an unused const.
399
487
  if (insertSchemas.some(s => s.includes(INTEGER_LITERAL) || s.includes(DECIMAL_LITERAL))) {
@@ -1 +1 @@
1
- {"version":3,"file":"codegen.js","sourceRoot":"","sources":["../../src/introspect/codegen.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"codegen.js","sourceRoot":"","sources":["../../src/introspect/codegen.ts"],"names":[],"mappings":"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"}
@@ -10,6 +10,7 @@
10
10
  * - index key columns resolved in one query per index instead of one query
11
11
  * per column (the previous N x M round-trips).
12
12
  */
13
+ import type { CharSizes } from "./type-map.js";
13
14
  import type { ColumnMeta, IndexMeta, IntrospectDb } from "./types.js";
14
15
  /**
15
16
  * Guard every identifier that is interpolated into catalog SQL. Catalog queries
@@ -22,7 +23,13 @@ export interface FetchedTable {
22
23
  name: string;
23
24
  owner: string;
24
25
  }
26
+ /**
27
+ * Bytes per character of the server's `nchar` and `unichar` types. Catalog
28
+ * lengths of those columns are in bytes, and `@@ncharsize` follows the server
29
+ * charset (1 on a single-byte one), so it cannot be assumed.
30
+ */
31
+ export declare function fetchCharSizes(db: IntrospectDb): Promise<CharSizes>;
25
32
  export declare function fetchTables(db: IntrospectDb, database: string, tableFilter?: string[], owner?: string): Promise<FetchedTable[]>;
26
- export declare function fetchColumns(db: IntrospectDb, database: string, tableName: string): Promise<ColumnMeta[]>;
27
- export declare function fetchIndexes(db: IntrospectDb, database: string, tableName: string): Promise<IndexMeta[]>;
33
+ export declare function fetchColumns(db: IntrospectDb, database: string, tableName: string, owner?: string): Promise<ColumnMeta[]>;
34
+ export declare function fetchIndexes(db: IntrospectDb, database: string, tableName: string, owner?: string): Promise<IndexMeta[]>;
28
35
  //# sourceMappingURL=fetch.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../src/introspect/fetch.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAGH,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAItE;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,KAAK,IAAI,MAAM,CAIzB;AAoBD,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf;AAED,wBAAsB,WAAW,CAC/B,EAAE,EAAE,YAAY,EAChB,QAAQ,EAAE,MAAM,EAChB,WAAW,CAAC,EAAE,MAAM,EAAE,EACtB,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,YAAY,EAAE,CAAC,CAyBzB;AAqBD,wBAAsB,YAAY,CAChC,EAAE,EAAE,YAAY,EAChB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,UAAU,EAAE,CAAC,CA8DvB;AAaD,wBAAsB,YAAY,CAChC,EAAE,EAAE,YAAY,EAChB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,SAAS,EAAE,CAAC,CA4BtB"}
1
+ {"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../src/introspect/fetch.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAGH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAItE;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,KAAK,IAAI,MAAM,CAIzB;AAkCD,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,EAAE,EAAE,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC,CAUzE;AAED,wBAAsB,WAAW,CAC/B,EAAE,EAAE,YAAY,EAChB,QAAQ,EAAE,MAAM,EAChB,WAAW,CAAC,EAAE,MAAM,EAAE,EACtB,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,YAAY,EAAE,CAAC,CAyBzB;AAqBD,wBAAsB,YAAY,CAChC,EAAE,EAAE,YAAY,EAChB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,UAAU,EAAE,CAAC,CA+DvB;AAaD,wBAAsB,YAAY,CAChC,EAAE,EAAE,YAAY,EAChB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,SAAS,EAAE,CAAC,CA6BtB"}
@@ -23,6 +23,19 @@ export function assertSafeIdentifier(value, label) {
23
23
  throw new Error(`Unsafe ${label}: "${value}". Only [A-Za-z0-9_] allowed, max 128 chars.`);
24
24
  }
25
25
  }
26
+ /**
27
+ * Catalog name for `OBJECT_ID()` / `index_col()`: `db.owner.table` when the
28
+ * owner is known, `db..table` otherwise. Without the owner, ASE resolves the
29
+ * name to the current user's table first and then dbo's, which can be a
30
+ * different, same-named table from the one `fetchTables` found.
31
+ */
32
+ function objectName(database, tableName, owner) {
33
+ if (!owner) {
34
+ return `${database}..${tableName}`;
35
+ }
36
+ assertSafeIdentifier(owner, "owner");
37
+ return `${database}.${owner}.${tableName}`;
38
+ }
26
39
  // ---------------------------------------------------------------------------
27
40
  // Status bit masks (syscolumns.status / sysindexes.status)
28
41
  // ---------------------------------------------------------------------------
@@ -30,6 +43,20 @@ const COLUMN_STATUS_NULLABLE = 8;
30
43
  const COLUMN_STATUS_IDENTITY = 128;
31
44
  const INDEX_STATUS_UNIQUE = 2;
32
45
  const INDEX_STATUS_PRIMARY = 2048;
46
+ /**
47
+ * Bytes per character of the server's `nchar` and `unichar` types. Catalog
48
+ * lengths of those columns are in bytes, and `@@ncharsize` follows the server
49
+ * charset (1 on a single-byte one), so it cannot be assumed.
50
+ */
51
+ export async function fetchCharSizes(db) {
52
+ const { rows } = await db.executeRaw("SELECT @@ncharsize AS n, @@unicharsize AS u");
53
+ const n = Number(rows[0]?.n);
54
+ const u = Number(rows[0]?.u);
55
+ if (!(Number.isInteger(n) && n > 0 && Number.isInteger(u) && u > 0)) {
56
+ throw new Error("Could not read @@ncharsize / @@unicharsize from the server");
57
+ }
58
+ return { nchar: n, unichar: u };
59
+ }
33
60
  export async function fetchTables(db, database, tableFilter, owner) {
34
61
  assertSafeIdentifier(database, "database");
35
62
  if (owner !== undefined) {
@@ -50,9 +77,10 @@ export async function fetchTables(db, database, tableFilter, owner) {
50
77
  ORDER BY o.name`);
51
78
  return result.rows.map(row => ({ name: row.name, owner: row.owner ?? "" }));
52
79
  }
53
- export async function fetchColumns(db, database, tableName) {
80
+ export async function fetchColumns(db, database, tableName, owner) {
54
81
  assertSafeIdentifier(database, "database");
55
82
  assertSafeIdentifier(tableName, "tableName");
83
+ const object = objectName(database, tableName, owner);
56
84
  // Resolve UDTs to base system types via the systypes hierarchy.
57
85
  // UDTs have usertype >= 100; resolve to the base type (usertype < 100) by
58
86
  // matching on the internal type number and picking MIN(usertype) as the
@@ -73,14 +101,14 @@ export async function fetchColumns(db, database, tableName) {
73
101
  c.status
74
102
  FROM ${database}..syscolumns c
75
103
  JOIN ${database}..systypes t ON c.usertype = t.usertype
76
- WHERE c.id = OBJECT_ID('${database}..${tableName}')
104
+ WHERE c.id = OBJECT_ID('${object}')
77
105
  ORDER BY c.colid`);
78
106
  const defaultsResult = await db.executeRaw(`SELECT
79
107
  c.name AS col_name,
80
108
  com.text AS default_text
81
109
  FROM ${database}..syscolumns c
82
110
  JOIN ${database}..syscomments com ON com.id = c.cdefault
83
- WHERE c.id = OBJECT_ID('${database}..${tableName}')
111
+ WHERE c.id = OBJECT_ID('${object}')
84
112
  AND c.cdefault != 0`);
85
113
  const defaultsMap = new Map(defaultsResult.rows.map(r => [r.col_name, r.default_text?.trim() ?? null]));
86
114
  return result.rows.map(row => {
@@ -101,18 +129,19 @@ export async function fetchColumns(db, database, tableName) {
101
129
  };
102
130
  });
103
131
  }
104
- export async function fetchIndexes(db, database, tableName) {
132
+ export async function fetchIndexes(db, database, tableName, owner) {
105
133
  assertSafeIdentifier(database, "database");
106
134
  assertSafeIdentifier(tableName, "tableName");
135
+ const object = objectName(database, tableName, owner);
107
136
  const result = await db.executeRaw(`SELECT i.name AS index_name, i.indid, i.status, i.keycnt
108
137
  FROM ${database}..sysindexes i
109
- WHERE i.id = OBJECT_ID('${database}..${tableName}')
138
+ WHERE i.id = OBJECT_ID('${object}')
110
139
  AND i.indid > 0
111
140
  AND i.indid < 255
112
141
  AND i.name NOT LIKE 't%'`);
113
142
  const indexes = [];
114
143
  for (const row of result.rows) {
115
- const columns = await fetchIndexColumns(db, database, tableName, row.indid, row.keycnt);
144
+ const columns = await fetchIndexColumns(db, object, row.indid, row.keycnt);
116
145
  if (columns.length > 0) {
117
146
  indexes.push({
118
147
  indexName: row.index_name,
@@ -132,11 +161,11 @@ export async function fetchIndexes(db, database, tableName) {
132
161
  * from `sysindexes`, and all key positions are unioned into one query, so each
133
162
  * index costs exactly one round-trip regardless of key count.
134
163
  */
135
- async function fetchIndexColumns(db, database, tableName, indid, keycnt) {
164
+ async function fetchIndexColumns(db, object, indid, keycnt) {
136
165
  if (keycnt <= 0) {
137
166
  return [];
138
167
  }
139
- const objectRef = escapeString(`${database}..${tableName}`);
168
+ const objectRef = escapeString(object);
140
169
  const selects = [];
141
170
  for (let keyno = 1; keyno <= keycnt; keyno++) {
142
171
  selects.push(`SELECT ${keyno} AS keyno, index_col(${objectRef}, ${indid}, ${keyno}) AS col_name`);
@@ -1 +1 @@
1
- {"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../src/introspect/fetch.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../src/introspect/fetch.ts"],"names":[],"mappings":"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"}
@@ -24,6 +24,7 @@ import type { IntrospectConfig, IntrospectDb } from "./types.js";
24
24
  export type { IntrospectConfig, IntrospectDb, ColumnMeta, IndexMeta, TableMeta } from "./types.js";
25
25
  export type { GeneratedCode } from "./codegen.js";
26
26
  export { SYBASE_TYPE_MAP } from "./type-map.js";
27
+ export type { CharSizes } from "./type-map.js";
27
28
  /**
28
29
  * Introspect a Sybase database using an already-connected db handle.
29
30
  *
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/introspect/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAKH,OAAO,EAAsB,KAAK,aAAa,EAAE,MAAM,cAAc,CAAC;AAEtE,OAAO,KAAK,EAAE,gBAAgB,EAAE,YAAY,EAAa,MAAM,YAAY,CAAC;AAE5E,YAAY,EAAE,gBAAgB,EAAE,YAAY,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACnG,YAAY,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAEhD;;;;;;GAMG;AACH,wBAAsB,cAAc,CAClC,EAAE,EAAE,YAAY,EAChB,OAAO,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAC/D,OAAO,CAAC,aAAa,CAAC,CAaxB;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC,CAoBvF;AAaD;;;GAGG;AACH,wBAAsB,MAAM,CAAC,IAAI,GAAE,MAAM,EAA0B,GAAG,OAAO,CAAC,IAAI,CAAC,CAoDlF"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/introspect/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAKH,OAAO,EAAsB,KAAK,aAAa,EAAE,MAAM,cAAc,CAAC;AAEtE,OAAO,KAAK,EAAE,gBAAgB,EAAE,YAAY,EAAa,MAAM,YAAY,CAAC;AAE5E,YAAY,EAAE,gBAAgB,EAAE,YAAY,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACnG,YAAY,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,YAAY,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE/C;;;;;;GAMG;AACH,wBAAsB,cAAc,CAClC,EAAE,EAAE,YAAY,EAChB,OAAO,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAC/D,OAAO,CAAC,aAAa,CAAC,CAcxB;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC,CAsBvF;AAaD;;;GAGG;AACH,wBAAsB,MAAM,CAAC,IAAI,GAAE,MAAM,EAA0B,GAAG,OAAO,CAAC,IAAI,CAAC,CAoDlF"}
@@ -22,7 +22,7 @@
22
22
  import { writeFileSync } from "node:fs";
23
23
  import { createSybaseDrizzle } from "../db.js";
24
24
  import { generateSchemaCode } from "./codegen.js";
25
- import { fetchColumns, fetchIndexes, fetchTables } from "./fetch.js";
25
+ import { fetchCharSizes, fetchColumns, fetchIndexes, fetchTables } from "./fetch.js";
26
26
  export { SYBASE_TYPE_MAP } from "./type-map.js";
27
27
  /**
28
28
  * Introspect a Sybase database using an already-connected db handle.
@@ -33,15 +33,16 @@ export { SYBASE_TYPE_MAP } from "./type-map.js";
33
33
  */
34
34
  export async function introspectWith(db, options) {
35
35
  const tables = await fetchTables(db, options.database, options.tables, options.owner);
36
+ const charSizes = await fetchCharSizes(db);
36
37
  const tableMetas = [];
37
38
  for (const { name, owner } of tables) {
38
39
  const [columns, indexes] = await Promise.all([
39
- fetchColumns(db, options.database, name),
40
- fetchIndexes(db, options.database, name)
40
+ fetchColumns(db, options.database, name, owner),
41
+ fetchIndexes(db, options.database, name, owner)
41
42
  ]);
42
43
  tableMetas.push({ name, owner, columns, indexes });
43
44
  }
44
- return generateSchemaCode(tableMetas, options.database);
45
+ return generateSchemaCode(tableMetas, options.database, charSizes);
45
46
  }
46
47
  /**
47
48
  * Introspect a Sybase database and return generated code as a string.
@@ -56,7 +57,9 @@ export async function introspectSybase(config) {
56
57
  username: config.username,
57
58
  password: config.password,
58
59
  max: 2,
59
- timeout: config.timeout ?? 30
60
+ timeout: config.timeout ?? 30,
61
+ // Reads only the catalog, never a datetime value.
62
+ warnOnTimeZoneMismatch: false
60
63
  });
61
64
  try {
62
65
  return await introspectWith(db, {
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/introspect/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/introspect/index.ts"],"names":[],"mappings":"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"}