@supatype/cli 0.3.1 → 0.3.2

package/.turbo/turbo-build.log

@@ -1,4 +1,4 @@
 
-> @supatype/cli@0.3.1 build /home/runner/work/supatype/supatype/packages/cli
+> @supatype/cli@0.3.2 build /home/runner/work/supatype/supatype/packages/cli
 > tsc --project tsconfig.json && node --input-type=module -e "import{cpSync,mkdirSync}from'node:fs';const a='dist/assets';mkdirSync(a,{recursive:true});cpSync('assets/supatype-logo-wordmark.ascii.txt',a+'/supatype-logo-wordmark.ascii.txt')"
 

package/.turbo/turbo-test.log

@@ -1,14 +1,14 @@
 
-> @supatype/cli@0.3.1 test /home/runner/work/supatype/supatype/packages/cli
+> @supatype/cli@0.3.2 test /home/runner/work/supatype/supatype/packages/cli
 > vitest run
 
 
  RUN  v4.0.18 /home/runner/work/supatype/supatype/packages/cli
 
- ✓ tests/type-extractor.test.ts (48 tests) 296ms
- ✓ tests/access-composition.test.ts (26 tests) 223ms
- ✓ tests/model-hooks.test.ts (23 tests) 85ms
- ✓ tests/runtime-contract.test.ts (57 tests) 136ms
+ ✓ tests/access-composition.test.ts (26 tests) 265ms
+ ✓ tests/type-extractor.test.ts (49 tests) 459ms
+ ✓ tests/model-hooks.test.ts (23 tests) 178ms
+ ✓ tests/runtime-contract.test.ts (62 tests) 309ms
 stdout | tests/init.test.ts > scaffold() > creates all expected files
   created  package.json
   created  supatype.config.ts
@@ -323,21 +323,22 @@
   created  public/.gitkeep
   created  .gitignore
 
- ✓ tests/init.test.ts (28 tests) 178ms
- ✓ tests/external-database-compose.test.ts (23 tests) 10ms
- ✓ tests/model-constraints.test.ts (18 tests) 146ms
- ✓ tests/model-versions.test.ts (19 tests) 68ms
- ✓ tests/api-config-cache-seed.test.ts (15 tests) 33ms
- ✓ tests/model-cache-declaration.test.ts (18 tests) 83ms
- ✓ tests/field-masking-tier.test.ts (16 tests) 24ms
+ ✓ tests/init.test.ts (28 tests) 173ms
+ ✓ tests/external-database-compose.test.ts (23 tests) 16ms
+ ✓ tests/augmentation-generator.test.ts (16 tests) 30ms
+ ✓ tests/model-constraints.test.ts (18 tests) 243ms
+ ✓ tests/model-versions.test.ts (19 tests) 106ms
+ ✓ tests/api-config-cache-seed.test.ts (15 tests) 42ms
+ ✓ tests/model-cache-declaration.test.ts (18 tests) 115ms
+ ✓ tests/field-masking-tier.test.ts (16 tests) 39ms
 
- ✓ tests/dev-ui.test.ts (21 tests) 92ms
+ ✓ tests/dev-ui.test.ts (21 tests) 130ms
 
 [supatype] Shutting down…
- ✓ tests/hooks-generator.test.ts (7 tests) 6819ms
-     ✓ typechecks under strict mode, together with a handler that uses it  2673ms
-     ✓ rejects a handler for a table that declares no hook  2226ms
-     ✓ typechecks with a validator written the way the docs will show it  1871ms
+ ✓ tests/hooks-generator.test.ts (7 tests) 10509ms
+     ✓ typechecks under strict mode, together with a handler that uses it  3729ms
+     ✓ rejects a handler for a table that declares no hook  3791ms
+     ✓ typechecks with a validator written the way the docs will show it  2921ms
 stdout | tests/docker-runtime.test.ts > requireDockerDaemon > exits when the daemon is unavailable
 
   Start the Docker daemon (e.g. sudo systemctl start docker), then try again.
@@ -346,42 +347,40 @@
 
   docker: daemon down
 
