@contember/cli 2.2.0-alpha.2 → 2.2.0-alpha.4

package/dist/types/lib/tenant/tenantConfig.d.ts

@@ -1,34 +1,21 @@
-import type { ConfigCaptchaInput, ConfigInput, ConfigLoginInput, ConfigPasswordInput, ConfigPasswordlessInput, ConfigRateLimitsInput, ConfigRateLimitWindowInput, IDPOptions, MailTemplate } from '@contember/graphql-client-tenant';
-export type { CaptchaProvider, ConfigPolicy, MailType } from '@contember/graphql-client-tenant';
+import type { AuthPolicyInput, ConfigCaptchaInput, ConfigInput, ConfigLoginInput, ConfigPasswordInput, ConfigPasswordlessInput, ConfigRateLimitsInput, ConfigRateLimitWindowInput, IDPOptions, MailTemplate } from '@contember/graphql-client-tenant';
+export type { AuthPolicyScope, CaptchaProvider, ConfigPolicy, MailType } from '@contember/graphql-client-tenant';
 /**
  * ISO 8601 duration string, e.g. `"P1D"` (1 day) or `"PT5M"` (5 minutes).
  */
 export type Interval = string;
-/** Adds `| null` to the given keys of an otherwise non-nullable generated input. */
-type WithNullable<T, K extends keyof T> = Omit<T, K> & {
-    readonly [P in K]?: T[P] | null;
-};
-export type TenantPasswordConfig = WithNullable<ConfigPasswordInput, 'pattern'>;
-export type TenantLoginConfig = WithNullable<ConfigLoginInput, 'maxTokenExpiration'>;
-export type TenantPasswordlessConfig = WithNullable<ConfigPasswordlessInput, 'url'>;
+export type TenantPasswordConfig = ConfigPasswordInput;
+export type TenantLoginConfig = ConfigLoginInput;
+export type TenantPasswordlessConfig = ConfigPasswordlessInput;
 /**
  * `provider: null` disables captcha verification.
  * `secret` is write-only: `null`/omitted leaves the stored value unchanged, `''` clears it.
  */
-export type TenantCaptchaConfig = WithNullable<ConfigCaptchaInput, 'provider' | 'secret' | 'threshold'>;
+export type TenantCaptchaConfig = ConfigCaptchaInput;
 export type TenantRateLimitWindow = ConfigRateLimitWindowInput;
 export type TenantRateLimitsConfig = ConfigRateLimitsInput;
-/**
- * Maps to the tenant `configure(config: ConfigInput!)` mutation. New config
- * groups added to the schema flow through automatically; only the groups that
- * need `| null` overrides are pinned.
- */
-export type TenantGlobalConfig = Omit<ConfigInput, 'password' | 'login' | 'passwordless' | 'captcha'> & {
-    readonly password?: TenantPasswordConfig;
-    readonly login?: TenantLoginConfig;
-    readonly passwordless?: TenantPasswordlessConfig;
-    readonly captcha?: TenantCaptchaConfig;
-};
+/** Maps to the tenant `configure(config: ConfigInput!)` mutation. */
+export type TenantGlobalConfig = ConfigInput;
 export type TenantIdpOptions = IDPOptions;
 /**
  * A single identity provider. The record key is used as the provider slug.
@@ -46,7 +33,17 @@ export interface TenantIdpConfig {
     disabled?: boolean;
 }
 /** Maps to the `addMailTemplate(template: MailTemplate!)` mutation. */
-export type TenantMailTemplate = WithNullable<MailTemplate, 'projectSlug' | 'replyTo'>;
+export type TenantMailTemplate = MailTemplate;
+/**
+ * A per-role MFA / session policy. `project` is a project slug, required for
+ * `scope: 'project'` and rejected for `scope: 'global'` (validated server-side).
+ *
+ * Unlike identity providers there is no server-side slug, so entries are matched
+ * against existing rows by `scope` + `project` + the `roles` **set** (order does
+ * not matter). Editing `roles` therefore reads as a different policy: a new row
+ * is created and the old one is left in place — see `TenantConfigApplier`.
+ */
+export type TenantAuthPolicy = AuthPolicyInput;
 /**
  * Declarative tenant configuration. Applied idempotently by
  * `contember tenant:apply`.
@@ -56,6 +53,7 @@ export interface TenantConfig {
     /** Identity providers keyed by slug. */
     identityProviders?: Record<string, TenantIdpConfig>;
     mailTemplates?: TenantMailTemplate[];
