@everystack/cli 0.4.15 → 0.4.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@everystack/cli",
-  "version": "0.4.15",
+  "version": "0.4.17",
   "description": "CLI and OTA updates for Expo apps on everystack",
   "license": "AGPL-3.0-only",
   "author": "Scalable Technology, Inc. <licensing@scalable.technology>",
@@ -82,7 +82,7 @@
     "structured-headers": "1.0.1",
     "tsx": "4.21.0",
     "typescript": "5.9.3",
-    "@everystack/model": "0.4.3"
+    "@everystack/model": "0.4.4"
   },
   "peerDependencies": {
     "@everystack/server": ">=0.1.0",

package/src/cli/derived-render.ts

@@ -296,10 +296,15 @@ export function renderDerivedSource(catalog: DerivedCatalog, opts: DerivedRender
           need('defineMaterializedTable');
           need('field');
           need('sql');
+          // MODEL naming idiom: bare table + a schema prop. The derived layer's
+          // qualified-first-arg spelling must NOT leak here — defineModel stores the
+          // table name verbatim, so 'stats.x' would become a dot-containing identifier
+          // in public and 3-part-qualify (public.stats.x) downstream.
           lines.push(
             ...fixmes,
-            `export const ${varName} = defineMaterializedTable(${tsString(declaredName(o))}, {`,
+            `export const ${varName} = defineMaterializedTable(${tsString(o.name)}, {`,
             `  ${abilities.length ? `abilities: [${abilities.join(', ')}],` : 'private: true,'}`,
+            ...(o.schema !== 'public' ? [`  schema: ${tsString(o.schema)},`] : []),
             '  fields: {',
             ...fieldLines,
             '  },',

package/src/cli/model-render.ts

@@ -112,6 +112,7 @@ const FIELD_FACTORY: Record<string, string> = {
   real: 'real',
   'double precision': 'doublePrecision',
   boolean: 'boolean',
+  json: 'json',
   jsonb: 'jsonb',
   date: 'date',
   'timestamp with time zone': 'timestamptz',

package/src/cli/schema-compile.ts

@@ -86,6 +86,7 @@ const PG_TYPE: Record<string, string> = {
   uuid: 'uuid',
   integer: 'integer',
   boolean: 'boolean',
+  json: 'json',
   jsonb: 'jsonb',
   bigint: 'bigint',
   serial: 'integer',

package/src/cli/schema-source.ts

@@ -96,6 +96,8 @@ function baseColumnSource(columnName: string, spec: FieldSpec): { call: string;
         : { call: `varchar(${n})`, builder: 'varchar' };
     case 'jsonb':
       return { call: `jsonb(${n})`, builder: 'jsonb' };
+    case 'json':
+      return { call: `json(${n})`, builder: 'json' };
     case 'enum': {
       if (!spec.enumName) throw new Error('enum field is missing enumName');
       return { call: `${enumConstName(spec.enumName)}(${n})`, builder: enumConstName(spec.enumName) };