Merge pull request #1070 from Py4Js/1069-bug-pyscript-fetch-is-not-an-array

fixed fetch type in py-config

Author: kaurelia

source/library/components/py-config/index.ts

@@ -1,5 +1,6 @@
 import type {
   PyConfigFetch,
+  PyConfigFetchItem,
   PyConfigInterpreters,
   PyConfigProperties,
   PyConfigPropertiesBase,
@@ -16,6 +17,7 @@ import PyConfig from "./py-config";
 export type {
   PyConfigInterpreters,
   PyConfigFetch,
+  PyConfigFetchItem,
   PyConfigSplashscreen,
   PyConfigSharedJsonProperties,
   PyConfigPropertiesWithJsonType,

source/library/components/py-config/py-config.tsx

@@ -1,15 +1,12 @@
 import propTypes from "prop-types";
 import { WeakValidationMap, useEffect, useMemo } from "react";
-
-import {
-  PyConfigInterpreters,
-  PyConfigSplashscreen,
-} from "~root/source/library/components/py-config/py-config.types";
-
 import type {
   PyConfigFetch,
+  PyConfigFetchItem,
+  PyConfigInterpreters,
   PyConfigProperties,
   PyConfigPropertiesBase,
+  PyConfigSplashscreen,
   PyConfigTag,
 } from "./py-config.types";
 
@@ -54,10 +51,6 @@ const PyConfig: PyConfigTag = <T extends object>({
   // eslint-disable-next-line sonarjs/cognitive-complexity
   const config: string = useMemo((): string => {
     if (type === "json") {
-      const transformedFiles: string[] = [
-        ...(fetch?.files || []),
-        ...(children?.fetch?.files || []),
-      ];
       const transformedPlugins: string[] = [
         ...(plugins || []),
         ...(children?.plugins || []),
@@ -66,10 +59,16 @@ const PyConfig: PyConfigTag = <T extends object>({
         ...(packages || []),
         ...(children?.packages || []),
       ];
-      const transformedFetch: PyConfigFetch = {
-        files: transformedFiles.length ? transformedFiles : undefined,
-        ...children?.fetch,
-      };
+      const transformedFetch: PyConfigFetch = [
+        ...(fetch || []),
+        ...(children?.fetch || []),
+      ].map(({ files, ...restItem }: PyConfigFetchItem): PyConfigFetchItem => {
+        const transformedFiles: string[] = [...(files || [])];
+        return {
+          files: transformedFiles.length ? transformedFiles : undefined,
+          ...restItem,
+        };
+      });
       const transformedInterpreters: Omit<PyConfigInterpreters, "source"> & {
         src?: string;
       } = {
@@ -89,7 +88,7 @@ const PyConfig: PyConfigTag = <T extends object>({
         interpreters: checkForAnyKey(transformedInterpreters)
           ? transformedInterpreters
           : undefined,
-        fetch: checkForAnyKey(transformedFetch) ? transformedFetch : undefined,
+        fetch: transformedFetch.length ? transformedFetch : undefined,
         packages: transformedPackages.length ? transformedPackages : undefined,
         plugins: transformedPlugins.length ? transformedPlugins : undefined,
         ...children,
@@ -127,10 +126,18 @@ PyConfig.propTypes = {
     name: propTypes.string,
     language: propTypes.string,
   }),
-  fetch: propTypes.shape({
-    files: propTypes.arrayOf(propTypes.string),
-  }),
-  packages: propTypes.arrayOf(propTypes.string),
+  fetch: propTypes.arrayOf(
+    propTypes.shape({
+      files: propTypes.oneOfType([
+        propTypes.arrayOf(propTypes.string),
+        propTypes.instanceOf(Set),
+      ]),
+    }),
+  ),
+  packages: propTypes.oneOfType([
+    propTypes.arrayOf(propTypes.string),
+    propTypes.instanceOf(Set),
+  ]),
   plugins: propTypes.arrayOf(propTypes.string),
 } as WeakValidationMap<PyConfigPropertiesBase>;
 

source/library/components/py-config/py-config.types.ts

@@ -10,10 +10,9 @@ export type PyConfigInterpreters = {
   name?: string;
   language?: string;
 };
+export type PyConfigFetchItem = { files?: string[] | Set<string> };
 
-export type PyConfigFetch = {
-  files?: string[] | Set<string>;
-};
+export type PyConfigFetch = PyConfigFetchItem[];
 
 export type PyConfigSplashscreen = {
   autoclose?: boolean;

source/library/components/py-script/py-script.story.tsx

@@ -61,7 +61,7 @@ PyScriptFoliumExample.args = {
 export const PyScriptFoliumWithTomlConfigExample: StoryFn<typeof PyScript> =
   Template.bind({});
 
-PyScriptFoliumExample.args = {
+PyScriptFoliumWithTomlConfigExample.args = {
   source: "/folium_map.py",
   output: "folium",
   generateOutputTag: true,

source/library/index.ts

@@ -12,17 +12,18 @@ import PyButton, {
   type PyButtonTag,
 } from "./components/py-button";
 import PyConfig, {
-  PyConfigFetch,
-  PyConfigInterpreters,
-  PyConfigProperties,
-  PyConfigPropertiesBase,
-  PyConfigPropertiesWithChildren,
-  PyConfigPropertiesWithJsonType,
-  PyConfigPropertiesWithTomlType,
-  PyConfigPropertiesWithoutChildren,
-  PyConfigSharedJsonProperties,
-  PyConfigSplashscreen,
-  PyConfigTag,
+  type PyConfigFetch,
+  type PyConfigFetchItem,
+  type PyConfigInterpreters,
+  type PyConfigProperties,
+  type PyConfigPropertiesBase,
+  type PyConfigPropertiesWithChildren,
+  type PyConfigPropertiesWithJsonType,
+  type PyConfigPropertiesWithTomlType,
+  type PyConfigPropertiesWithoutChildren,
+  type PyConfigSharedJsonProperties,
+  type PyConfigSplashscreen,
+  type PyConfigTag,
 } from "./components/py-config";
 import PyEnv, {
   type PyEnvChildrenAsObject,
@@ -123,6 +124,7 @@ export type {
   PyButtonTag,
   PyConfigInterpreters,
   PyConfigFetch,
+  PyConfigFetchItem,
   PyConfigSplashscreen,
   PyConfigSharedJsonProperties,
   PyConfigPropertiesWithJsonType,