- ✓ tests/docker-runtime.test.ts (10 tests) 14ms
- ✓ tests/config.test.ts (19 tests) 6870ms
-     ✓ loads a valid supatype.config.ts (plain export default, no package imports)  881ms
-     ✓ normalizes shorthand schema string to { path, pg_schema }  904ms
-     ✓ loads a supatype.config.js (plain ESM)  821ms
-     ✓ loads config without a versions section (latest by default)  791ms
-     ✓ prefers supatype.config.ts over supatype.config.js when both exist  679ms
-     ✓ supports optional output field in config  728ms
-     ✓ merges supatype.local.config.ts over base  1156ms
-     ✓ loads defineConfig import before @supatype/cli is installed (init scaffold)  898ms
- ✓ tests/db-preflight.test.ts (14 tests) 7ms
- ✓ tests/keys-write.test.ts (11 tests) 13ms
- ✓ tests/field-bounds.test.ts (23 tests) 9ms
- ✓ tests/cache-clean.test.ts (8 tests) 1641ms
-     ✓ keeps pinned versions and removes the rest  545ms
-     ✓ --force removes pinned versions  543ms
-     ✓ explicit version removes even when pinned (with warning)  525ms
- ✓ tests/functions-deno-types.test.ts (7 tests) 2130ms
-     ✓ tsc fails with Cannot find name Deno without ambient types  1467ms
-     ✓ tsc passes for Deno.env after ensureFunctionsDenoTypes  648ms
- ✓ tests/cache-provider-config.test.ts (12 tests) 10ms
- ✓ tests/field-bounds-matrix.test.ts (124 tests) 21ms
- ✓ tests/engine-floor.test.ts (17 tests) 11ms
- ✓ tests/external-database-config.test.ts (14 tests) 8ms
- ✓ tests/compose-services.test.ts (12 tests) 9ms
- ✓ tests/field-validators.test.ts (10 tests) 45ms
- ✓ tests/native-keyspace.test.ts (10 tests) 29ms
- ✓ tests/command-chrome-coverage.test.ts (1 test) 17ms
- ✓ tests/hook-upload.test.ts (8 tests) 10ms
- ✓ tests/env-file.test.ts (9 tests) 12ms
+ ✓ tests/docker-runtime.test.ts (10 tests) 16ms
+ ✓ tests/config.test.ts (19 tests) 10463ms
+     ✓ loads a valid supatype.config.ts (plain export default, no package imports)  1328ms
+     ✓ normalizes shorthand schema string to { path, pg_schema }  1353ms
+     ✓ loads a supatype.config.js (plain ESM)  1161ms
+     ✓ loads config without a versions section (latest by default)  1543ms
+     ✓ prefers supatype.config.ts over supatype.config.js when both exist  1011ms
+     ✓ supports optional output field in config  1040ms
+     ✓ merges supatype.local.config.ts over base  1764ms
+     ✓ loads defineConfig import before @supatype/cli is installed (init scaffold)  1229ms
+ ✓ tests/db-preflight.test.ts (14 tests) 10ms
+ ✓ tests/keys-write.test.ts (11 tests) 21ms
+ ✓ tests/field-bounds.test.ts (23 tests) 12ms
+ ✓ tests/cache-clean.test.ts (8 tests) 2210ms
+     ✓ keeps pinned versions and removes the rest  671ms
+     ✓ --force removes pinned versions  762ms
+     ✓ explicit version removes even when pinned (with warning)  741ms
+ ✓ tests/cache-provider-config.test.ts (12 tests) 8ms
+ ✓ tests/functions-deno-types.test.ts (7 tests) 3188ms
+     ✓ tsc fails with Cannot find name Deno without ambient types  2269ms
+     ✓ tsc passes for Deno.env after ensureFunctionsDenoTypes  899ms
+ ✓ tests/field-bounds-matrix.test.ts (124 tests) 33ms
+ ✓ tests/engine-floor.test.ts (17 tests) 14ms
+ ✓ tests/external-database-config.test.ts (14 tests) 12ms
+ ✓ tests/compose-services.test.ts (12 tests) 13ms
+ ✓ tests/field-validators.test.ts (10 tests) 81ms
+ ✓ tests/native-keyspace.test.ts (10 tests) 39ms
+ ✓ tests/db-port.test.ts (14 tests) 19ms
+ ✓ tests/command-chrome-coverage.test.ts (1 test) 18ms
+ ✓ tests/hook-upload.test.ts (8 tests) 12ms
+ ✓ tests/env-file.test.ts (9 tests) 20ms
 stdout | tests/link.test.ts > link model > migrates cloud.json into link.json
   created  package.json
