@marktiderman/genesis-cli 1.10.0 → 1.11.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -53,7 +53,7 @@
53
53
  }
54
54
  },
55
55
  "@marktiderman/genesis-core": {
56
- "version": "1.9.0"
56
+ "version": "1.10.0"
57
57
  },
58
58
  "@marktiderman/genesis-switchboard": {
59
59
  "version": "2.1.0"
@@ -62,10 +62,10 @@
62
62
  "version": "1.5.0"
63
63
  },
64
64
  "@marktiderman/genesis-extension": {
65
- "version": "0.1.1"
65
+ "version": "0.2.0"
66
66
  },
67
67
  "@marktiderman/genesis-features": {
68
- "version": "0.4.0"
68
+ "version": "0.4.1"
69
69
  },
70
70
  "@marktiderman/genesis-forms": {
71
71
  "version": "0.9.2"
@@ -89,10 +89,10 @@
89
89
  "version": "0.6.3"
90
90
  },
91
91
  "@marktiderman/genesis": {
92
- "version": "0.9.7"
92
+ "version": "0.9.9"
93
93
  },
94
94
  "@marktiderman/genesis-cli": {
95
- "version": "1.10.0"
95
+ "version": "1.11.1"
96
96
  },
97
97
  "@marktiderman/genesis-native": {
98
98
  "version": "0.4.1",
@@ -379,7 +379,7 @@
379
379
  "version": "0.3.1"
380
380
  },
381
381
  "@marktiderman/genesis-supabase": {
382
- "version": "0.5.0",
382
+ "version": "0.6.0",
383
383
  "blocks": {
384
384
  "account": {
385
385
  "feature": {
@@ -480,6 +480,33 @@
480
480
  "Add one job route with createJobsHandler from @marktiderman/genesis-supabase/jobs, and set GENESIS_JOBS_SECRET on the server.",
481
481
  "For schedules: enable pg_cron and pg_net, add the Vault secrets genesis_jobs_url (the route's base URL) and genesis_jobs_secret (the same secret), then call genesis_schedule_job(name, cron, job) in a migration."
482
482
  ]
483
+ },
484
+ "feature-mirror": {
485
+ "feature": {
486
+ "name": "Registry in the app's database",
487
+ "summary": "The feature registry mirrored into the database on deploy, entitlements, per-tenant flag values and SQL feature_on(), for the feature gate.",
488
+ "keywords": [
489
+ "feature gate",
490
+ "entitlements",
491
+ "flags",
492
+ "feature_on"
493
+ ],
494
+ "audience": [
495
+ "developer"
496
+ ]
497
+ },
498
+ "requires": [
499
+ "tenant-features"
500
+ ],
501
+ "migrations": [
502
+ {
503
+ "file": "migrations/0008_genesis_feature_registry.sql",
504
+ "test": "migrations/tests/0008_genesis_feature_registry.test.sql"
505
+ }
506
+ ],
507
+ "steps": [
508
+ "Sync the registry on every deploy with the service key: syncFeatureRegistry(admin, features.json, { version: BUILD_TIME }). Grant paid features by writing feature_entitlements from your billing webhook."
509
+ ]
483
510
  }
484
511
  }
485
512
  },
@@ -674,7 +701,7 @@
674
701
  }
675
702
  },
676
703
  "@marktiderman/genesis-ui": {
677
- "version": "2.15.0"
704
+ "version": "2.16.0"
678
705
  },
