zitejs 0.9.103 → 0.9.105

package/dist/cjs/auth/index.js

@@ -7,6 +7,7 @@ exports.logout = logout;
 exports.updateProfile = updateProfile;
 const react_1 = require("better-auth/react");
 const plugins_1 = require("better-auth/client/plugins");
+const constants_js_1 = require("./constants.js");
 const authClient = (0, react_1.createAuthClient)({
     baseURL: '',
     plugins: [
@@ -57,10 +58,21 @@ function loginWithRedirect(opts) {
     // the address bar of every logged-out visitor to the front page, which is the
     // common case. Only pass a destination when it IS one.
     const isRoot = target.pathname === '/' && target.search === '' && target.hash === '';
-    window.location.href = isRoot
-        ? '/auth/login'
-        : '/auth/login?' +
-            new URLSearchParams({ redirectUrl: target.toString() }).toString();
+    const params = new URLSearchParams();
+    if (!isRoot)
+        params.set('redirectUrl', target.toString());
+    // The editor preview rides its usageToken on the app URL; the sign-in page
+    // only shows its editor surface ("Preview as" picker) when that token reaches
+    // it. Capturing the current URL carries it implicitly — but an explicit
+    // `redirectUrl` names a bare path, and would silently drop it. Forward it
+    // top-level either way, so how the app phrases its redirect can't decide
+    // whether the editor gets a preview. Published visitors never have one.
+    const usageToken = new URL(window.location.href).searchParams.get(constants_js_1.USAGE_TOKEN_QUERY_PARAM) ??
+        window._ziteUsageToken;
+    if (usageToken)
+        params.set(constants_js_1.USAGE_TOKEN_QUERY_PARAM, usageToken);
+    const query = params.toString();
+    window.location.href = query ? `/auth/login?${query}` : '/auth/login';
 }
 function logout(opts) {
     (0, exports.signOut)().then(() => {

package/dist/cjs/auth/index.test.js

@@ -147,4 +147,43 @@ function redirectParamOf(href) {
         (0, vitest_1.expect)(params.get('view')).toBeNull();
         (0, vitest_1.expect)(params.get('redirectUrl')).toBe('https://app.zite.so/pricing');
     });
+    (0, vitest_1.it)('forwards the editor usageToken past an explicit redirectUrl', () => {
+        // The editor preview rides its token on the app URL. An explicit
+        // redirectUrl names a bare path, which used to silently drop it — and with
+        // it the sign-in page's whole editor surface ("Preview as" picker).
+        const location = stubLocation('https://app.zite.so/?usageToken=tok-123');
+        authExports.loginWithRedirect({ redirectUrl: '/dashboard' });
+        const params = new URLSearchParams(location.href.split('?')[1] ?? '');
+        (0, vitest_1.expect)(params.get('usageToken')).toBe('tok-123');
+        (0, vitest_1.expect)(params.get('redirectUrl')).toBe('https://app.zite.so/dashboard');
+    });
+    (0, vitest_1.it)('forwards the usageToken top-level on a bare call too', () => {
+        const location = stubLocation('https://app.zite.so/orders/123?usageToken=tok-123');
+        authExports.loginWithRedirect();
+        const params = new URLSearchParams(location.href.split('?')[1] ?? '');
+        (0, vitest_1.expect)(params.get('usageToken')).toBe('tok-123');
+    });
+    (0, vitest_1.it)('carries a token to a root destination that would otherwise say nothing', () => {
+        const location = stubLocation('https://app.zite.so/?usageToken=tok-123');
+        // The token is the whole search string here only if nothing else rides
+        // along — an explicit root override drops the query, exercising the
+        // token-only branch.
+        authExports.loginWithRedirect({ redirectUrl: '/' });
+        (0, vitest_1.expect)(location.href).toBe('/auth/login?usageToken=tok-123');
+    });
+    (0, vitest_1.it)('falls back to window._ziteUsageToken when the URL was scrubbed', () => {
+        // app-runner's injected boot script moves the token off the address bar
+        // into this global before the bundle runs.
+        const location = stubLocation('https://app.zite.so/pricing');
+        window._ziteUsageToken = 'tok-456';
+        authExports.loginWithRedirect({ redirectUrl: '/dashboard' });
+        const params = new URLSearchParams(location.href.split('?')[1] ?? '');
+        (0, vitest_1.expect)(params.get('usageToken')).toBe('tok-456');
+    });
+    (0, vitest_1.it)('adds no token param for ordinary visitors', () => {
+        const location = stubLocation('https://app.zite.so/pricing');
+        authExports.loginWithRedirect();
+        const params = new URLSearchParams(location.href.split('?')[1] ?? '');
+        (0, vitest_1.expect)(params.get('usageToken')).toBeNull();
+    });
 });

package/dist/cjs/sync/lib.js

@@ -14,48 +14,73 @@ const AUTH_USERS_TABLE_ID = "zite_user";
 /**
  * What a field's value looks like when a record is READ back.
  *
- * `| null` on the nullable ones is load-bearing, not pedantry: every field
- * column is created nullable with no default (`recordsTableManager`), and only
- * the six text types get their NULL rewritten to `''` on the way out
- * (`normalizeEmptyStringFields` keys on `emptyValue === ''`). The product's own
- * test asserts `fld_number` and `fld_checkbox` read back as `null`. Typing them
- * non-null let `task.estimate.toFixed(2)` compile and throw.
+ * **These are deliberately optimistic, and that is load-bearing.** Every column
+ * is nullable with no default (`recordsTableManager`) and only the six text
+ * types get NULL rewritten to `''`, so the wire really does answer `null` for
+ * the rest. They are typed `T | undefined` anyway, matching the pre-monorepo
+ * SDK — `| null` appears zero times in its generator.
+ *
+ * Two things have been tried and both broke apps, so before "fixing" this:
+ *
+ * 1. **Typing the truth** (`9a44ab3`). 7880 of 7880 audited 1.0 endpoints
+ *    declare an `outputSchema` written as a mirror of this type with every cell
+ *    `.optional()`, and `createEndpoint` constrains `execute`'s return against
+ *    it. `| null` fails the app's typecheck on lines nobody edited — 52 of 144
+ *    apps, ~2,100 sites.
+ * 2. **Making the runtime emit `undefined`** so the type becomes true. The
+ *    idiom that breaks is `.filter(m => m.homeScore !== null)`, which silently
+ *    becomes a no-op and lets empty rows through: wrong results, no error.
+ *    10 of 328 exported apps do exactly this.
+ *
+ * TODO: make these accurate in a deliberate zitejs major, once apps are
+ * migrated. Each app pins its own version, so the change only reaches apps that
+ * opt in by bumping — which is the only way to do it without breaking (2).
+ *
+ * Writes are unaffected — `null` is how you clear a cell. See
+ * `FIELD_INPUT_TYPE_MAP` and `withNull`.
  */
 const FIELD_TYPE_MAP = {
-    // Text: NULL is rewritten to '' on read, so these genuinely can't be null.
+    // Text: NULL is rewritten to '' on read, so these are never even absent.
     single_line_text: "string",
     long_text: "string",
     rich_text: "string",
     email: "string",
     url: "string",
     phone_number: "string",
-    number: "number | null",
-    currency: "number | null",
-    percent: "number | null",
-    rating: "number | null",
+    number: "number",
+    currency: "number",
+    percent: "number",
+    rating: "number",
     // DECIMAL seconds, unlike Airtable's, which is formatted to "HH:mm:ss".
-    duration: "number | null",
-    checkbox: "boolean | null",
-    single_select: "string | null",
-    multiple_select: "string[] | null",
-    date: "string | null",
-    datetime: "string | null",
-    attachments: "ZiteAttachment[] | null",
+    // 1.0 typed this `string`, which was simply wrong — base-runner groups it
+    // with the numeric types — so it stays a number rather than reverting.
+    duration: "number",
+    checkbox: "boolean",
+    single_select: "string",
+    multiple_select: "string[]",
+    date: "string",
+    datetime: "string",
+    attachments: "ZiteAttachment[]",
     // `string | string[]`, matching the pre-monorepo type. base-runner does force
     // an array on read today, but 1.0 code is written with `typeof x === 'string'`
     // guards — narrowing to `string[]` turns those branches into `never` and
     // fails the app's typecheck for no gain.
     linked_record: "string | string[]",
     user: "string | string[]",
-    lookup: "unknown",
-    rollup: "unknown",
+    // `any`, not `unknown`, and deliberately: these are values the platform
+    // cannot type — a lookup is whatever the far side holds. 1.0 said `any`, and
+    // `unknown` buys nothing because there is no narrowing an app could have
+    // written in advance: `sum + (x || 0)` is a TS2365 on `unknown`, and the
+    // guarded spellings already narrowed fine under `any`.
+    lookup: "any",
+    rollup: "any",
     autonumber: "number",
     // JSONB change metadata (`{ type: "PublicAPI", apiKeyId: 3 }`), not a string.
-    source: "unknown",
-    formula: "unknown",
+    source: "any",
+    formula: "any",
     created_at: "string",
     updated_at: "string",
-    updated_by: "string | null",
+    updated_by: "string",
 };
 /**
  * Field types whose WRITE shape differs from their read shape — the API accepts
@@ -214,9 +239,9 @@ function tsTypeForSchemaField(def, variant = "read") {
                 .map((o) => `"${o.label.replace(/"/g, '\\"')}"`)
                 .join(" | ");
             const union = `${literals} | string`;
-            const read = def.type === "multiple_select"
-                ? `(${union})[] | null`
-                : `${union} | null`;
+            // No `| null` on the read side — see FIELD_TYPE_MAP. The write side keeps
+            // it below, since null is how a select cell is cleared.
+            const read = def.type === "multiple_select" ? `(${union})[]` : union;
             if (variant === "write") {
                 return def.type === "multiple_select"
                     ? `${union} | (${union})[] | null`

package/dist/esm/auth/index.js

@@ -1,5 +1,6 @@
 import { createAuthClient } from 'better-auth/react';
 import { magicLinkClient, inferAdditionalFields, } from 'better-auth/client/plugins';
+import { USAGE_TOKEN_QUERY_PARAM } from './constants.js';
 const authClient = createAuthClient({
     baseURL: '',
     plugins: [
@@ -50,10 +51,21 @@ export function loginWithRedirect(opts) {
     // the address bar of every logged-out visitor to the front page, which is the
     // common case. Only pass a destination when it IS one.
     const isRoot = target.pathname === '/' && target.search === '' && target.hash === '';
-    window.location.href = isRoot
-        ? '/auth/login'
-        : '/auth/login?' +
-            new URLSearchParams({ redirectUrl: target.toString() }).toString();
+    const params = new URLSearchParams();
+    if (!isRoot)
+        params.set('redirectUrl', target.toString());
+    // The editor preview rides its usageToken on the app URL; the sign-in page
+    // only shows its editor surface ("Preview as" picker) when that token reaches
+    // it. Capturing the current URL carries it implicitly — but an explicit
+    // `redirectUrl` names a bare path, and would silently drop it. Forward it
+    // top-level either way, so how the app phrases its redirect can't decide
+    // whether the editor gets a preview. Published visitors never have one.
+    const usageToken = new URL(window.location.href).searchParams.get(USAGE_TOKEN_QUERY_PARAM) ??
+        window._ziteUsageToken;
+    if (usageToken)
+        params.set(USAGE_TOKEN_QUERY_PARAM, usageToken);
+    const query = params.toString();
+    window.location.href = query ? `/auth/login?${query}` : '/auth/login';
 }
 export function logout(opts) {
     signOut().then(() => {

package/dist/esm/auth/index.test.js

@@ -112,4 +112,43 @@ describe('loginWithRedirect', () => {
         expect(params.get('view')).toBeNull();
         expect(params.get('redirectUrl')).toBe('https://app.zite.so/pricing');
     });
+    it('forwards the editor usageToken past an explicit redirectUrl', () => {
+        // The editor preview rides its token on the app URL. An explicit
+        // redirectUrl names a bare path, which used to silently drop it — and with
+        // it the sign-in page's whole editor surface ("Preview as" picker).
+        const location = stubLocation('https://app.zite.so/?usageToken=tok-123');
+        authExports.loginWithRedirect({ redirectUrl: '/dashboard' });
+        const params = new URLSearchParams(location.href.split('?')[1] ?? '');
+        expect(params.get('usageToken')).toBe('tok-123');
+        expect(params.get('redirectUrl')).toBe('https://app.zite.so/dashboard');
+    });
+    it('forwards the usageToken top-level on a bare call too', () => {
+        const location = stubLocation('https://app.zite.so/orders/123?usageToken=tok-123');
+        authExports.loginWithRedirect();
+        const params = new URLSearchParams(location.href.split('?')[1] ?? '');
+        expect(params.get('usageToken')).toBe('tok-123');
+    });
+    it('carries a token to a root destination that would otherwise say nothing', () => {
+        const location = stubLocation('https://app.zite.so/?usageToken=tok-123');
+        // The token is the whole search string here only if nothing else rides
+        // along — an explicit root override drops the query, exercising the
+        // token-only branch.
+        authExports.loginWithRedirect({ redirectUrl: '/' });
+        expect(location.href).toBe('/auth/login?usageToken=tok-123');
+    });
+    it('falls back to window._ziteUsageToken when the URL was scrubbed', () => {
+        // app-runner's injected boot script moves the token off the address bar
+        // into this global before the bundle runs.
+        const location = stubLocation('https://app.zite.so/pricing');
+        window._ziteUsageToken = 'tok-456';
+        authExports.loginWithRedirect({ redirectUrl: '/dashboard' });
+        const params = new URLSearchParams(location.href.split('?')[1] ?? '');
+        expect(params.get('usageToken')).toBe('tok-456');
+    });
+    it('adds no token param for ordinary visitors', () => {
+        const location = stubLocation('https://app.zite.so/pricing');
+        authExports.loginWithRedirect();
+        const params = new URLSearchParams(location.href.split('?')[1] ?? '');
+        expect(params.get('usageToken')).toBeNull();
+    });
 });

package/dist/esm/sync/lib.js

@@ -3,48 +3,73 @@ const AUTH_USERS_TABLE_ID = "zite_user";
 /**
  * What a field's value looks like when a record is READ back.
  *
- * `| null` on the nullable ones is load-bearing, not pedantry: every field
- * column is created nullable with no default (`recordsTableManager`), and only
- * the six text types get their NULL rewritten to `''` on the way out
- * (`normalizeEmptyStringFields` keys on `emptyValue === ''`). The product's own
- * test asserts `fld_number` and `fld_checkbox` read back as `null`. Typing them
- * non-null let `task.estimate.toFixed(2)` compile and throw.
+ * **These are deliberately optimistic, and that is load-bearing.** Every column
+ * is nullable with no default (`recordsTableManager`) and only the six text
+ * types get NULL rewritten to `''`, so the wire really does answer `null` for
+ * the rest. They are typed `T | undefined` anyway, matching the pre-monorepo
+ * SDK — `| null` appears zero times in its generator.
+ *
+ * Two things have been tried and both broke apps, so before "fixing" this:
+ *
+ * 1. **Typing the truth** (`9a44ab3`). 7880 of 7880 audited 1.0 endpoints
+ *    declare an `outputSchema` written as a mirror of this type with every cell
+ *    `.optional()`, and `createEndpoint` constrains `execute`'s return against
+ *    it. `| null` fails the app's typecheck on lines nobody edited — 52 of 144
+ *    apps, ~2,100 sites.
+ * 2. **Making the runtime emit `undefined`** so the type becomes true. The
+ *    idiom that breaks is `.filter(m => m.homeScore !== null)`, which silently
+ *    becomes a no-op and lets empty rows through: wrong results, no error.
+ *    10 of 328 exported apps do exactly this.
+ *
+ * TODO: make these accurate in a deliberate zitejs major, once apps are
+ * migrated. Each app pins its own version, so the change only reaches apps that
+ * opt in by bumping — which is the only way to do it without breaking (2).
+ *
+ * Writes are unaffected — `null` is how you clear a cell. See
+ * `FIELD_INPUT_TYPE_MAP` and `withNull`.
  */
 const FIELD_TYPE_MAP = {
-    // Text: NULL is rewritten to '' on read, so these genuinely can't be null.
+    // Text: NULL is rewritten to '' on read, so these are never even absent.
     single_line_text: "string",
     long_text: "string",
     rich_text: "string",
     email: "string",
     url: "string",
     phone_number: "string",
-    number: "number | null",
-    currency: "number | null",
-    percent: "number | null",
-    rating: "number | null",
+    number: "number",
+    currency: "number",
+    percent: "number",
+    rating: "number",
     // DECIMAL seconds, unlike Airtable's, which is formatted to "HH:mm:ss".
-    duration: "number | null",
-    checkbox: "boolean | null",
-    single_select: "string | null",
-    multiple_select: "string[] | null",
-    date: "string | null",
-    datetime: "string | null",
-    attachments: "ZiteAttachment[] | null",
+    // 1.0 typed this `string`, which was simply wrong — base-runner groups it
+    // with the numeric types — so it stays a number rather than reverting.
+    duration: "number",
+    checkbox: "boolean",
+    single_select: "string",
+    multiple_select: "string[]",
+    date: "string",
+    datetime: "string",
+    attachments: "ZiteAttachment[]",
     // `string | string[]`, matching the pre-monorepo type. base-runner does force
     // an array on read today, but 1.0 code is written with `typeof x === 'string'`
     // guards — narrowing to `string[]` turns those branches into `never` and
     // fails the app's typecheck for no gain.
     linked_record: "string | string[]",
     user: "string | string[]",
-    lookup: "unknown",
-    rollup: "unknown",
+    // `any`, not `unknown`, and deliberately: these are values the platform
+    // cannot type — a lookup is whatever the far side holds. 1.0 said `any`, and
+    // `unknown` buys nothing because there is no narrowing an app could have
+    // written in advance: `sum + (x || 0)` is a TS2365 on `unknown`, and the
+    // guarded spellings already narrowed fine under `any`.
+    lookup: "any",
+    rollup: "any",
     autonumber: "number",
     // JSONB change metadata (`{ type: "PublicAPI", apiKeyId: 3 }`), not a string.
-    source: "unknown",
-    formula: "unknown",
+    source: "any",
+    formula: "any",
     created_at: "string",
     updated_at: "string",
-    updated_by: "string | null",
+    updated_by: "string",
 };
 /**
  * Field types whose WRITE shape differs from their read shape — the API accepts
@@ -203,9 +228,9 @@ function tsTypeForSchemaField(def, variant = "read") {
                 .map((o) => `"${o.label.replace(/"/g, '\\"')}"`)
                 .join(" | ");
             const union = `${literals} | string`;
-            const read = def.type === "multiple_select"
-                ? `(${union})[] | null`
-                : `${union} | null`;
+            // No `| null` on the read side — see FIELD_TYPE_MAP. The write side keeps
+            // it below, since null is how a select cell is cleared.
+            const read = def.type === "multiple_select" ? `(${union})[]` : union;
             if (variant === "write") {
                 return def.type === "multiple_select"
                     ? `${union} | (${union})[] | null`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zitejs",
-  "version": "0.9.103",
+  "version": "0.9.105",
   "description": "The Zite framework — build apps on Zite Database",
   "type": "module",
   "main": "./dist/cjs/index.js",