-stderr | tests/link.test.ts > link model > migrates cloud.json into link.json
-[supatype] Migrated .supatype/cloud.json → .supatype/link.json (legacy files kept; remove manually when ready).
   created  supatype.config.ts
-
   created  schema/index.ts
   created  .env
   created  seed.ts
@@ -389,10 +388,13 @@
   created  public/.gitkeep
   created  .gitignore
 
- ✓ tests/link.test.ts (4 tests) 2351ms
-     ✓ resolveTarget returns cloud mode with /api/v1 prefix  769ms
-     ✓ resolveTarget returns self-host mode with /platform/v1 prefix  770ms
-     ✓ targetSchemaRollback posts to /platform/v1 when linked  802ms
+stderr | tests/link.test.ts > link model > migrates cloud.json into link.json
+[supatype] Migrated .supatype/cloud.json → .supatype/link.json (legacy files kept; remove manually when ready).
+
+ ✓ tests/link.test.ts (4 tests) 3203ms
+     ✓ resolveTarget returns cloud mode with /api/v1 prefix  1058ms
+     ✓ resolveTarget returns self-host mode with /platform/v1 prefix  1015ms
+     ✓ targetSchemaRollback posts to /platform/v1 when linked  1117ms
 stdout | tests/admin-ensure.test.ts > init admin seed in .env > writes SUPATYPE_ADMIN_* when scaffold options include credentials
   created  package.json
   created  supatype.config.ts
@@ -403,8 +405,8 @@
   created  public/.gitkeep
   created  .gitignore
 
- ✓ tests/admin-ensure.test.ts (10 tests) 143ms
- ✓ tests/service-role-check.test.ts (10 tests) 9ms
+ ✓ tests/admin-ensure.test.ts (10 tests) 164ms
+ ✓ tests/service-role-check.test.ts (10 tests) 14ms
 stdout | tests/admin-studio-membership.test.ts > first admin user creation > does not write a role into app_metadata
 [supatype] Admin user "admin@example.com" created (role: admin).
 [supatype] Log in at /admin after starting the dev server.
@@ -421,39 +423,42 @@
 [supatype] Admin user "admin@example.com" created (role: admin).
 [supatype] Log in at /admin after starting the dev server.
 
- ✓ tests/admin-studio-membership.test.ts (5 tests) 397ms
- ✓ tests/augmentation-generator.test.ts (6 tests) 12ms
+ ✓ tests/admin-studio-membership.test.ts (5 tests) 492ms
  ✓ tests/pull-utils.test.ts (49 tests) 10ms
- ✓ tests/keys.test.ts (11 tests) 12833ms
-     ✓ exits 0 with --secret  1269ms
-     ✓ outputs ANON_KEY= line  1068ms
-     ✓ outputs SERVICE_ROLE_KEY= line  1008ms
-     ✓ ANON_KEY is a valid three-part JWT  1079ms
-     ✓ SERVICE_ROLE_KEY payload has role: service_role  1036ms
-     ✓ JWT has exp in the future  1028ms
-     ✓ --exp-years changes the expiry window  2179ms
-     ✓ reads JWT_SECRET from environment variable  1092ms
-     ✓ reads JWT_SECRET from .env file  1039ms
-     ✓ exits non-zero when no secret is available  1019ms
-     ✓ keys --help shows --secret and --exp-years options  1010ms
- ✓ tests/preview-config-check.test.ts (9 tests) 5ms
- ✓ tests/schema-sources.test.ts (5 tests) 993ms
-     ✓ buildSchemaSourcesPayload includes manifest metadata  485ms
-     ✓ restore overwrites modified local files  476ms
+ ✓ tests/schema-sources.test.ts (5 tests) 1316ms
+     ✓ buildSchemaSourcesPayload includes manifest metadata  542ms
+     ✓ restore overwrites modified local files  729ms
+ ✓ tests/preview-config-check.test.ts (9 tests) 9ms
+ ✓ tests/keys.test.ts (11 tests) 18907ms
+     ✓ exits 0 with --secret  1728ms
+     ✓ outputs ANON_KEY= line  1574ms
+     ✓ outputs SERVICE_ROLE_KEY= line  1444ms
+     ✓ ANON_KEY is a valid three-part JWT  1606ms
+     ✓ SERVICE_ROLE_KEY payload has role: service_role  1463ms
+     ✓ JWT has exp in the future  1582ms
+     ✓ --exp-years changes the expiry window  3261ms
+     ✓ reads JWT_SECRET from environment variable  1569ms
+     ✓ reads JWT_SECRET from .env file  1606ms
+     ✓ exits non-zero when no secret is available  1575ms
+     ✓ keys --help shows --secret and --exp-years options  1493ms
 stderr | tests/binary-cache-cloud-overrides.test.ts > isLinkedToCloudProject > is true when .supatype/cloud.json has projectSlug
 [supatype] Migrated .supatype/cloud.json → .supatype/link.json (legacy files kept; remove manually when ready).
 
