@powerlines/plugin-react 0.1.137 → 0.1.138

package/dist/plugin-alloy/src/types/components.d.cts

@@ -15,9 +15,8 @@ interface TypescriptFileImportItem {
   alias?: string;
   type?: boolean;
 }
-type TypescriptFileImportList = Record<string, null | Array<TypescriptFileImportItem | string>>;
-type TypescriptFileImports = TypescriptFileImportList & {
-  $builtins?: TypescriptFileImportList;
+type TypescriptFileImports = Record<string, null | Array<TypescriptFileImportItem | string>> & {
+  $builtins?: Record<string, null | Array<TypescriptFileImportItem | string>>;
 };
 //#endregion
-export { ComponentProps, TypescriptFileImportItem, TypescriptFileImportList, TypescriptFileImports };
+export { ComponentProps, TypescriptFileImportItem, TypescriptFileImports };

package/dist/plugin-alloy/src/types/components.d.mts

@@ -16,9 +16,8 @@ interface TypescriptFileImportItem {
   alias?: string;
   type?: boolean;
 }
-type TypescriptFileImportList = Record<string, null | Array<TypescriptFileImportItem | string>>;
-type TypescriptFileImports = TypescriptFileImportList & {
-  $builtins?: TypescriptFileImportList;
+type TypescriptFileImports = Record<string, null | Array<TypescriptFileImportItem | string>> & {
+  $builtins?: Record<string, null | Array<TypescriptFileImportItem | string>>;
 };
 //#endregion
-export { ComponentProps, TypescriptFileImportItem, TypescriptFileImportList, TypescriptFileImports };
+export { ComponentProps, TypescriptFileImportItem, TypescriptFileImports };

package/dist/plugin-alloy/src/types/index.d.cts

@@ -1,2 +1,2 @@
-import { ComponentProps, TypescriptFileImportItem, TypescriptFileImportList, TypescriptFileImports } from "./components.cjs";
+import { ComponentProps, TypescriptFileImportItem, TypescriptFileImports } from "./components.cjs";
 import { AlloyPluginContext, AlloyPluginOptions, AlloyPluginResolvedConfig, AlloyPluginUserConfig } from "./plugin.cjs";

package/dist/plugin-alloy/src/types/index.d.mts

@@ -1,2 +1,2 @@
-import { ComponentProps, TypescriptFileImportItem, TypescriptFileImportList, TypescriptFileImports } from "./components.mjs";
+import { ComponentProps, TypescriptFileImportItem, TypescriptFileImports } from "./components.mjs";
 import { AlloyPluginContext, AlloyPluginOptions, AlloyPluginResolvedConfig, AlloyPluginUserConfig } from "./plugin.mjs";

package/dist/plugin-alloy/src/typescript/components/typescript-file.cjs

@@ -167,8 +167,20 @@ function TypescriptFileHeaderImports(props) {
 						return !!imports && Object.keys(imports).length > 0;
 					},
 					get children() {
-						return Object.entries(imports ?? {}).filter(([key]) => key !== "$builtins").concat(imports && imports.$builtins ? Object.entries(imports.$builtins).map(([key, entry]) => [key.includes(":") ? key : `${context.config.output.builtinPrefix}:${key}`, entry]) : []).map(([module$1, imported]) => {
-							return __alloy_js_core.code`import ${imported === null ? "" : imported.filter((i) => !(0, __stryke_type_checks_is_string.isString)(i) && i.default).map((i) => i.alias ? i.alias : i.name).join(", ") + (imported.filter((i) => !(0, __stryke_type_checks_is_string.isString)(i) && i.default).length > 0 && imported.filter((i) => (0, __stryke_type_checks_is_string.isString)(i) || !i.default).length > 0 ? ", " : "") + (imported.filter((i) => (0, __stryke_type_checks_is_string.isString)(i) || !i.default).length > 0 ? `{ ${imported.map((i) => (0, __stryke_type_checks_is_string.isString)(i) ? i : i.alias ? `${i.name} as ${i.alias}` : i.name).join(", ")} }` : "")} from "${module$1}";`;
+						return (0, __alloy_js_core_jsx_runtime.createComponent)(__alloy_js_core.For, {
+							get each() {
+								return Object.entries(imports ?? {});
+							},
+							children: ([module$1, imported]) => {
+								if (module$1 === "$builtins") return (0, __alloy_js_core_jsx_runtime.createComponent)(__alloy_js_core.For, {
+									get each() {
+										return Object.entries(imported ?? {});
+									},
+									children: ([builtinModule, builtinImports]) => __alloy_js_core.code`import ${builtinImports === null ? "" : ` from ${builtinImports.filter((i) => !(0, __stryke_type_checks_is_string.isString)(i) && i.default).map((i) => i.alias ? i.alias : i.name).join(", ") + (builtinImports.filter((i) => !(0, __stryke_type_checks_is_string.isString)(i) && i.default).length > 0 && builtinImports.filter((i) => (0, __stryke_type_checks_is_string.isString)(i) || !i.default).length > 0 ? ", " : "") + (builtinImports.filter((i) => (0, __stryke_type_checks_is_string.isString)(i) || !i.default).length > 0 ? `{ ${builtinImports.map((i) => (0, __stryke_type_checks_is_string.isString)(i) ? i : i.alias ? `${i.name} as ${i.alias}` : i.name).join(", ")} }` : "")} `} "${builtinModule.includes(":") ? builtinModule : `${context.config.output.builtinPrefix}:${builtinModule}`}";`
+								});
+								const normalImports = imported;
+								return __alloy_js_core.code`import ${normalImports === null ? "" : ` from ${normalImports.filter((i) => !(0, __stryke_type_checks_is_string.isString)(i) && i.default).map((i) => i.alias ? i.alias : i.name).join(", ") + (normalImports.filter((i) => !(0, __stryke_type_checks_is_string.isString)(i) && i.default).length > 0 && normalImports.filter((i) => (0, __stryke_type_checks_is_string.isString)(i) || !i.default).length > 0 ? ", " : "") + (normalImports.filter((i) => (0, __stryke_type_checks_is_string.isString)(i) || !i.default).length > 0 ? `{ ${normalImports.map((i) => (0, __stryke_type_checks_is_string.isString)(i) ? i : i.alias ? `${i.name} as ${i.alias}` : i.name).join(", ")} }` : "")} `} "${module$1}";`;
+							}
 						});
 					}
 				}),

package/dist/plugin-alloy/src/typescript/components/typescript-file.mjs

@@ -4,7 +4,7 @@ import { SourceFile } from "../../core/components/source-file.mjs";
 import { createComponent, createIntrinsic, memo, mergeProps } from "@alloy-js/core/jsx-runtime";
 import { titleCase } from "@stryke/string-format/title-case";
 import { isString } from "@stryke/type-checks/is-string";
-import { Scope, Show, SourceDirectoryContext, code, splitProps, useContext, useScope } from "@alloy-js/core";
+import { For, Scope, Show, SourceDirectoryContext, code, splitProps, useContext, useScope } from "@alloy-js/core";
 import { appendPath } from "@stryke/path/append";
 import { ImportStatements, PackageContext, SourceFileContext as SourceFileContext$1, TSModuleScope, getSourceDirectoryData, useSourceFile } from "@alloy-js/typescript";
 import { isBoolean } from "@stryke/type-checks/is-boolean";
@@ -166,8 +166,20 @@ function TypescriptFileHeaderImports(props) {
 						return !!imports && Object.keys(imports).length > 0;
 					},
 					get children() {
-						return Object.entries(imports ?? {}).filter(([key]) => key !== "$builtins").concat(imports && imports.$builtins ? Object.entries(imports.$builtins).map(([key, entry]) => [key.includes(":") ? key : `${context.config.output.builtinPrefix}:${key}`, entry]) : []).map(([module, imported]) => {
-							return code`import ${imported === null ? "" : imported.filter((i) => !isString(i) && i.default).map((i) => i.alias ? i.alias : i.name).join(", ") + (imported.filter((i) => !isString(i) && i.default).length > 0 && imported.filter((i) => isString(i) || !i.default).length > 0 ? ", " : "") + (imported.filter((i) => isString(i) || !i.default).length > 0 ? `{ ${imported.map((i) => isString(i) ? i : i.alias ? `${i.name} as ${i.alias}` : i.name).join(", ")} }` : "")} from "${module}";`;
+						return createComponent(For, {
+							get each() {
+								return Object.entries(imports ?? {});
+							},
+							children: ([module, imported]) => {
+								if (module === "$builtins") return createComponent(For, {
+									get each() {
+										return Object.entries(imported ?? {});
+									},
+									children: ([builtinModule, builtinImports]) => code`import ${builtinImports === null ? "" : ` from ${builtinImports.filter((i) => !isString(i) && i.default).map((i) => i.alias ? i.alias : i.name).join(", ") + (builtinImports.filter((i) => !isString(i) && i.default).length > 0 && builtinImports.filter((i) => isString(i) || !i.default).length > 0 ? ", " : "") + (builtinImports.filter((i) => isString(i) || !i.default).length > 0 ? `{ ${builtinImports.map((i) => isString(i) ? i : i.alias ? `${i.name} as ${i.alias}` : i.name).join(", ")} }` : "")} `} "${builtinModule.includes(":") ? builtinModule : `${context.config.output.builtinPrefix}:${builtinModule}`}";`
+								});
+								const normalImports = imported;
+								return code`import ${normalImports === null ? "" : ` from ${normalImports.filter((i) => !isString(i) && i.default).map((i) => i.alias ? i.alias : i.name).join(", ") + (normalImports.filter((i) => !isString(i) && i.default).length > 0 && normalImports.filter((i) => isString(i) || !i.default).length > 0 ? ", " : "") + (normalImports.filter((i) => isString(i) || !i.default).length > 0 ? `{ ${normalImports.map((i) => isString(i) ? i : i.alias ? `${i.name} as ${i.alias}` : i.name).join(", ")} }` : "")} `} "${module}";`;
+							}
 						});
 					}
 				}),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@powerlines/plugin-react",
-  "version": "0.1.137",
+  "version": "0.1.138",
   "type": "module",
   "description": "A package containing a Powerlines plugin for building a React application.",
   "repository": {
@@ -140,9 +140,9 @@
     "@alloy-js/json": "^0.22.0",
     "@alloy-js/markdown": "^0.22.0",
     "@alloy-js/typescript": "^0.22.0",
-    "@powerlines/plugin-alloy": "^0.18.6",
+    "@powerlines/plugin-alloy": "^0.18.7",
     "@powerlines/plugin-babel": "^0.12.134",
-    "@powerlines/plugin-env": "^0.15.8",
+    "@powerlines/plugin-env": "^0.15.9",
     "@storm-software/config-tools": "^1.188.75",
     "@stryke/cli": "^0.12.37",
     "@stryke/convert": "^0.6.30",
@@ -162,5 +162,5 @@
     "react-dom": "^19.2.3"
   },
   "publishConfig": { "access": "public" },
-  "gitHead": "bfbde2cda62a5307013bf11d1ef6a8500bcbc4b1"
+  "gitHead": "8c096ca8c2383603e770532ec0f828761d525947"
 }