+    authPolicies?: TenantAuthPolicy[];
 }
 /**
  * Type-safe helper for authoring a `tenant.config.ts`. Returns the config

package/dist/types/lib/tenant/tenantConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tenantConfig.d.ts","sourceRoot":"","sources":["../../../../src/lib/tenant/tenantConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACX,kBAAkB,EAClB,WAAW,EACX,gBAAgB,EAChB,mBAAmB,EACnB,uBAAuB,EACvB,qBAAqB,EACrB,0BAA0B,EAC1B,UAAU,EACV,YAAY,EACZ,MAAM,kCAAkC,CAAA;AAOzC,YAAY,EAAE,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAA;AAE/F;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAA;AAE7B,oFAAoF;AACpF,KAAK,YAAY,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG;IAAE,QAAQ,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI;CAAE,CAAA;AAE1F,MAAM,MAAM,oBAAoB,GAAG,YAAY,CAAC,mBAAmB,EAAE,SAAS,CAAC,CAAA;AAE/E,MAAM,MAAM,iBAAiB,GAAG,YAAY,CAAC,gBAAgB,EAAE,oBAAoB,CAAC,CAAA;AAEpF,MAAM,MAAM,wBAAwB,GAAG,YAAY,CAAC,uBAAuB,EAAE,KAAK,CAAC,CAAA;AAEnF;;;GAGG;AACH,MAAM,MAAM,mBAAmB,GAAG,YAAY,CAAC,kBAAkB,EAAE,UAAU,GAAG,QAAQ,GAAG,WAAW,CAAC,CAAA;AAEvG,MAAM,MAAM,qBAAqB,GAAG,0BAA0B,CAAA;AAE9D,MAAM,MAAM,sBAAsB,GAAG,qBAAqB,CAAA;AAE1D;;;;GAIG;AACH,MAAM,MAAM,kBAAkB,GAAG,IAAI,CAAC,WAAW,EAAE,UAAU,GAAG,OAAO,GAAG,cAAc,GAAG,SAAS,CAAC,GAAG;IACvG,QAAQ,CAAC,QAAQ,CAAC,EAAE,oBAAoB,CAAA;IACxC,QAAQ,CAAC,KAAK,CAAC,EAAE,iBAAiB,CAAA;IAClC,QAAQ,CAAC,YAAY,CAAC,EAAE,wBAAwB,CAAA;IAChD,QAAQ,CAAC,OAAO,CAAC,EAAE,mBAAmB,CAAA;CACtC,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG,UAAU,CAAA;AAEzC;;;;;;;GAOG;AACH,MAAM,WAAW,eAAe;IAC/B,IAAI,EAAE,MAAM,CAAA;IACZ,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACtC,OAAO,CAAC,EAAE,gBAAgB,CAAA;IAC1B,gFAAgF;IAChF,QAAQ,CAAC,EAAE,OAAO,CAAA;CAClB;AAED,uEAAuE;AACvE,MAAM,MAAM,kBAAkB,GAAG,YAAY,CAAC,YAAY,EAAE,aAAa,GAAG,SAAS,CAAC,CAAA;AAEtF;;;GAGG;AACH,MAAM,WAAW,YAAY;IAC5B,MAAM,CAAC,EAAE,kBAAkB,CAAA;IAC3B,wCAAwC;IACxC,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;IACnD,aAAa,CAAC,EAAE,kBAAkB,EAAE,CAAA;CACpC;AAED;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,kBAAkB,GAAI,QAAQ,YAAY,KAAG,YAAsB,CAAA"}
+{"version":3,"file":"tenantConfig.d.ts","sourceRoot":"","sources":["../../../../src/lib/tenant/tenantConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACX,eAAe,EACf,kBAAkB,EAClB,WAAW,EACX,gBAAgB,EAChB,mBAAmB,EACnB,uBAAuB,EACvB,qBAAqB,EACrB,0BAA0B,EAC1B,UAAU,EACV,YAAY,EACZ,MAAM,kCAAkC,CAAA;AAIzC,YAAY,EAAE,eAAe,EAAE,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAA;AAEhH;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAA;AAE7B,MAAM,MAAM,oBAAoB,GAAG,mBAAmB,CAAA;AAEtD,MAAM,MAAM,iBAAiB,GAAG,gBAAgB,CAAA;AAEhD,MAAM,MAAM,wBAAwB,GAAG,uBAAuB,CAAA;AAE9D;;;GAGG;AACH,MAAM,MAAM,mBAAmB,GAAG,kBAAkB,CAAA;AAEpD,MAAM,MAAM,qBAAqB,GAAG,0BAA0B,CAAA;AAE9D,MAAM,MAAM,sBAAsB,GAAG,qBAAqB,CAAA;AAE1D,qEAAqE;AACrE,MAAM,MAAM,kBAAkB,GAAG,WAAW,CAAA;AAE5C,MAAM,MAAM,gBAAgB,GAAG,UAAU,CAAA;AAEzC;;;;;;;GAOG;AACH,MAAM,WAAW,eAAe;IAC/B,IAAI,EAAE,MAAM,CAAA;IACZ,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACtC,OAAO,CAAC,EAAE,gBAAgB,CAAA;IAC1B,gFAAgF;IAChF,QAAQ,CAAC,EAAE,OAAO,CAAA;CAClB;AAED,uEAAuE;AACvE,MAAM,MAAM,kBAAkB,GAAG,YAAY,CAAA;AAE7C;;;;;;;;GAQG;AACH,MAAM,MAAM,gBAAgB,GAAG,eAAe,CAAA;AAE9C;;;GAGG;AACH,MAAM,WAAW,YAAY;IAC5B,MAAM,CAAC,EAAE,kBAAkB,CAAA;IAC3B,wCAAwC;IACxC,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;IACnD,aAAa,CAAC,EAAE,kBAAkB,EAAE,CAAA;IACpC,YAAY,CAAC,EAAE,gBAAgB,EAAE,CAAA;CACjC;AAED;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,kBAAkB,WAAY,YAAY,KAAG,YAAsB,CAAA"}

package/dist/types/lib/transfer/DataTransferClient.d.ts

@@ -1,17 +1,23 @@
+import { CliError } from '@contember/cli-common';
 import { Readable } from 'node:stream';
 import { RemoteProject } from '../project/RemoteProject.js';
+export interface DataExportResponse {
+    readonly body: ReadableStream<Uint8Array> | Readable | null;
+}
 export declare class DataTransferClient {
     dataImport: ({ printProgress, stream, project, gzip }: {
         stream: Readable;
         project: RemoteProject;
         printProgress: (message: string) => void;
         gzip: boolean;
-    }) => Promise<Response>;
+    }) => Promise<void>;
     dataExport: ({ project: { name: project, token, endpoint: baseUrl }, gzip, includeSystem, excludeTables }: {
         project: RemoteProject;
         excludeTables?: string[];
         includeSystem: boolean;
         gzip: boolean;
-    }) => Promise<Response>;
+    }) => Promise<DataExportResponse>;
 }
+export declare const toDataExportStream: (response: DataExportResponse) => Readable;
+export declare const toDataTransferStreamError: (operation: 'Import' | 'Export', cause: unknown) => CliError;
 //# sourceMappingURL=DataTransferClient.d.ts.map

package/dist/types/lib/transfer/DataTransferClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DataTransferClient.d.ts","sourceRoot":"","sources":["../../../../src/lib/transfer/DataTransferClient.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAEtC,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAE3D,qBAAa,kBAAkB;IAC9B,UAAU,GAAU,0CAA0C;QAC7D,MAAM,EAAE,QAAQ,CAAA;QAChB,OAAO,EAAE,aAAa,CAAA;QACtB,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;QACxC,IAAI,EAAE,OAAO,CAAA;KACb,uBA0DA;IAED,UAAU,GAAU,8FAA8F;QACjH,OAAO,EAAE,aAAa,CAAA;QACtB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAA;QACxB,aAAa,EAAE,OAAO,CAAA;QACtB,IAAI,EAAE,OAAO,CAAA;KACb,uBAiBA;CACD"}
+{"version":3,"file":"DataTransferClient.d.ts","sourceRoot":"","sources":["../../../../src/lib/transfer/DataTransferClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAY,MAAM,uBAAuB,CAAA;AAE1D,OAAO,EAAe,QAAQ,EAAE,MAAM,aAAa,CAAA;AAGnD,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAoN3D,MAAM,WAAW,kBAAkB;IAClC,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC,UAAU,CAAC,GAAG,QAAQ,GAAG,IAAI,CAAA;CAC3D;AAcD,qBAAa,kBAAkB;IAC9B,UAAU,6CAAoD;QAC7D,MAAM,EAAE,QAAQ,CAAA;QAChB,OAAO,EAAE,aAAa,CAAA;QACtB,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;QACxC,IAAI,EAAE,OAAO,CAAA;KACb,KAAG,OAAO,CAAC,IAAI,CAAC,CAuGhB;IAED,UAAU,iGAAwG;QACjH,OAAO,EAAE,aAAa,CAAA;QACtB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAA;QACxB,aAAa,EAAE,OAAO,CAAA;QACtB,IAAI,EAAE,OAAO,CAAA;KACb,KAAG,OAAO,CAAC,kBAAkB,CAAC,CA0B9B;CACD;AAED,eAAO,MAAM,kBAAkB,aAAc,kBAAkB,KAAG,QASjE,CAAA;AAED,eAAO,MAAM,yBAAyB,cAAe,QAAQ,GAAG,QAAQ,SAAS,OAAO,KAAG,QAAiD,CAAA"}

package/dist/types/lib/transfer/stdio.d.ts

@@ -1,2 +1,4 @@
-export declare const printProgressLine: (message: string) => void;
+import { Output } from '@contember/cli-common';
+/** Binds a single-line progress reporter to the command's Output instead of writing to stdout directly. */
+export declare const createProgressReporter: (output: Output) => (message: string) => void;
 //# sourceMappingURL=stdio.d.ts.map