679
706
  "@marktiderman/genesis-ui-native": {
680
707
  "version": "2.4.1"
package/dist/index.js CHANGED
@@ -1918,7 +1918,8 @@ var BUILTIN_RULES = [
1918
1918
  "migration-rls",
1919
1919
  "migration-definer-search-path",
1920
1920
  "migration-edited",
1921
- "migration-testing-kit"
1921
+ "migration-testing-kit",
1922
+ "migration-view-rls"
1922
1923
  ];
1923
1924
  var DEFAULT_LOCAL_PRIMITIVE_DIRS = ["src/components/ui"];
1924
1925
  var STARTER_LEFTOVERS = ["components.json", "src/lib/utils.ts"];
@@ -2747,6 +2748,7 @@ function checkSupabasePack(ctx) {
2747
2748
  checkGrants(ctx, migrations.filter((m) => isNew(m.file)), exposed);
2748
2749
  }
2749
2750
  checkRls(ctx, migrations, exposed);
2751
+ checkViewInvoker(ctx, migrations, exposed);
2750
2752
  checkDefinerSearchPath(ctx, migrations);
2751
2753
  checkTestingKit(ctx, migrations);
2752
2754
  }
@@ -2876,6 +2878,50 @@ function checkRls(ctx, migrations, exposed) {
2876
2878
  });
2877
2879
  }
2878
2880
  }
