@codecks/fetch 1.0.1 → 2.0.1

package/dist/{query-type-BqQ9oX_U.d.ts → query-type-CwrwqxUP.d.ts}

@@ -12,32 +12,47 @@ type TypedField<K extends string, X, Opts extends BaseOpts> = {
 };
 type BaseOpts = {
   optional?: boolean;
-};
+} & TierOpts;
 type FieldEntry = TypedField<string, any, any>;
 type InferSimpleFieldEntry<T extends FieldEntry> = T extends TypedField<any, infer X, infer Opts> ? Opts extends {
   optional: true;
 } ? X | null : X : never;
 //#endregion
 //#region src/models/_desc.d.ts
+/** What the Codecks API promises; the models only hold `stable` and `preview` items. */
+type Stability = "stable" | "preview";
+/** Dates are `YYYY-MM-DD`. `use` names what to read instead. */
+type Deprecation = {
+  since: string;
+  removeAfter: string;
+  use?: string;
+};
+/** Left out for `stable` items that aren't deprecated. */
+type TierOpts = {
+  stability?: Stability;
+  deprecated?: Deprecation;
+};
 type ModelDesc<TName extends string, TFields extends FieldDesc, TRelations extends RelationsDesc, TKey extends (keyof TFields & string)[]> = {
   name: TName;
   keys: TKey;
   fields: TFields;
   relations: TRelations;
-};
+} & TierOpts;
 type AnyDesc = ModelDesc<any, any, any, any[]>;
 type FieldDesc = Record<string, FieldEntry>;