package/dist/types/lib/transfer/stdio.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stdio.d.ts","sourceRoot":"","sources":["../../../../src/lib/transfer/stdio.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,iBAAiB,GAAI,SAAS,MAAM,SAOhD,CAAA"}
+{"version":3,"file":"stdio.d.ts","sourceRoot":"","sources":["../../../../src/lib/transfer/stdio.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAA;AAE9C,2GAA2G;AAC3G,eAAO,MAAM,sBAAsB,WAAY,MAAM,eAAe,MAAM,KAAG,IAE5E,CAAA"}

package/dist/types/lib/workspace/WorkspaceResolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WorkspaceResolver.d.ts","sourceRoot":"","sources":["../../../../src/lib/workspace/WorkspaceResolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAE1C,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAElD,MAAM,WAAW,kBAAkB;IAClC,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,EAAE,MAAM,GAAG,KAAK,CAAA;IACzB,YAAY,CAAC,EAAE,MAAM,CAAA;CACrB;AAED,qBAAa,iBAAiB;IAE5B,OAAO,CAAC,QAAQ,CAAC,WAAW;gBAAX,WAAW,EAAE,WAAW;IAI1C,OAAO,GAAU,SAAS,MAAM,KAAG,OAAO,CAAC,SAAS,CAAC,CAcpD;YAEa,UAAU;CAWxB"}
+{"version":3,"file":"WorkspaceResolver.d.ts","sourceRoot":"","sources":["../../../../src/lib/workspace/WorkspaceResolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAE1C,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAElD,MAAM,WAAW,kBAAkB;IAClC,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,EAAE,MAAM,GAAG,KAAK,CAAA;IACzB,YAAY,CAAC,EAAE,MAAM,CAAA;CACrB;AAED,qBAAa,iBAAiB;IAE5B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAD7B,YACkB,WAAW,EAAE,WAAW,EAEzC;IAED,OAAO,YAAmB,MAAM,KAAG,OAAO,CAAC,SAAS,CAAC,CAcpD;YAEa,UAAU;CAWxB"}