@hypequery/cli 1.17.0 → 1.18.0

package/dist/typegen/generate-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate-types.d.ts","sourceRoot":"","sources":["../../src/typegen/generate-types.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAMH;;;GAGG;AACH,MAAM,WAAW,8BAA8B;IAC7C,KAAK,CAAC,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,aAAa,CAAA;KAAE,GAAG,OAAO,CAAC;QAChE,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;KAChD,CAAC,CAAC;CACJ;AAED,MAAM,WAAW,oBAAoB;IACnC,6EAA6E;IAC7E,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,wDAAwD;IACxD,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,qCAAqC;IACrC,MAAM,EAAE,8BAA8B,CAAC;IACvC,2DAA2D;IAC3D,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,yDAAyD;IACzD,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AA2HD;;GAEG;AACH,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,8BAA8B,EACtC,OAAO,GAAE,IAAI,CAAC,oBAAoB,EAAE,QAAQ,CAAM,GACjD,OAAO,CAAC,MAAM,CAAC,CAGjB;AAED;;;;GAIG;AACH,wBAAsB,aAAa,CACjC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,MAAM,EAAE,CAAC,CAYnB"}
+{"version":3,"file":"generate-types.d.ts","sourceRoot":"","sources":["../../src/typegen/generate-types.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAMH;;;GAGG;AACH,MAAM,WAAW,8BAA8B;IAC7C,KAAK,CAAC,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,aAAa,CAAA;KAAE,GAAG,OAAO,CAAC;QAChE,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;KAChD,CAAC,CAAC;CACJ;AAED,MAAM,WAAW,oBAAoB;IACnC,6EAA6E;IAC7E,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,wDAAwD;IACxD,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,qCAAqC;IACrC,MAAM,EAAE,8BAA8B,CAAC;IACvC,2DAA2D;IAC3D,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,yDAAyD;IACzD,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AA0HD;;GAEG;AACH,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,8BAA8B,EACtC,OAAO,GAAE,IAAI,CAAC,oBAAoB,EAAE,QAAQ,CAAM,GACjD,OAAO,CAAC,MAAM,CAAC,CAGjB;AAED;;;;GAIG;AACH,wBAAsB,aAAa,CACjC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,MAAM,EAAE,CAAC,CAYnB"}

package/dist/typegen/generate-types.js

@@ -61,8 +61,7 @@ export interface IntrospectedSchema {`;
         const columns = await describeTable(client, table.name);
         typeDefinitions += `\n  ${table.name}: {`;
         for (const column of columns) {
-            const clickHouseType = column.type.replace(/'/g, "\\'"); // Escape single quotes, e.g. `DateTime('UTC')`
-            typeDefinitions += `\n    '${column.name}': '${clickHouseType}';`;
+            typeDefinitions += `\n    '${column.name}': ${JSON.stringify(column.type)};`;
         }
         typeDefinitions += '\n  };';
     }
@@ -73,7 +72,7 @@ export interface IntrospectedSchema {`;
         const columns = await describeTable(client, table.name);
         typeDefinitions += `export interface ${capitalizeFirstLetter(table.name)}Record {`;
         for (const column of columns) {
-            const tsType = clickhouseToTsType(column.type).replace(/'/g, '');
+            const tsType = clickhouseToTsType(column.type);
             typeDefinitions += `\n  '${column.name}': ${tsType};`;
         }
         typeDefinitions += '\n}\n\n';

package/dist/typegen/type-parsing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"type-parsing.d.ts","sourceRoot":"","sources":["../../src/typegen/type-parsing.ts"],"names":[],"mappings":"AAuGA;;;GAGG;AACH,eAAO,MAAM,kBAAkB,GAAI,MAAM,MAAM,KAAG,MAsCjD,CAAC"}
+{"version":3,"file":"type-parsing.d.ts","sourceRoot":"","sources":["../../src/typegen/type-parsing.ts"],"names":[],"mappings":"AAwLA;;;GAGG;AACH,eAAO,MAAM,kBAAkB,GAAI,MAAM,MAAM,KAAG,MA6CjD,CAAC"}

package/dist/typegen/type-parsing.js

@@ -2,7 +2,27 @@ function splitTopLevelArgs(value) {
     const parts = [];
     let current = '';
     let depth = 0;
+    let quote = null;
+    let escaped = false;
     for (const char of value) {
+        if (quote) {
+            current += char;
+            if (escaped) {
+                escaped = false;
+            }
+            else if (char === '\\') {
+                escaped = true;
+            }
+            else if (char === quote) {
+                quote = null;
+            }
+            continue;
+        }
+        if (char === "'" || char === '"' || char === '`') {
+            quote = char;
+            current += char;
+            continue;
+        }
         if (char === '(') {
             depth += 1;
             current += char;
@@ -25,6 +45,50 @@ function splitTopLevelArgs(value) {
     }
     return parts;
 }
+function decodeClickHouseEscape(char) {
+    switch (char) {
+        case 'b': return '\b';
+        case 'f': return '\f';
+        case 'n': return '\n';
+        case 'r': return '\r';
+        case 't': return '\t';
+        case '0': return '\0';
+        default: return char;
+    }
+}
+function parseBacktickTuplePart(part) {
+    let name = '';
+    let escaped = false;
+    for (let index = 1; index < part.length; index += 1) {
+        const char = part[index];
+        if (escaped) {
+            name += decodeClickHouseEscape(char);
+            escaped = false;
+            continue;
+        }
+        if (char === '\\') {
+            escaped = true;
+            continue;
+        }
+        if (char === '`') {
+            const type = part.slice(index + 1);
+            return /^\s+\S/s.test(type) ? { name, type: type.trim() } : null;
+        }
+        name += char;
+    }
+    return null;
+}
+function parseNamedTuplePart(value) {
+    const part = value.trim();
+    if (part.startsWith('`')) {
+        return parseBacktickTuplePart(part);
+    }
+    const match = /^([A-Za-z_][A-Za-z0-9_]*)\s+(.+)$/s.exec(part);
+    return match ? { name: match[1], type: match[2].trim() } : null;
+}
+function formatTypeScriptProperty(name) {
+    return /^[A-Za-z_$][A-Za-z0-9_$]*$/.test(name) ? name : JSON.stringify(name);
+}
 function unwrapType(type, wrapperName) {
     // Trim whitespace and handle case-insensitive matching
     const trimmedType = type.trim();
@@ -104,24 +168,31 @@ function getPrimitiveTsType(type) {
  * equivalent TypeScript type string.
  */
 export const clickhouseToTsType = (type) => {
-    const wrappedArrayType = unwrapType(type, 'Array');
+    const normalizedType = type.trim();
+    const wrappedArrayType = unwrapType(normalizedType, 'Array');
     if (wrappedArrayType) {
         return `Array<${clickhouseToTsType(wrappedArrayType)}>`;
     }
-    const wrappedNullableType = unwrapType(type, 'Nullable');
+    const wrappedNullableType = unwrapType(normalizedType, 'Nullable');
     if (wrappedNullableType) {
         return `${clickhouseToTsType(wrappedNullableType)} | null`;
     }
-    const wrappedLowCardinalityType = unwrapType(type, 'LowCardinality');
+    const wrappedLowCardinalityType = unwrapType(normalizedType, 'LowCardinality');
     if (wrappedLowCardinalityType) {
         return clickhouseToTsType(wrappedLowCardinalityType);
     }
-    const wrappedTupleType = unwrapType(type, 'Tuple');
+    const wrappedTupleType = unwrapType(normalizedType, 'Tuple');
     if (wrappedTupleType) {
         const tupleParts = splitTopLevelArgs(wrappedTupleType);
+        const namedParts = tupleParts.map(parseNamedTuplePart);
+        if (namedParts.length > 0 && namedParts.every((part) => part !== null)) {
+            return `{ ${namedParts
+                .map((part) => `${formatTypeScriptProperty(part.name)}: ${clickhouseToTsType(part.type)}`)
+                .join('; ')} }`;
+        }
         return `[${tupleParts.map((part) => clickhouseToTsType(part)).join(', ')}]`;
     }
-    const wrappedMapType = unwrapType(type, 'Map');
+    const wrappedMapType = unwrapType(normalizedType, 'Map');
     if (wrappedMapType) {
         const mapParts = splitTopLevelArgs(wrappedMapType);
         if (mapParts.length === 2) {
@@ -131,7 +202,7 @@ export const clickhouseToTsType = (type) => {
         }
         return 'Record<string, unknown>';
     }
-    const primitiveType = getPrimitiveTsType(type);
+    const primitiveType = getPrimitiveTsType(normalizedType);
     if (primitiveType)
         return primitiveType;
     // Unsupported or more complex ClickHouse types currently preserve the historical fallback.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hypequery/cli",
-  "version": "1.17.0",
+  "version": "1.18.0",
   "description": "CLI for scaffolding type-safe ClickHouse analytics, semantic datasets, React manifests, and deployments",
   "keywords": [
     "clickhouse",
@@ -30,8 +30,8 @@
     "open": "^10.0.0",
     "ora": "^8.0.1",
     "prompts": "^2.4.2",
-    "@hypequery/protocol": "0.11.0",
-    "@hypequery/deployment": "0.7.3"
+    "@hypequery/deployment": "0.7.3",
+    "@hypequery/protocol": "0.11.0"
   },
   "optionalDependencies": {
     "@napi-rs/keyring": "1.3.0"