update types

Author: eveffer

deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@inspatial/cloud",
-  "version": "0.6.13",
+  "version": "0.6.14",
   "license": "Apache-2.0",
   "exports": {
     ".": "./mod.ts",

src/auth/settings/_auth-settings.type.ts

@@ -22,7 +22,7 @@ export interface AuthSettings extends SettingsBase {
   hostname?: string;
   isFieldModified(
     fieldKey: keyof {
-      [K in keyof AuthSettings as K extends keyof EntryBase ? never : K]: K;
+      [K in keyof AuthSettings as K extends keyof SettingsBase ? never : K]: K;
     },
   ): boolean;
 }

src/email/settings/_email-settings.type.ts

@@ -24,7 +24,7 @@ export interface EmailSettings extends SettingsBase {
   defaultSendAccount__title?: string;
   isFieldModified(
     fieldKey: keyof {
-      [K in keyof EmailSettings as K extends keyof EntryBase ? never : K]: K;
+      [K in keyof EmailSettings as K extends keyof SettingsBase ? never : K]: K;
     },
   ): boolean;
 }

src/extension/settings/_system-settings.type.ts

@@ -17,7 +17,8 @@ export interface SystemSettings extends SettingsBase {
   serverHost: string;
   isFieldModified(
     fieldKey: keyof {
-      [K in keyof SystemSettings as K extends keyof EntryBase ? never : K]: K;
+      [K in keyof SystemSettings as K extends keyof SettingsBase ? never : K]:
+        K;
     },
   ): boolean;
 }

src/onboarding/_onboarding.type.ts

@@ -10,7 +10,7 @@ export interface Onboarding extends SettingsBase {
   enabled?: boolean;
   isFieldModified(
     fieldKey: keyof {
-      [K in keyof Onboarding as K extends keyof EntryBase ? never : K]: K;
+      [K in keyof Onboarding as K extends keyof SettingsBase ? never : K]: K;
     },
   ): boolean;
 }

src/orm/build/generate-interface/generate-interface.ts

@@ -28,7 +28,7 @@ export async function generateEntryInterface(
 
   const fields = buildFields(entryType.fields);
   outLines.push(...fields);
-  outLines.push(...buildOthers(className));
+  outLines.push(...buildOthers("entry", className));
   for (const child of entryType.children?.values() || []) {
     const childFields = buildFields(child.fields);
     outLines.push(
@@ -67,7 +67,7 @@ export async function generateSettingsInterfaces(
 
   const fields = buildFields(settingsType.fields);
   outLines.push(...fields);
-  outLines.push(...buildOthers(interfaceName));
+  outLines.push(...buildOthers("settings", interfaceName));
   for (const child of settingsType.children?.values() || []) {
     const childFields = buildFields(child.fields);
     outLines.push(
@@ -82,10 +82,12 @@ export async function generateSettingsInterfaces(
   await writeInterfaceFile(filePath, outLines.join("\n"));
   await formatInterfaceFile(filePath);
 }
-function buildOthers(interfaceName: string) {
+function buildOthers(forType: "entry" | "settings", interfaceName: string) {
   return [`isFieldModified(
     fieldKey: keyof {
-      [K in keyof ${interfaceName} as K extends keyof EntryBase ? never : K]: K;
+      [K in keyof ${interfaceName} as K extends keyof ${
+    forType === "entry" ? "EntryBase" : "SettingsBase"
+  } ? never : K]: K;
     },
   ): boolean;`];
 }