- ✓ tests/binary-cache-cloud-overrides.test.ts (11 tests) 15ms
- ✓ tests/homebrew-formula.test.ts (4 tests) 180ms
- ✓ tests/model-cache-manifest.test.ts (12 tests) 7ms
- ✓ tests/minisign.test.ts (5 tests) 11ms
- ✓ tests/local-server-image-env.test.ts (5 tests) 10ms
- ✓ tests/local-secrets.test.ts (5 tests) 7ms
- ✓ tests/functions-concurrency.test.ts (6 tests) 4ms
- ✓ tests/self-host-keys.test.ts (7 tests) 8ms
- ✓ tests/readiness-poll.test.ts (3 tests) 316ms
-     ✓ ends promptly when it carries a deadline  313ms
- ✓ tests/api-schemas.test.ts (10 tests) 5ms
+ ✓ tests/binary-cache-cloud-overrides.test.ts (11 tests) 24ms
+ ✓ tests/homebrew-formula.test.ts (4 tests) 271ms
+ ✓ tests/local-server-image-env.test.ts (5 tests) 20ms
+ ✓ tests/minisign.test.ts (5 tests) 12ms
+ ✓ tests/model-cache-manifest.test.ts (12 tests) 10ms
+ ✓ tests/local-secrets.test.ts (5 tests) 8ms
+ ✓ tests/client-generator.test.ts (9 tests) 18ms
+ ✓ tests/functions-concurrency.test.ts (6 tests) 6ms
+ ✓ tests/readiness-poll.test.ts (3 tests) 329ms
+     ✓ ends promptly when it carries a deadline  322ms
+ ✓ tests/ast-derived-outputs.test.ts (5 tests) 27ms
+ ✓ tests/self-host-keys.test.ts (7 tests) 16ms
+ ✓ tests/functions-context-refresh.test.ts (4 tests) 11ms
+ ✓ tests/api-schemas.test.ts (10 tests) 10ms
+ ✓ tests/gitignore-secrets.test.ts (5 tests) 95ms
 stdout | tests/storage-provision.test.ts > provisionBuckets > POSTs each bucket to the storage API
 [supatype] Storage bucket "photos" ready.
 
@@ -461,11 +466,12 @@
 [supatype] Storage bucket "avatars" ready.
 
  ✓ tests/storage-provision.test.ts (6 tests) 10ms
- ✓ tests/cached-artifact-format.test.ts (7 tests) 10ms
- ✓ tests/cache-identity-scope.test.ts (33 tests) 7ms
- ✓ tests/target-client-refresh.test.ts (3 tests) 8ms
- ✓ tests/studio-admin-roles.test.ts (6 tests) 5ms
- ✓ tests/proxy-dev-app.test.ts (7 tests) 5ms
+ ✓ tests/strict.test.ts (7 tests) 11ms
+ ✓ tests/cached-artifact-format.test.ts (7 tests) 14ms
+ ✓ tests/cache-identity-scope.test.ts (33 tests) 12ms
+ ✓ tests/target-client-refresh.test.ts (3 tests) 11ms
+ ✓ tests/studio-admin-roles.test.ts (6 tests) 9ms
+ ✓ tests/proxy-dev-app.test.ts (7 tests) 6ms
 stdout | tests/app-command.test.ts > supatype app add --static > sets app.mode=static and static_dir in supatype.config.ts
   created  package.json
   created  supatype.config.ts
