Merge pull request #1071 from Py4Js/development

Merge development branch into master

Author: KrzysztofZawisla

.github/workflows/deploy.yaml

@@ -1,68 +1,56 @@
-# on:
-#   push:
-#     branches: [main]
-
-# jobs:
-#   build:
-#     runs-on: ubuntu-latest
-#     steps:
-#       - name: Checkout repository
-#         uses: actions/checkout@v3
-
-#       - name: Setup Node
-#         uses: actions/setup-node@v3
-#         with:
-#           node-version: "lts/*"
-#           registry-url: "https://registry.npmjs.org"
-
-#       - name: Install dependencies
-#         run: yarn --ignore-engines
-
-#- name: Run tests
-#  run: yarn run test
-
-# - name: Build project
-#   run: yarn run build #--target npm
-
-# - name: Create zip lib
-#   uses: vimtor/action-zip@v1
-#   with:
-#     files: library/
-#     dest: pyscript-react.zip
-
-# - name: Get current tag
-#   run: |
-#     echo "current_tag=v`grep version package.json | sed 's/.*"version": "\(.*\)".*/\1/'`" >> $GITHUB_ENV
-
-# - name: Create new tag
-#   uses: rickstaa/action-create-tag@v1
-#   id: "tag_create"
-#   with:
-#     tag: "${{ env.current_tag }}"
-#     tag_exists_error: true
-#     message: "Latest release"
-
-# - name: Create GitHub realese
-#   uses: "marvinpinto/action-automatic-releases@latest"
-#   with:
-#     repo_token: "${{ secrets.GITHUB_TOKEN }}"
-#     automatic_release_tag: "${{ env.current_tag }}"
-#     prerelease: false
-#     files: |
-#       LICENSE
-#       pyscript-react.zip
-
-# - name: Publish to npm 🚀
-#   run: |
-#     cd library
-#     yarn publish
-#     cd ..
-#     for dir in library/*; do
-#       if [ -d "$dir" ]; then
-#         cd "$dir"
-#         yarn publish
-#         cd ../../
-#       fi
-#     done
-#   env:
-#     NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+on:
+  push:
+    branches: [main]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+      - name: Setup Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: "lts/*"
+          registry-url: "https://registry.npmjs.org"
+      - name: Install dependencies
+        run: yarn --ignore-engines
+      - name: Build project
+        run: yarn run build #--target npm
+      - name: Create zip lib
+        uses: vimtor/action-zip@v1
+        with:
+          files: library/
+          dest: pyscript-react.zip
+      - name: Get current tag
+        run: |
+          echo "current_tag=v`grep version package.json | sed 's/.*"version": "\(.*\)".*/\1/'`" >> $GITHUB_ENV
+      - name: Create new tag
+        uses: rickstaa/action-create-tag@v1
+        id: "tag_create"
+        with:
+          tag: "${{ env.current_tag }}"
+          tag_exists_error: true
+          message: "Latest release"
+      - name: Create GitHub realese
+        uses: "marvinpinto/action-automatic-releases@latest"
+        with:
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          automatic_release_tag: "${{ env.current_tag }}"
+          prerelease: false
+          files: |
+            LICENSE
+            pyscript-react.zip
+      - name: Publish to npm 🚀
+        run: |
+          cd library
+          yarn publish
+          cd ..
+          for dir in library/*; do
+            if [ -d "$dir" ]; then
+              cd "$dir"
+              yarn publish
+              cd ../../
+            fi
+          done
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

package.json

@@ -85,6 +85,7 @@
     "sort-package-json": "^2.4.1",
     "source-map-loader": "^4.0.1",
     "storybook": "^7.0.7",
+    "super-expressive": "^2.0.0",
     "ts-jest": "^29.1.0",
     "ts-node": "^10.9.1",
     "ts-patch": "^2.1.0",

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,

source/scripts/build/wrappers/get-entrypoints/get-entrypoints.ts

@@ -1,5 +1,6 @@
 import { globSync } from "glob";
-import { join } from "path";
+import { join, sep } from "path";
+import SuperExpressive from "super-expressive";
 import type { GetEntrypoints } from "~root/source/scripts/build/wrappers/get-entrypoints/get-entrypoints.types";
 
 const getEntrypoints: GetEntrypoints = (): Record<string, string> => {
@@ -21,7 +22,11 @@ const getEntrypoints: GetEntrypoints = (): Record<string, string> => {
       splittedFile.pop();
       const deletedExtensionFile = splittedFile.join();
       const fixedFileName = deletedExtensionFile.replace(
-        /^(source\\library\\)/,
+        SuperExpressive()
+          .startOfInput.string("source")
+          .string(sep)
+          .string("library")
+          .toRegex(),
         "",
       );
       accumulator[fixedFileName] = join(process.cwd(), file);

yarn.lock

@@ -15422,6 +15422,11 @@ stylis@4.1.3:
   resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.1.3.tgz#fd2fbe79f5fed17c55269e16ed8da14c84d069f7"
   integrity sha512-GP6WDNWf+o403jrEp9c5jibKavrtLW+/qYGhFxFrG8maXhwTBI7gLLhiBb0o7uFccWN+EOS9aMO6cGHWAO07OA==
 
+super-expressive@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/super-expressive/-/super-expressive-2.0.0.tgz#646c4c6b7d813d47196cf144df36366f90bec456"
+  integrity sha512-jtCS9dEBPxtq4jd0v33LnRPI0kYQP1npHxzl+Pk+IOuufIn5Pyo0AXiU6ypvhO3vZevqEE9AE3YDD7aWp+RxRg==
+
 supports-color@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"