akanjs 3.0.0-alpha.106 → 3.0.0-alpha.108

package/constant/types.ts

@@ -63,18 +63,22 @@ export class BaseInsight {
   declare count: number;
 }
 
-export interface ProtoFile {
+export interface ProtoLightFile {
   id: string;
   filename: string;
   abstractData: string | null;
   imageSize: [number, number];
-  progress: number | null;
+  progress?: number | null;
   url: string;
   size: number;
   status: string;
   createdAt: Dayjs;
   updatedAt: Dayjs;
   removedAt: Dayjs | null;
+}
+
+export interface ProtoFile extends ProtoLightFile {
+  progress: number | null;
   mimetype: string;
   encoding: string;
   origin: string | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akanjs",
-  "version": "3.0.0-alpha.106",
+  "version": "3.0.0-alpha.108",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {

package/store/action.ts

@@ -18,6 +18,7 @@ import {
   type FieldState,
   immerify,
   type ProtoFile,
+  type ProtoLightFile,
   withSharedInstances,
 } from "akanjs/constant";
 import type { BaseFilterSortKey, ExtractSort, FilterInstance } from "akanjs/document";
@@ -241,7 +242,7 @@ type FormSetter<
   ArrayFieldAddSetters<RefName, _CapitalizedRefName, _DefaultState> &
   ArrayFieldSubSetters<RefName, _CapitalizedRefName, _DefaultState> &
   ArrayFieldAddOrSubSetters<RefName, _CapitalizedRefName, _DefaultState> & {
-    [K in keyof _DefaultState as _DefaultState[K] extends (ProtoFile | null) | ProtoFile[]
+    [K in keyof _DefaultState as _DefaultState[K] extends (ProtoLightFile | null) | ProtoLightFile[]
       ? K extends string
         ? SetterKey<"upload", K, RefName, _CapitalizedRefName>
         : never
@@ -412,19 +413,23 @@ export const makeFormSetter = (refName: string, fetch: FetchProxy<any>) => {
                 form.id,
               );
               if (field.isArray) {
-                const idx = index ?? (form[namesOfField.field] as ProtoFile[]).length;
-                this.set((state: { [key: string]: { [key: string]: ProtoFile[] } }) => {
+                const idx = index ?? (form[namesOfField.field] as ProtoLightFile[]).length;
+                this.set((state: { [key: string]: { [key: string]: ProtoLightFile[] } }) => {
                   state[names.modelForm][namesOfField.field] = [
-                    ...(form[namesOfField.field] as ProtoFile[]).slice(0, idx),
+                    ...(form[namesOfField.field] as ProtoLightFile[]).slice(0, idx),
                     ...files,
-                    ...(form[namesOfField.field] as ProtoFile[]).slice(idx),
+                    ...(form[namesOfField.field] as ProtoLightFile[]).slice(idx),
                   ];
                 });
               } else {
-                this.set((state: { [key: string]: { [key: string]: ProtoFile | null } }) => {
+                this.set((state: { [key: string]: { [key: string]: ProtoLightFile | null } }) => {
                   state[names.modelForm][namesOfField.field] = files[0];
                 });
               }
+              
+              const fileReadName = ConstantRegistry.isLight(field.modelRef)
+                ? `light${capitalize(fileUploadRefName)}`
+                : fileUploadRefName;
               files.forEach((file) => {
                 let attemptsLeft = UPLOAD_POLL_ATTEMPTS;
                 const intervalKey = setInterval(() => {
@@ -433,25 +438,23 @@ export const makeFormSetter = (refName: string, fetch: FetchProxy<any>) => {
                     attemptsLeft -= 1;
                     try {
                       const currentFile = await (
-                        (fetch as { [key: string]: any })[fileUploadRefName as string] as (
-                          id: string,
-                        ) => Promise<ProtoFile>
+                        (fetch as { [key: string]: any })[fileReadName] as (id: string) => Promise<ProtoLightFile>
                       )(file.id);
                       if (field.isArray)
-                        this.set((state: { [key: string]: { [key: string]: ProtoFile[] } }) => {
+                        this.set((state: { [key: string]: { [key: string]: ProtoLightFile[] } }) => {
                           state[names.modelForm][namesOfField.field] = state[names.modelForm][namesOfField.field].map(
                             (file) => (file.id === currentFile.id ? currentFile : file),
                           );
                         });
                       else
-                        this.set((state: { [key: string]: { [key: string]: ProtoFile | null } }) => {
+                        this.set((state: { [key: string]: { [key: string]: ProtoLightFile | null } }) => {
                           state[names.modelForm][namesOfField.field] = currentFile;
                         });
                       if (currentFile.status !== "uploading" || attemptsLeft <= 0) clearInterval(intervalKey);
                     } catch (error) {
                       clearInterval(intervalKey);
                       Logger.warn(
-                        `Upload poll for ${fileUploadRefName as string} ${file.id} stopped: ${
+                        `Upload poll for ${fileReadName} ${file.id} stopped: ${
                           error instanceof Error ? error.message : String(error)
                         }`,
                       );

package/types/constant/types.d.ts

@@ -29,18 +29,21 @@ export declare class BaseObject {
 export declare class BaseInsight {
     count: number;
 }
-export interface ProtoFile {
+export interface ProtoLightFile {
     id: string;
     filename: string;
     abstractData: string | null;
     imageSize: [number, number];
-    progress: number | null;
+    progress?: number | null;
     url: string;
     size: number;
     status: string;
     createdAt: Dayjs;
     updatedAt: Dayjs;
     removedAt: Dayjs | null;
+}
+export interface ProtoFile extends ProtoLightFile {
+    progress: number | null;
     mimetype: string;
     encoding: string;
     origin: string | null;

package/types/store/action.d.ts

@@ -1,6 +1,6 @@
 import { type GetStateObject } from "akanjs/base";
 import { type FetchPolicy } from "akanjs/common";
-import { type DefaultOf, type FieldState, type ProtoFile } from "akanjs/constant";
+import { type DefaultOf, type FieldState, type ProtoLightFile } from "akanjs/constant";
 import type { ExtractSort, FilterInstance } from "akanjs/document";
 import type { FetchInitForm, FetchProxy } from "akanjs/fetch";
 import type { SerializedSlice, SlceCnstCapitalizedRefName, SlceCnstDefault, SlceCnstDefaultInput, SlceCnstFull, SlceCnstInput, SlceCnstLight, SlceCnstRefName, SlceDbFilter, SlceDbSort, SliceCls } from "akanjs/signal";
@@ -129,7 +129,7 @@ type ArrayFieldAddOrSubSetters<RefName extends string, _CapRef extends string, _
     }) => void;
 };
 type FormSetter<Full, RefName extends string, _CapitalizedRefName extends string = Capitalize<RefName>, _DefaultState = DefaultOf<Full>> = FieldFormSetter<_DefaultState, RefName, _CapitalizedRefName> & ArrayFieldAddSetters<RefName, _CapitalizedRefName, _DefaultState> & ArrayFieldSubSetters<RefName, _CapitalizedRefName, _DefaultState> & ArrayFieldAddOrSubSetters<RefName, _CapitalizedRefName, _DefaultState> & {
-    [K in keyof _DefaultState as _DefaultState[K] extends (ProtoFile | null) | ProtoFile[] ? K extends string ? SetterKey<"upload", K, RefName, _CapitalizedRefName> : never : never]: (fileList: FileList | File[], idx?: number) => Promise<void>;
+    [K in keyof _DefaultState as _DefaultState[K] extends (ProtoLightFile | null) | ProtoLightFile[] ? K extends string ? SetterKey<"upload", K, RefName, _CapitalizedRefName> : never : never]: (fileList: FileList | File[], idx?: number) => Promise<void>;
 } & {
     [K in `writeOn${_CapitalizedRefName}`]: (path: string | (string | number)[], value: any) => void;
 };

package/types/ui/CsrImage.d.ts

@@ -1,8 +1,8 @@
-import type { ProtoFile } from "akanjs/constant";
+import type { ProtoLightFile } from "akanjs/constant";
 import type { ImgHTMLAttributes } from "react";
 type CsrImageProps = Omit<ImgHTMLAttributes<HTMLImageElement>, "alt" | "src"> & {
     src?: string;
-    file?: ProtoFile | {
+    file?: ProtoLightFile | {
         url: string;
         imageSize: [number, number];
         abstractData?: string | null;

package/types/ui/Image.d.ts

@@ -1,6 +1,6 @@
-import type { ProtoFile } from "akanjs/constant";
+import type { ProtoLightFile } from "akanjs/constant";
 import type { ImgHTMLAttributes } from "react";
-type ImageLikeFile = ProtoFile | {
+type ImageLikeFile = ProtoLightFile | {
     url: string;
     imageSize: [number, number];
     abstractData?: string | null;
@@ -33,7 +33,7 @@ type AkanImageProps = NativeImageProps & {
 };
 export declare const Image: ({ src, file, className, abstractData, alt, quality, priority, preload, unoptimized, ...props }: AkanImageProps & ({
     src?: string;
-    file?: ProtoFile;
+    file?: ProtoLightFile;
     abstractData?: string | null;
     alt?: string;
 } | {

package/ui/CsrImage.tsx

@@ -1,10 +1,10 @@
 "use client";
-import type { ProtoFile } from "akanjs/constant";
+import type { ProtoLightFile } from "akanjs/constant";
 import type { ImgHTMLAttributes } from "react";
 
 type CsrImageProps = Omit<ImgHTMLAttributes<HTMLImageElement>, "alt" | "src"> & {
   src?: string;
-  file?: ProtoFile | { url: string; imageSize: [number, number]; abstractData?: string | null } | null;
+  file?: ProtoLightFile | { url: string; imageSize: [number, number]; abstractData?: string | null } | null;
   abstractData?: string | null;
   priority?: boolean;
   preload?: boolean;

package/ui/Image.tsx

@@ -1,12 +1,12 @@
 import { getEnv } from "akanjs/base";
 import { cn } from "akanjs/client";
-import type { ProtoFile } from "akanjs/constant";
+import type { ProtoLightFile } from "akanjs/constant";
 import type { ImgHTMLAttributes } from "react";
 import { preload as preloadResource } from "react-dom";
 
 import { CsrImage } from "./CsrImage";
 
-type ImageLikeFile = ProtoFile | { url: string; imageSize: [number, number]; abstractData?: string | null } | null;
+type ImageLikeFile = ProtoLightFile | { url: string; imageSize: [number, number]; abstractData?: string | null } | null;
 
 const DEFAULT_IMAGE_DEVICE_SIZES = [640, 750, 828, 1080, 1200, 1920, 2048, 3840];
 const DEFAULT_IMAGE_SIZES = [32, 48, 64, 96, 128, 256, 384];
@@ -58,7 +58,7 @@ export const Image = ({
   (
     | {
         src?: string;
-        file?: ProtoFile;
+        file?: ProtoLightFile;
         abstractData?: string | null;
         alt?: string;
       }