@@ -486,77 +492,79 @@
   created  public/.gitkeep
   created  .gitignore
 
- ✓ tests/service-role-routes.test.ts (4 tests) 1314ms
-     ✓ reads the declared list  475ms
-     ✓ is an empty list when a project declares none  437ms
-     ✓ sends what the project declared, hook entries included  400ms
- ✓ tests/compose-parsable-defaults.test.ts (2 tests) 6ms
- ✓ tests/app-command.test.ts (2 tests) 2406ms
-     ✓ sets app.mode=static and static_dir in supatype.config.ts  1266ms
-     ✓ creates the static directory when missing  1139ms
- ✓ tests/rest-cache-admin.test.ts (3 tests) 34ms
- ✓ tests/init-dependency-versions.test.ts (4 tests) 23ms
- ✓ tests/type-resolver.test.ts (2 tests) 14ms
- ✓ tests/cli-help.test.ts (16 tests) 17210ms
-     ✓ --help lists all top-level commands  1097ms
-     ✓ --version prints package.json version  1092ms
-     ✓ self-update --help describes the command  1017ms
-     ✓ init --help describes the init command  1138ms
-     ✓ push --help describes the push command and --yes flag  1144ms
-     ✓ diff --help describes the diff command  1098ms
-     ✓ pull --help describes scaffold pull command  1074ms
-     ✓ doctor --help describes drift report command  1072ms
-     ✓ introspect --help describes database introspection command  1044ms
-     ✓ adopt --help describes adoption ceremony command  1086ms
-     ✓ reset --help shows --yes flag  983ms
-     ✓ app --help describes the app command with add/remove subcommands  918ms
-     ✓ app add --help shows --static and --port options  1057ms
-     ✓ self-host --help shows compose only (legacy commands hidden)  1115ms
-     ✓ self-host compose --help shows compose subcommands  1131ms
-     ✓ unknown command exits non-zero  1135ms
- ✓ tests/engine-push-output.test.ts (7 tests) 5ms
- ✓ tests/command-chrome-wrap.test.ts (3 tests) 5ms
- ✓ tests/doctor-render.test.ts (3 tests) 5ms
- ✓ tests/cli-install-method.test.ts (8 tests) 11ms
- ✓ tests/port-in-use.test.ts (4 tests) 17ms
- ✓ tests/archive-name-alias.test.ts (4 tests) 5ms
- ✓ tests/ensure-binary.test.ts (2 tests) 7ms
- ✓ tests/init-project-detect.test.ts (4 tests) 6ms
- ✓ tests/tsx-runner.test.ts (7 tests) 2317ms
-       ✓ evaluates a simple expression and returns stdout  300ms
-       ✓ can serialize a JSON object to stdout  336ms
-       ✓ returns non-zero exit code on runtime error  349ms
-       ✓ captures stderr separately from stdout  354ms
-       ✓ runs a .ts file and returns its stdout  405ms
- ✓ tests/doctor-service-role.test.ts (4 tests) 4ms
- ✓ tests/required-host-components.test.ts (4 tests) 5ms
- ✓ tests/dev-ports-owner.test.ts (6 tests) 3ms
+ ✓ tests/service-role-routes.test.ts (4 tests) 1872ms
+     ✓ reads the declared list  582ms
+     ✓ is an empty list when a project declares none  646ms
+     ✓ sends what the project declared, hook entries included  640ms
+ ✓ tests/compose-parsable-defaults.test.ts (2 tests) 8ms
+ ✓ tests/app-command.test.ts (2 tests) 3419ms
+     ✓ sets app.mode=static and static_dir in supatype.config.ts  1745ms
+     ✓ creates the static directory when missing  1672ms
+ ✓ tests/rest-cache-admin.test.ts (3 tests) 55ms
+ ✓ tests/init-dependency-versions.test.ts (4 tests) 42ms
+ ✓ tests/cli-help.test.ts (16 tests) 24704ms
+     ✓ --help lists all top-level commands  1544ms
+     ✓ --version prints package.json version  1558ms
+     ✓ self-update --help describes the command  1544ms
+     ✓ init --help describes the init command  1554ms
+     ✓ push --help describes the push command and --yes flag  1589ms
+     ✓ diff --help describes the diff command  1493ms
+     ✓ pull --help describes scaffold pull command  1574ms
+     ✓ doctor --help describes drift report command  1472ms
+     ✓ introspect --help describes database introspection command  1583ms
+     ✓ adopt --help describes adoption ceremony command  1508ms
+     ✓ reset --help shows --yes flag  1474ms
+     ✓ app --help describes the app command with add/remove subcommands  1443ms
+     ✓ app add --help shows --static and --port options  1675ms
+     ✓ self-host --help shows compose only (legacy commands hidden)  1568ms
+     ✓ self-host compose --help shows compose subcommands  1558ms
+     ✓ unknown command exits non-zero  1561ms
+ ✓ tests/engine-push-output.test.ts (7 tests) 13ms
+ ✓ tests/type-resolver.test.ts (2 tests) 21ms
+ ✓ tests/command-chrome-wrap.test.ts (3 tests) 7ms
+ ✓ tests/doctor-render.test.ts (3 tests) 6ms
+ ✓ tests/cli-install-method.test.ts (8 tests) 8ms
+ ✓ tests/port-in-use.test.ts (4 tests) 24ms
+ ✓ tests/archive-name-alias.test.ts (4 tests) 7ms
+ ✓ tests/init-project-detect.test.ts (4 tests) 12ms
+ ✓ tests/ensure-binary.test.ts (2 tests) 15ms
+ ✓ tests/tsx-runner.test.ts (7 tests) 3274ms
+       ✓ evaluates a simple expression and returns stdout  466ms
+       ✓ evaluates TypeScript syntax (type annotations)  442ms
+       ✓ can serialize a JSON object to stdout  456ms
+       ✓ returns non-zero exit code on syntax error  419ms
+       ✓ returns non-zero exit code on runtime error  526ms
+       ✓ captures stderr separately from stdout  392ms
+       ✓ runs a .ts file and returns its stdout  568ms
+ ✓ tests/doctor-service-role.test.ts (4 tests) 7ms
+ ✓ tests/required-host-components.test.ts (4 tests) 7ms
  ✓ tests/ui-messages.test.ts (5 tests) 7ms