+/** Without an `fk` the relation is its own field, like `resolvable.closedBy`. */
 type BelongsToOpts<TFk extends string> = {
   type: "belongsTo";
-  fk: TFk;
-};
+  fk?: TFk;
+  optional?: boolean;
+} & TierOpts;
 type HasManyOpts = {
   type: "hasMany";
   fkAsArray?: boolean;
-};
+} & TierOpts;
 type HasOneOpts = {
   type: "hasOne";
-};
+} & TierOpts;
 type RelationOpts = BelongsToOpts<any> | HasManyOpts | HasOneOpts;
 type RelationEntry<TRelName extends string, TOpts extends RelationOpts> = {
   relName: TRelName;
@@ -55,7 +70,8 @@ type OrderExpr<T> = {
   field: T;
   dir: "asc" | "desc";
 };
-type Order<T extends AnyDesc> = OneOrArray<OrderString<keyof T["fields"] extends string ? keyof T["fields"] : never>> | OneOrArray<OrderExpr<T["fields"]>>;
+type FieldName<T extends AnyDesc> = keyof T["fields"] & string;
+type Order<T extends AnyDesc> = OneOrArray<OrderString<FieldName<T>>> | OneOrArray<OrderExpr<FieldName<T>>>;
 type Operators<T> = {
   op: "lt" | "lte" | "gt" | "gte";
   value: T;
@@ -180,12 +196,11 @@ type RelQueryEntry<T extends AnyDesc, TMap extends ModelMap, K extends keyof T["
 type RelQuery<T extends AnyDesc, TMap extends ModelMap> = { [K in keyof T["relations"]]?: RelQueryEntry<T, TMap, K> };
 type EnsureModelQuery<T> = T extends ModelQuery<any, any> ? T : never;
 type EnsureHasManyQuery<T> = T extends AbstractHasManyQuery ? T : never;
-type EnrichBelongsTo<M extends AnyDesc, TMap extends ModelMap> = FilterNeverKeys<{ [K in keyof M["relations"]]: M["relations"][K] extends RelationEntry<any, infer Opts> ? Opts extends BelongsToOpts<infer TFk> ? {
+type EnrichBelongsTo<M extends AnyDesc, TMap extends ModelMap> = FilterNeverKeys<{ [K in keyof M["relations"]]: M["relations"][K] extends RelationEntry<any, infer Opts> ? Opts extends BelongsToOpts<any> ? {
   model: TMap[M["relations"][K]["relName"]];
-  fk: TFk;
-  field: M["fields"][TFk] extends TypedField<"belongsTo", infer FieldType, infer FieldOpts> ? {
-    type: FieldType;
-  } & FieldOpts : never;
+  optional: Opts extends {
+    optional: true;
+  } ? true : false;
 } : never : never }>;
 type ExtractHasMany<M extends AnyDesc, TMap extends ModelMap> = FilterNeverKeys<{ [K in keyof M["relations"]]: M["relations"][K] extends RelationEntry<infer RelName, infer Opts> ? Opts extends {
   type: "hasMany";
@@ -200,21 +215,21 @@ type ExtractHasOne<M extends AnyDesc, TMap extends ModelMap> = FilterNeverKeys<{
 }> ? {
   model: TMap[RelName];
 } : never }>;
-type InferModelQuery<M extends AnyDesc, Q extends ModelQuery<M, TMap>, TMap extends ModelMap> = (Q["fields"] extends (keyof M["fields"])[] ? { [K in Q["fields"][number]]: InferFieldType<M["fields"][K]> } : {}) & (Q["relations"] extends RelQuery<M, TMap> ? InferRelQuery<M, Q["relations"], TMap> : {}) & { [K in M["keys"][number] & string]: InferFieldType<M["fields"][K]> } & {
+type InferModelQuery<M extends AnyDesc, Q extends ModelQuery<M, TMap>, TMap extends ModelMap> = (Q["fields"] extends (keyof M["fields"])[] ? { [K in keyof M["fields"] as K extends Q["fields"][number] ? K : never]: InferFieldType<M["fields"][K]> } : {}) & (Q["relations"] extends RelQuery<M, TMap> ? InferRelQuery<M, Q["relations"], TMap> : {}) & { [K in M["keys"][number] & string]: InferFieldType<M["fields"][K]> } & {
   "~model": M["name"];
   "~key": string;
 };
 type IsOptional<T, Test> = Test extends true ? T | null : T;
 type EmptyObjIfNever<T> = [T] extends [never] ? {} : T;
 type ExtractRelQueryArray<M extends AnyDesc, TMap extends ModelMap, Q extends RelQuery<M, TMap>> = { [K in keyof Q]: K extends keyof ExtractHasMany<M, TMap> ? Q[K] extends HasManyQueryWithAs<any, any>[] ? { [Item in Q[K][number] as Item["as"]]: InferHasMany<ExtractHasMany<M, TMap>[K]["model"], TMap, Item> } : never : never }[keyof Q];
-type InferHasMany<M extends AnyDesc, TMap extends ModelMap, QM extends HasManyQuery<M, TMap>> = QM extends {
+type InferHasMany<M extends AnyDesc, TMap extends ModelMap, QM extends AbstractHasManyQuery> = QM extends {
   type: "count";
 } ? number : QM extends {
   type: "exists";
 } ? boolean : QM extends {
   type: "first";
 } ? InferModelQuery<M, EnsureModelQuery<QM>, TMap> | null : InferModelQuery<M, EnsureModelQuery<QM>, TMap>[];
-type InferRelEntry<M extends AnyDesc, TMap extends ModelMap, Q extends RelQuery<any, any>, K extends keyof Q> = K extends keyof EnrichBelongsTo<M, TMap> ? IsOptional<InferModelQuery<EnrichBelongsTo<M, TMap>[K]["model"], EnsureModelQuery<Q[K]>, TMap>, EnrichBelongsTo<M, TMap>[K]["field"]["optional"]> : K extends keyof ExtractHasMany<M, TMap> ? InferHasMany<ExtractHasMany<M, TMap>[K]["model"], TMap, EnsureHasManyQuery<Q[K]>> : K extends keyof ExtractHasOne<M, TMap> ? InferModelQuery<ExtractHasOne<M, TMap>[K]["model"], EnsureModelQuery<Q[K]>, TMap> : never;
+type InferRelEntry<M extends AnyDesc, TMap extends ModelMap, Q extends RelQuery<any, any>, K extends keyof Q> = K extends keyof EnrichBelongsTo<M, TMap> ? IsOptional<InferModelQuery<EnrichBelongsTo<M, TMap>[K]["model"], EnsureModelQuery<Q[K]>, TMap>, EnrichBelongsTo<M, TMap>[K]["optional"]> : K extends keyof ExtractHasMany<M, TMap> ? InferHasMany<ExtractHasMany<M, TMap>[K]["model"], TMap, EnsureHasManyQuery<Q[K]>> : K extends keyof ExtractHasOne<M, TMap> ? InferModelQuery<ExtractHasOne<M, TMap>[K]["model"], EnsureModelQuery<Q[K]>, TMap> : never;
 type InferKeyName<Q extends RelQuery<any, any>, K extends keyof Q> = Q[K] extends Array<any> ? never : Q[K] extends {
   as: string;
 } ? K extends keyof ExtractHasMany<any, any> ? Q[K]["as"] : K : K;