akanjs 3.1.2-rc.0 → 3.1.2-rc.2

package/constant/via.ts

@@ -209,10 +209,6 @@ export interface ConstantMethods<Schema = any> {
   set(obj: Partial<Schema>): this;
 }
 
-type DatabaseSchemaOf<Schema, HiddenKey> = {
-  [K in keyof Schema]: K extends HiddenKey ? NonNullable<Schema[K]> : Schema[K];
-};
-
 export interface ConstantStatics<
   Schema = any,
   OwnSchema = Schema,
@@ -246,7 +242,7 @@ export interface ConstantStatics<
   _SecretKey: SecretKey;
   _OwnSchema: OwnSchema;
   _OwnFieldObj: OwnFieldObj;
-  _DatabaseSchema: DatabaseSchemaOf<Schema, HiddenKey>;
+  _DatabaseSchema: Schema;
   _ModelType: ModelType;
   [SERVER_VALUE]: Schema;
   [CLIENT_VALUE]: Schema;
@@ -264,13 +260,7 @@ export interface DatabaseConstantStatics<Schema = any, FieldObj extends FieldObj
   enums: Set<EnumInstance>;
   text: TextFieldPaths;
   cascade: CascadePaths;
-  _DatabaseSchema: {
-    [K in keyof Schema]: K extends keyof FieldObj
-      ? FieldObj[K]["fieldType"] extends "hidden"
-        ? NonNullable<Schema[K]>
-        : Schema[K]
-      : Schema[K];
-  };
+  _DatabaseSchema: Schema;
 }
 
 export type ConstantModelRef<
@@ -294,7 +284,7 @@ export type DocumentConstantModelRef<
   Schema = any,
   FieldObj extends FieldObject = FieldObject,
   ModelType extends ConstantType = ConstantType,
-  DatabaseSchema = DatabaseSchemaOf<Schema, never>,
+  DatabaseSchema = Schema,
 > = Cls<
   Schema,
   {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akanjs",
-  "version": "3.1.2-rc.0",
+  "version": "3.1.2-rc.2",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {

package/types/constant/via.d.ts

@@ -23,9 +23,6 @@ type ResolvedFieldObject<ResolveField extends (resolve: FieldResolver) => FieldI
 export interface ConstantMethods<Schema = any> {
     set(obj: Partial<Schema>): this;
 }
-type DatabaseSchemaOf<Schema, HiddenKey> = {
-    [K in keyof Schema]: K extends HiddenKey ? NonNullable<Schema[K]> : Schema[K];
-};
 export interface ConstantStatics<Schema = any, OwnSchema = Schema, OwnFieldObj extends FieldObject = FieldObject, OptionalKey = never, RelationKey = never, PrimitiveKey = never, ScalarKey = never, EnumKey = never, MapKey = never, HiddenKey = never, SecretKey = never, ModelType extends ConstantType = ConstantType> {
     [FIELD_META]: FieldObject;
     getDefault: () => DefaultOfSchema<Schema, RelationKey>;
@@ -46,7 +43,7 @@ export interface ConstantStatics<Schema = any, OwnSchema = Schema, OwnFieldObj e
     _SecretKey: SecretKey;
     _OwnSchema: OwnSchema;
     _OwnFieldObj: OwnFieldObj;
-    _DatabaseSchema: DatabaseSchemaOf<Schema, HiddenKey>;
+    _DatabaseSchema: Schema;
     _ModelType: ModelType;
     [SERVER_VALUE]: Schema;
     [CLIENT_VALUE]: Schema;
@@ -63,9 +60,7 @@ export interface DatabaseConstantStatics<Schema = any, FieldObj extends FieldObj
     enums: Set<EnumInstance>;
     text: TextFieldPaths;
     cascade: CascadePaths;
-    _DatabaseSchema: {
-        [K in keyof Schema]: K extends keyof FieldObj ? FieldObj[K]["fieldType"] extends "hidden" ? NonNullable<Schema[K]> : Schema[K] : Schema[K];
-    };
+    _DatabaseSchema: Schema;
 }
 export type ConstantModelRef<Schema = any, FieldObj extends FieldObject = FieldObject, ModelType extends ConstantType = ConstantType> = Cls<Schema, {
     [FIELD_META]: FieldObj;
@@ -76,7 +71,7 @@ export type ConstantModelRef<Schema = any, FieldObj extends FieldObject = FieldO
     text: TextFieldPaths;
     cascade: CascadePaths;
 }>;
-export type DocumentConstantModelRef<Schema = any, FieldObj extends FieldObject = FieldObject, ModelType extends ConstantType = ConstantType, DatabaseSchema = DatabaseSchemaOf<Schema, never>> = Cls<Schema, {
+export type DocumentConstantModelRef<Schema = any, FieldObj extends FieldObject = FieldObject, ModelType extends ConstantType = ConstantType, DatabaseSchema = Schema> = Cls<Schema, {
     [FIELD_META]: FieldObj;
     modelType: ModelType;
     _DatabaseSchema: DatabaseSchema;