- ✓ tests/normalize-admin-config.test.ts (1 test) 5ms
- ✓ tests/ui-confirm.test.ts (3 tests) 6ms
- ✓ tests/docker-postgres.test.ts (5 tests) 3ms
- ✓ tests/binary-download-lock.test.ts (2 tests) 5ms
- ✓ tests/dev-session-lock.test.ts (2 tests) 4ms
- ✓ tests/config-load-failure.test.ts (2 tests) 2749ms
-     ✓ is reported, rather than treated as absent  1585ms
-     ✓ does not stop the CLI working with no config at all  1162ms
- ✓ tests/dev-ports.test.ts (3 tests) 4ms
- ✓ tests/route-manifest.test.ts (1 test) 4ms
- ✓ tests/dev-ready-panel.test.ts (2 tests) 3ms
- ✓ tests/realtime-launch.test.ts (1 test) 4ms
- ✓ tests/release-pins.test.ts (2 tests) 3ms
+ ✓ tests/dev-ports-owner.test.ts (6 tests) 6ms
+ ✓ tests/normalize-admin-config.test.ts (1 test) 9ms
+ ✓ tests/ui-confirm.test.ts (3 tests) 8ms
+ ✓ tests/docker-postgres.test.ts (5 tests) 5ms
+ ✓ tests/binary-download-lock.test.ts (2 tests) 9ms
+ ✓ tests/dev-session-lock.test.ts (2 tests) 6ms
+ ✓ tests/config-load-failure.test.ts (2 tests) 3861ms
+     ✓ is reported, rather than treated as absent  2316ms
+     ✓ does not stop the CLI working with no config at all  1542ms
+ ✓ tests/dev-ports.test.ts (3 tests) 7ms
+ ✓ tests/route-manifest.test.ts (1 test) 9ms
+ ✓ tests/realtime-launch.test.ts (1 test) 6ms
+ ✓ tests/release-pins.test.ts (2 tests) 6ms
+ ✓ tests/dev-ready-panel.test.ts (2 tests) 4ms
  ✓ tests/ensure-dev-api-config.test.ts (1 test) 4ms
