@syncular/typegen 0.15.7 → 0.15.9

package/README.md

@@ -236,12 +236,14 @@ and Rust clients create a contentful FTS table with a private stable source-ID
 column and deterministic maintenance triggers. FTS is local-only: it is not a
 wire/server table, cannot be subscribed or mutated, and maps back to its owner
 for named-query invalidation. Columns must precede options, be distinct
-non-encrypted strings, and number 1–32. `content` is required. Supported
-tokenizers are `unicode61` (default), its `remove_diacritics 0|1|2` variants,
-`porter unicode61`, and `trigram`. Other modules/options/tokenizers, encrypted
-columns, or schema-object name collisions fail generation. There is no
-automatic `LIKE` fallback when FTS5 is unavailable; local schema creation
-fails loudly.
+declared strings, and number 1–32. Encrypted declared-string columns are
+allowed because the projection is built only from the decrypted local mirror;
+ciphertext remains the only wire and server representation. `content` is
+required. Supported tokenizers are `unicode61` (default), its
+`remove_diacritics 0|1|2` variants, `porter unicode61`, and `trigram`. Other
+modules/options/tokenizers or schema-object name collisions fail generation.
+There is no automatic `LIKE` fallback when FTS5 is unavailable; local schema
+creation fails loudly.
 
 **Hard errors** (each names the construct and source file): any other
 statement (`CREATE TRIGGER/VIEW`, `DROP INDEX`, DML, `ALTER … RENAME`, …); unknown
@@ -252,7 +254,7 @@ or parameterized types (`VARCHAR(36)`); quoted identifiers
 or missing primary keys; `PRIMARY KEY` on `ADD COLUMN`; duplicate
 tables/columns; ASC/DESC, expression, or partial (`WHERE`) index columns; a
 duplicate or unknown-column index; unsupported virtual-table modules or FTS5
-options; an FTS projection without an owner or with invalid/encrypted columns;
+options; an FTS projection without an owner or with invalid columns;
 trailing clauses (`STRICT`).
 
 **`DEFAULT` literals are accepted and ignored**: typegen extracts the

package/dist/generate.js

@@ -50,14 +50,6 @@ function buildTable(manifestTable, parsed) {
         }
     }
     const columns = applyEncryption(parsed, scopes, manifestTable.encryptedColumns);
-    for (const ftsIndex of parsed.ftsIndexes) {
-        for (const columnName of ftsIndex.columns) {
-            const column = columns.find((candidate) => candidate.name === columnName);
-            if (column?.encrypted === true) {
-                throw new TypegenError(MANIFEST_FILENAME, `table ${parsed.name}: FTS index ${JSON.stringify(ftsIndex.name)} cannot index encrypted column ${JSON.stringify(columnName)}`);
-            }
-        }
-    }
     return {
         name: parsed.name,
         primaryKey: parsed.primaryKey,

package/dist/query.js

@@ -949,12 +949,17 @@ export function analyzeStatement(name, location, statementText, ir, db, naming =
             };
         }
         if (source !== null) {
-            // Exact: IR column type + IR nullability. (decltype agrees; we prefer
-            // the IR type so blob_ref/crdt/json semantic types survive.)
+            // Exact: app-facing queries read the decrypted local mirror. Encrypted
+            // columns therefore expose their pre-wire declaredType, while the schema
+            // IR and mutation codec continue to carry the bytes wire type.
+            const sourceType = source.column.encrypted === true &&
+                source.column.declaredType !== undefined
+                ? source.column.declaredType
+                : source.column.type;
             return {
                 name: sqlName,
                 langName,
-                type: source.column.type,
+                type: sourceType,
                 nullable: source.column.nullable,
                 fidelity: 'exact',
                 origin: { table: source.table, column: source.column.name },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@syncular/typegen",
-  "version": "0.15.7",
+  "version": "0.15.9",
   "description": "Syncular schema-to-TypeScript type generator and the `syncular` CLI",
   "license": "Apache-2.0",
   "author": "Benjamin Kniffler",
@@ -48,7 +48,7 @@
     "!dist/**/*.test.d.ts"
   ],
   "devDependencies": {
-    "@syncular/core": "0.15.7",
-    "@syncular/server": "0.15.7"
+    "@syncular/core": "0.15.9",
+    "@syncular/server": "0.15.9"
   }
 }

package/src/generate.ts

@@ -113,17 +113,6 @@ function buildTable(
     scopes,
     manifestTable.encryptedColumns,
   );
-  for (const ftsIndex of parsed.ftsIndexes) {
-    for (const columnName of ftsIndex.columns) {
-      const column = columns.find((candidate) => candidate.name === columnName);
-      if (column?.encrypted === true) {
-        throw new TypegenError(
-          MANIFEST_FILENAME,
-          `table ${parsed.name}: FTS index ${JSON.stringify(ftsIndex.name)} cannot index encrypted column ${JSON.stringify(columnName)}`,
-        );
-      }
-    }
-  }
   return {
     name: parsed.name,
     primaryKey: parsed.primaryKey,

package/src/query.ts

@@ -1378,12 +1378,18 @@ export function analyzeStatement(
       };
     }
     if (source !== null) {
-      // Exact: IR column type + IR nullability. (decltype agrees; we prefer
-      // the IR type so blob_ref/crdt/json semantic types survive.)
+      // Exact: app-facing queries read the decrypted local mirror. Encrypted
+      // columns therefore expose their pre-wire declaredType, while the schema
+      // IR and mutation codec continue to carry the bytes wire type.
+      const sourceType =
+        source.column.encrypted === true &&
+        source.column.declaredType !== undefined
+          ? source.column.declaredType
+          : source.column.type;
       return {
         name: sqlName,
         langName,
-        type: source.column.type,
+        type: sourceType,
         nullable: source.column.nullable,
         fidelity: 'exact',
         origin: { table: source.table, column: source.column.name },