2881
+ function checkViewInvoker(ctx, migrations, exposed) {
2882
+ const views = /* @__PURE__ */ new Map();
2883
+ const name = String.raw`([\w$.]+)`;
2884
+ const invokerOn = /\bsecurity_invoker\s*(?:=\s*(?:true|on|yes|1|'true'|'on'))?\s*(?:,|\))/;
2885
+ for (const { file, statements } of migrations) {
2886
+ for (const { sql, line } of statements) {
2887
+ const create = new RegExp(String.raw`^create (?:or replace )?(?:temp |temporary )?(?:recursive )?view ${name}`).exec(sql);
2888
+ if (create) {
2889
+ if (/^create (?:or replace )?(?:temp|temporary) /.test(sql)) continue;
2890
+ const options = /^[^(]*?\bwith\s*(\([^)]*\))\s*as\b/.exec(sql)?.[1] ?? "";
2891
+ views.set(qualify(create[1]), { invoker: invokerOn.test(options), file, line });
2892
+ continue;
2893
+ }
2894
+ const alter = new RegExp(String.raw`^alter view (?:if exists )?${name} (set|reset) (\([^)]*\))`).exec(sql);
2895
+ if (alter && /\bsecurity_invoker\b/.test(alter[3])) {
2896
+ const state = views.get(qualify(alter[1]));
2897
+ if (state) state.invoker = alter[2] === "set" && invokerOn.test(alter[3]);
2898
+ continue;
2899
+ }
2900
+ const rename = new RegExp(String.raw`^alter view (?:if exists )?${name} rename to ([\w$]+)$`).exec(sql);
2901
+ if (rename) {
2902
+ const from = qualify(rename[1]);
2903
+ const state = views.get(from);
2904
+ if (state) {
2905
+ views.delete(from);
2906
+ views.set(`${schemaOf(from)}.${rename[2]}`, state);
2907
+ }
2908
+ continue;
2909
+ }
2910
+ const drop = /^drop view (?:if exists )?(.+?)(?: cascade| restrict)?$/.exec(sql);
2911
+ if (drop) for (const n of drop[1].split(",")) views.delete(qualify(n));
2912
+ }
2913
+ }
2914
+ for (const [v, at] of views) {
2915
+ if (at.invoker || !exposed.has(schemaOf(v))) continue;
2916
+ ctx.report({
2917
+ rule: "migration-view-rls",
2918
+ file: at.file,
2919
+ line: at.line,
2920
+ subject: v,
2921
+ message: `${v} runs as its owner, so it reads past row level security; create it "with (security_invoker = true)" or add "alter view ${v} set (security_invoker = true);"`
2922
+ });
2923
+ }
2924
+ }
2879
2925
  function checkDefinerSearchPath(ctx, migrations) {
2880
2926
  const fns = /* @__PURE__ */ new Map();
2881
2927
  const keysFor = (sql, nameEnd, fnName) => {
@@ -3086,6 +3132,7 @@ function satisfies(version, range) {
3086
3132
  // src/doctor/installs.ts
3087
3133
  var GENESIS = /^@marktiderman\/genesis(?:-[\w.-]+)?$/;
3088
3134
  var DEV_TOOLS = /* @__PURE__ */ new Set(["@marktiderman/genesis-cli"]);
3135
+ var NON_SHIPPING = /^(?:@marktiderman\/genesis-cli|vitest|@vitest\/.+|jest|jest-.+|@jest\/.+|ts-jest|babel-jest|mocha|ava|c8|nyc|@playwright\/test|playwright|cypress|@testing-library\/.+|happy-dom|jsdom|msw|@types\/.+|typescript|tsx|ts-node|eslint|eslint-.+|@eslint\/.+|@typescript-eslint\/.+|typescript-eslint|prettier|prettier-.+|@biomejs\/.+|oxlint|vite|@vitejs\/.+|vite-plugin-.+|webpack|webpack-.+|rollup|@rollup\/.+|esbuild|tsup|turbo|@storybook\/.+|storybook|@changesets\/.+|husky|lint-staged|wrangler|knip|concurrently|npm-run-all2?|rimraf|cross-env|dotenv-cli)$/;
3089
3136
  var readManifest = (dir) => {
3090
3137
  try {
3091
3138
  return JSON.parse(readFileSync(path14.join(dir, "package.json"), "utf8"));
@@ -3100,6 +3147,11 @@ var real = (p) => {
3100
3147
  return p;
3101
3148
  }
3102
3149
  };
3150
+ var LOCKFILES = ["bun.lock", "bun.lockb", "package-lock.json", "npm-shrinkwrap.json", "yarn.lock", "pnpm-lock.yaml"];
3151
+ function nodeModulesOf(dir) {
3152
+ const parent = path14.dirname(dir);
3153
+ return path14.basename(parent).startsWith("@") ? path14.dirname(parent) : parent;
3154
+ }
3103
3155
  function packagesIn(nodeModules) {
3104
3156
  if (!existsSync(nodeModules)) return [];
3105
3157
  const out = [];
@@ -3148,24 +3200,41 @@ function genesisInstalls(root) {
3148
3200
  for (const r of roots) visit(r.dir, r.by, r.range);
3149
3201
  while (queue.length) {
3150
3202
  const { real: from, manifest, label } = queue.shift();
3151
- const deps = { ...manifest.peerDependencies, ...manifest.optionalDependencies, ...manifest.dependencies };
3203
+ const deps = { ...manifest.optionalDependencies, ...manifest.dependencies };
3152
3204
  for (const [name, range] of Object.entries(deps)) {
3153
3205
  const dir = findPackageDir(from, name);
3154
3206
  if (dir) visit(dir, label, range);
3155
3207
  }
3208
+ for (const [name, range] of Object.entries(manifest.peerDependencies ?? {})) {
3209
+ if (name in deps) continue;
3210
+ const dir = peerOf(from, name);
3211
+ if (dir) visit(dir, label, range);
3212
+ }
3156
3213
  }
3157
3214
  };
3215
+ const peerOf = (from, name) => {
3216
+ const dir = findPackageDir(from, name);
3217
+ if (!dir) return null;
3218
+ if (!ownInstall || name in declared) return dir;
3219
+ const realDir = real(dir);
3220
+ if (realDir.startsWith(realRoot + path14.sep)) return dir;
3221
+ return nodeModulesOf(realDir) === nodeModulesOf(from) ? dir : null;
3222
+ };
3158
3223
  const rootsOf = (deps, by) => Object.entries(deps).flatMap(([name, range]) => {
3159
3224
  const dir = findPackageDir(root, name);
3160
3225
  return dir ? [{ dir, by, ...range ? { range } : {} }] : [];
3161
3226
  });
3162
3227
  const app = readManifest(root);
3163
- let runtimeDeps = { ...app?.peerDependencies, ...app?.optionalDependencies, ...app?.dependencies };
3164
- let devDeps = Object.fromEntries(Object.entries(app?.devDependencies ?? {}).filter(([n]) => !(n in runtimeDeps)));
3165
- if (Object.keys(runtimeDeps).length === 0) {
3166
- runtimeDeps = Object.fromEntries(Object.entries(devDeps).filter(([n]) => !DEV_TOOLS.has(n)));
3167
- devDeps = Object.fromEntries(Object.entries(devDeps).filter(([n]) => DEV_TOOLS.has(n)));
3168
- }
3228
+ const ownInstall = LOCKFILES.some((f) => existsSync(path14.join(root, f)));
3229
+ const declared = { ...app?.devDependencies, ...app?.peerDependencies, ...app?.optionalDependencies, ...app?.dependencies };
3230
+ const declaredDev = Object.entries(app?.devDependencies ?? {});
3231
+ const runtimeDeps = {
3232
+ ...Object.fromEntries(declaredDev.filter(([n]) => !NON_SHIPPING.test(n))),
3233
+ ...app?.peerDependencies,
3234
+ ...app?.optionalDependencies,
3235
+ ...app?.dependencies
3236
+ };
3237
+ const devDeps = Object.fromEntries(declaredDev.filter(([n]) => NON_SHIPPING.test(n) && !(n in runtimeDeps)));
3169
3238
  walk("runtime", rootsOf(runtimeDeps, "the app"));
3170
3239
  const top = path14.join(root, "node_modules");
3171
3240
  walk(
@@ -3176,7 +3245,7 @@ function genesisInstalls(root) {
3176
3245
  }).map((dir) => ({ dir, by: "hoisted, not a direct dependency" }))
3177
3246
  );
3178
3247
  const devRoots = { ...devDeps };
3179
- for (const tool of DEV_TOOLS) if (!(tool in devRoots)) devRoots[tool] = runtimeDeps[tool];
3248
+ for (const tool of DEV_TOOLS) if (!(tool in devRoots) && tool in runtimeDeps) devRoots[tool] = runtimeDeps[tool];
3180
3249
  walk("dev", rootsOf(devRoots, "the app (dev)"));
3181
3250
  for (const [key2, copy] of copies) {
3182
3251
  const kinds = via.get(key2);
@@ -3248,11 +3317,21 @@ function stripForImports(code) {
3248
3317
  const templates = [];
3249
3318
  let depth = 0;
3250
3319
  let i = 0;
3320
+ let sure = true;
3251
3321
  const isSpecifier = () => /(?:\bfrom|(?:^|[;{}\n])\s*import|\bimport\s*\(|\brequire\s*\()\s*$/.test(out.slice(-40).join(""));
3252
- const opensString = () => {
3253
- const before = out.slice(-12).join("");
3254
- if (!/[\w$]$/.test(before)) return true;
3255
- return /(?:^|[^\w$])(?:return|from|import|case|typeof|in|of|else|yield|await|export|default|void|require)$/.test(before);
3322
+ const before = () => out.slice(-24).join("");
3323
+ const KEYWORD = /(?:^|[^\w$.])(?:return|typeof|instanceof|case|do|else|in|of|new|delete|void|throw|yield|await|from|import|export|default|require)\s*$/;
3324
+ const startsExpression = (b) => {
3325
+ const t = b.replace(/\s+$/, "");
3326
+ if (!t) return true;
3327
+ if (KEYWORD.test(b)) return true;
3328
+ return /[([{,;:=!&|?+\-*%<>~^}]$/.test(t);
3329
+ };
3330
+ const exprStart = () => startsExpression(before());
3331
+ const taggedTemplate = () => {
3332
+ const b = out.slice(-48).join("");
3333
+ const m = /([A-Za-z_$][\w$.]*)$/.exec(b);
3334
+ return m !== null && startsExpression(b.slice(0, b.length - m[1].length));
3256
3335
  };
3257
3336
  const templateBody = () => {
3258
3337
  while (i < n) {
@@ -3275,8 +3354,9 @@ function stripForImports(code) {
3275
3354
  i++;
3276
3355
  }
3277
3356
  }
3357
+ sure = false;
3278
3358
  };
3279
- while (i < n) {
3359
+ while (i < n && sure) {
3280
3360
  const ch = code[i];
3281
3361
  const next = code[i + 1];
3282
3362
  if (ch === "/" && next === "/") {
@@ -3295,7 +3375,45 @@ function stripForImports(code) {
3295
3375
  out.push(" ");
3296
3376
  i += 2;
3297
3377
  }
3298
- } else if ((ch === '"' || ch === "'") && opensString()) {
3378
+ } else if (ch === "/" && next !== ">" && code[i - 1] !== "<" && exprStart()) {
3379
+ const afterBrace = /[}>]\s*$/.test(before());
3380
+ const start = i;
3381
+ const mark = out.length;
3382
+ out.push("/");
3383
+ i++;
3384
+ let inClass = false;
3385
+ for (; ; ) {
3386
+ const c = code[i];
3387
+ if (c === void 0 || c === "\n") {
3388
+ if (afterBrace) {
3389
+ out.length = mark;
3390
+ out.push("/");
3391
+ i = start + 1;
3392
+ } else sure = false;
3393
+ break;
3394
+ }
3395
+ if (c === "\\") {
3396
+ out.push(" ", blank(code[i + 1] ?? ""));
3397
+ i += 2;
3398
+ continue;
3399
+ }
3400
+ i++;
3401
+ if (c === "[") inClass = true;
3402
+ else if (c === "]") inClass = false;
3403
+ else if (c === "/" && !inClass) {
3404
+ if (afterBrace && /[<>]/.test(code.slice(start + 1, i - 1))) {
3405
+ out.length = mark;
3406
+ out.push("/");
3407
+ i = start + 1;
3408
+ break;
3409
+ }
3410
+ out.push("/");
3411
+ break;
3412
+ }
3413
+ out.push(" ");
3414
+ }
3415
+ if (out.length > mark + 1 || i > start + 1) while (i < n && /[a-z]/.test(code[i])) out.push(code[i++]);
3416
+ } else if ((ch === '"' || ch === "'") && exprStart()) {
3299
3417
  const keep = isSpecifier();
3300
3418
  out.push(ch);
3301
3419
  i++;
@@ -3308,11 +3426,12 @@ function stripForImports(code) {
3308
3426
  i++;
3309
3427
  }
3310
3428
  }
3311
- if (i < n) {
3429
+ if (code[i] !== ch) sure = false;
3430
+ else {
3312
3431
  out.push(code[i]);
3313
3432
  i++;
3314
3433
  }
3315
- } else if (ch === "`") {
3434
+ } else if (ch === "`" && (exprStart() || taggedTemplate())) {
3316
3435
  out.push("`");
3317
3436
  i++;
3318
3437
  templateBody();
@@ -3329,7 +3448,7 @@ function stripForImports(code) {
3329
3448
  i++;
3330
3449
  }
3331
3450
  }
3332
- return out.join("");
3451
+ return sure && templates.length === 0 ? out.join("") : null;
3333
3452
  }
3334
3453
  function bindings(clause) {
3335
3454
  const out = [];
@@ -3443,6 +3562,11 @@ function createTrail(ctx) {
3443
3562
  const files = [];
3444
3563
  let lost = false;
3445
3564
  const code = stripped(file);
3565
+ if (code === null) {
3566
+ const out2 = { files: [], lost: true };
3567
+ importsCache.set(file.absolutePath, out2);
3568
+ return out2;
3569
+ }
3446
3570
  const used = new Set(renderedElements(code).map((e) => e.split(".")[0]));
3447
3571
  for (const m of code.matchAll(/\b\w*[cC]omponent\s*:\s*([A-Za-z_$][\w$]*)/g)) used.add(m[1]);
3448
3572
  for (const m of code.matchAll(/\bexport\s+default\s+([A-Za-z_$][\w$]*)/g)) used.add(m[1]);
@@ -3479,20 +3603,23 @@ function createTrail(ctx) {
3479
3603
  };
3480
3604
  const strippedCache = /* @__PURE__ */ new Map();
3481
3605
  const stripped = (file) => {
3482
- let c = strippedCache.get(file.absolutePath);
3483
- if (c === void 0) strippedCache.set(file.absolutePath, c = stripForImports(file.code));
3484
- return c;
3606
+ if (!strippedCache.has(file.absolutePath)) strippedCache.set(file.absolutePath, stripForImports(file.code));
3607
+ return strippedCache.get(file.absolutePath);
3485
3608
  };
3486
3609
  const memo = /* @__PURE__ */ new WeakMap();
3487
3610
  const reach = (file, test2, depth, seen) => {
3488
3611
  let cache = memo.get(test2);
3489
- if (!cache) memo.set(test2, cache = /* @__PURE__ */ new Map());
3612
+ if (!cache) memo.set(test2, cache = { free: /* @__PURE__ */ new Map(), cut: /* @__PURE__ */ new Map() });
3490
3613
  const k = `${file.absolutePath}\0${depth}`;
3491
- const cached = cache.get(k);
3492
- if (cached) return [cached, false];
3614
+ const free = cache.free.get(k);
3615
+ if (free) return [free, /* @__PURE__ */ new Set()];
3616
+ const reusable = cache.cut.get(k)?.find((e) => e.cut.every((m) => seen.has(m)));
3617
+ if (reusable) return [reusable.result, new Set(reusable.cut)];
3493
3618
  let result;
3494
- let cut = false;
3495
- if (test2(stripped(file))) result = "yes";
3619
+ const cut = /* @__PURE__ */ new Set();
3620
+ const code = stripped(file);
3621
+ if (code === null) result = "unknown";
3622
+ else if (test2(code)) result = "yes";
3496
3623
  else {
3497
3624
  const { files, lost } = importsOf(file);
3498
3625
  let unknown = lost && depth > 0;
@@ -3501,7 +3628,7 @@ function createTrail(ctx) {
3501
3628
  seen.add(file.absolutePath);
3502
3629
  for (const abs of files) {
3503
3630
  if (seen.has(abs)) {
3504
- cut = true;
3631
+ cut.add(abs);
3505
3632
  continue;
3506
3633
  }
3507
3634
  const target = read(abs);
@@ -3510,7 +3637,7 @@ function createTrail(ctx) {
3510
3637
  continue;
3511
3638
  }
3512
3639
  const [r, c] = reach(target, test2, depth - 1, seen);
3513
- if (c) cut = true;
3640
+ for (const m of c) cut.add(m);
3514
3641
  if (r === "yes") {
3515
3642
  result = "yes";
3516
3643
  break;
@@ -3518,11 +3645,18 @@ function createTrail(ctx) {
3518
3645
  if (r === "unknown") unknown = true;
3519
3646
  }
3520
3647
  seen.delete(file.absolutePath);
3648
+ cut.delete(file.absolutePath);
3521
3649
  }
3522
3650
  if (result === "no" && unknown) result = "unknown";
3523
3651
  }
3524
- if (result === "yes" || !cut) cache.set(k, result);
3525
- return [result, cut && result !== "yes"];
3652
+ if (result === "yes" || cut.size === 0) {
3653
+ cache.free.set(k, result);
3654
+ return [result, /* @__PURE__ */ new Set()];
3655
+ }
3656
+ const entries = cache.cut.get(k) ?? [];
3657
+ entries.push({ cut: [...cut], result });
3658
+ cache.cut.set(k, entries);
3659
+ return [result, cut];
3526
3660
  };
3527
3661
  return { reach: (file, test2, depth = TRAIL_DEPTH) => reach(file, test2, depth, /* @__PURE__ */ new Set())[0] };
3528
3662
  }