- ✓ tests/seed-discover.test.ts (2 tests) 10ms
- ✓ tests/init-package-json.test.ts (1 test) 3ms
- ✓ tests/pg-spawn-env.test.ts (2 tests) 3ms
- ✓ tests/resolve-api-url.test.ts (2 tests) 3ms
- ✓ tests/cli-package-version.test.ts (1 test) 2ms
- ✓ tests/migrate-from-v1.test.ts (1 test) 9ms
- ✓ tests/postgres-archive-tag.test.ts (1 test) 2ms
- ✓ tests/stdin-after-ink.test.ts (1 test) 2ms
-
- Test Files  95 passed (95)
-      Tests  997 passed (997)
-   Start at  09:25:57
-   Duration  39.48s (transform 6.25s, setup 0ms, import 40.35s, tests 62.64s, environment 15ms)
+ ✓ tests/seed-discover.test.ts (2 tests) 24ms
+ ✓ tests/init-package-json.test.ts (1 test) 4ms
+ ✓ tests/pg-spawn-env.test.ts (2 tests) 4ms
+ ✓ tests/resolve-api-url.test.ts (2 tests) 6ms
+ ✓ tests/cli-package-version.test.ts (1 test) 4ms
+ ✓ tests/migrate-from-v1.test.ts (1 test) 12ms
+ ✓ tests/postgres-archive-tag.test.ts (1 test) 3ms
+ ✓ tests/stdin-after-ink.test.ts (1 test) 3ms
+
+ Test Files  101 passed (101)
+      Tests  1057 passed (1057)
+   Start at  06:44:27
+   Duration  58.81s (transform 9.89s, setup 0ms, import 62.00s, tests 91.35s, environment 20ms)
 

package/.turbo/turbo-typecheck.log

@@ -1,4 +1,4 @@
 
-> @supatype/cli@0.3.1 typecheck /home/runner/work/supatype/supatype/packages/cli
+> @supatype/cli@0.3.2 typecheck /home/runner/work/supatype/supatype/packages/cli
 > tsc --project tsconfig.json --noEmit && tsc --project tests/tsconfig.json --noEmit
 

package/dist/api-config-cache.d.ts

@@ -14,6 +14,26 @@ export interface CacheSeedResult {
  * creates it.
  */
 export declare function seedApiConfigCache(cwd: string, ast: unknown): CacheSeedResult | null;
+/**
+ * What a newly declared table is switched on as.
+ *
+ * `allow_public` follows the declaration rather than defaulting off: the schema saying `public` is
+ * a considered statement that this table's reads are the same for everyone, and `push` has already
+ * refused it where the read rule varies by caller. Defaulting it off would make the declaration
+ * mean nothing until someone ticked a box that the schema had already justified.
+ */
+/**
+ * What a push or a dev boot should say about cache seeding, as lines to print.
+ *
+ * Returns the text rather than printing it, because the two callers write to the console
+ * differently and the thing worth sharing is the decision about what to say, not the formatting.
+ * Extracted from `push` when `dev` grew the same need: `seedApiConfigCache` had exactly one caller
+ * for a long time, which is why a stack brought up with `supatype dev` alone had no cache
+ * allowlist at all and nothing anywhere said so.
+ *
+ * Never an error, and never a rewrite of an entry that already exists. See `seedApiConfigCache`.
+ */
+export declare function cacheSeedingNotes(cwd: string, ast: unknown): string[];
 /**
  * §13.4's note, in the words of the project that will read it — or null when there is nothing to
  * say.

package/dist/api-config-cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api-config-cache.d.ts","sourceRoot":"","sources":["../src/api-config-cache.ts"],"names":[],"mappings":"AAgCA,MAAM,WAAW,eAAe;IAC9B,0FAA0F;IAC1F,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,yFAAyF;IACzF,QAAQ,EAAE,OAAO,CAAA;IACjB,6EAA6E;IAC7E,QAAQ,EAAE,MAAM,EAAE,CAAA;CACnB;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,GAAG,eAAe,GAAG,IAAI,CA4CpF;AAmBD;;;;;;;;;;;;GAYG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE;IAAE,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAW9G"}
+{"version":3,"file":"api-config-cache.d.ts","sourceRoot":"","sources":["../src/api-config-cache.ts"],"names":[],"mappings":"AAgCA,MAAM,WAAW,eAAe;IAC9B,0FAA0F;IAC1F,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,yFAAyF;IACzF,QAAQ,EAAE,OAAO,CAAA;IACjB,6EAA6E;IAC7E,QAAQ,EAAE,MAAM,EAAE,CAAA;CACnB;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,GAAG,eAAe,GAAG,IAAI,CA4CpF;AAED;;;;;;;GAOG;AACH;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,GAAG,MAAM,EAAE,CAiBrE;AAWD;;;;;;;;;;;;GAYG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE;IAAE,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAW9G"}

package/dist/api-config-cache.js

@@ -82,6 +82,33 @@ export function seedApiConfigCache(cwd, ast) {
  * refused it where the read rule varies by caller. Defaulting it off would make the declaration
  * mean nothing until someone ticked a box that the schema had already justified.
  */
+/**
+ * What a push or a dev boot should say about cache seeding, as lines to print.
+ *
+ * Returns the text rather than printing it, because the two callers write to the console
+ * differently and the thing worth sharing is the decision about what to say, not the formatting.
+ * Extracted from `push` when `dev` grew the same need: `seedApiConfigCache` had exactly one caller
+ * for a long time, which is why a stack brought up with `supatype dev` alone had no cache
+ * allowlist at all and nothing anywhere said so.
+ *
+ * Never an error, and never a rewrite of an entry that already exists. See `seedApiConfigCache`.
+ */
+export function cacheSeedingNotes(cwd, ast) {
+    const result = seedApiConfigCache(cwd, ast);
+    if (result === null)
+        return [];
+    const notes = [];
+    if (result.seeded.length > 0) {
+        notes.push(`Server cache enabled for ${result.seeded.join(", ")} in .supatype/api-config.json`);
+    }
+    if (result.ttlIsOff) {
+        // A note rather than a fix. Zero is an off switch someone may have chosen, and a push that
+        // turned caching on project-wide would be overriding a decision rather than filling in a blank.
+        notes.push(`${result.declared.length} table(s) declare a cache, but cache_max_ttl is 0, so nothing ` +
+            `is cached until it is set, under API > REST > Settings or in .supatype/api-config.json.`);
+    }
+    return notes;
+}
 function seedEntry(entry) {
     return { enabled: true, allow_public: entry.public === true };
 }

package/dist/api-config-cache.js.map

@@ -1 +1 @@
-{"version":3,"file":"api-config-cache.js","sourceRoot":"","sources":["../src/api-config-cache.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"api-config-cache.js","sourceRoot":"","sources":["../src/api-config-cache.ts"],"names":[],"mappings":"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"}

package/dist/augmentation-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"augmentation-generator.d.ts","sourceRoot":"","sources":["../src/augmentation-generator.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,QAAQ;IACvB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;IAC/C,WAAW,CAAC,EAAE;QACZ,EAAE,CAAC,EAAE;YAAE,SAAS,CAAC,EAAE,MAAM,CAAC;YAAC,OAAO,CAAC,EAAE,OAAO,EAAE,CAAA;SAAE,CAAA;KACjD,CAAA;CACF;AAMD;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM,CAQxD;AAUD,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CA2B/D;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,MAAM,CAOvF;AAMD,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,MAAM,CAU1F;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,MAAM,CAO1F"}
+{"version":3,"file":"augmentation-generator.d.ts","sourceRoot":"","sources":["../src/augmentation-generator.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,QAAQ;IACvB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;IAC/C,WAAW,CAAC,EAAE;QACZ,EAAE,CAAC,EAAE;YAAE,SAAS,CAAC,EAAE,MAAM,CAAC;YAAC,OAAO,CAAC,EAAE,OAAO,EAAE,CAAA;SAAE,CAAA;KACjD,CAAA;CACF;AAMD;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM,CAQxD;AAUD,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CA2B/D;AAkDD,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,MAAM,CAKvF;AAMD,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,MAAM,CAU1F;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,MAAM,CAK1F"}