@qds.dev/tools 0.11.1 → 0.13.0

package/lib/utils/index.qwik.mjs

@@ -1,15 +1,15 @@
+import { getNodeText, isCallExpressionWithName, isIdentifierWithName } from "./ast/core.qwik.mjs";
+import { getJSXElementName, isJSXElementWithName } from "./ast/jsx-helpers.qwik.mjs";
 import { extractChildren, extractFromElement, extractFromNode, extractJSXMemberExpressionName, extractProps, getAttributeValue, getLineNumber, isJSXElement, isJSXExpressionContainer, isJSXText, propsObjectToAttributes } from "./icons/ast/jsx.qwik.mjs";
 import { handleCallExpression, handleConditionalExpression, handleExpression, handleIdentifierExpression, handleLogicalExpression, handleMemberExpression, isSupportedExpressionType } from "./icons/ast/expressions.qwik.mjs";
 import { discoverAllIconifyCollections, generateImportVar, getAvailableCollections, resolveIconNames, sanitizeIconName, toKebabCase, toPascalCase } from "./icons/naming.qwik.mjs";
 import { CollectionLoader } from "./icons/collections/loader.qwik.mjs";
 import { extractMDXImportAliases, mapImportToPack, resolveImportAliases } from "./icons/import-resolver.qwik.mjs";
 import { buildSVGElement, generateIconImport } from "./icons/transform/shared.qwik.mjs";
-import { extractMDXAttributes, transformMDXFile } from "./icons/transform/mdx.qwik.mjs";
-import { findIconElements, isIconElement, transformIconElement, transformTSXFile } from "./icons/transform/tsx.qwik.mjs";
-import { getNodeText, isCallExpressionWithName, isIdentifierWithName } from "./ast/core.qwik.mjs";
+import { findIconElements, isIconElement, transformIconElement, transformTSXFile, transformTSXFileCore } from "./icons/transform/tsx.qwik.mjs";
+import { extractMDXAttributes, transformMDXFile, transformMDXFileCore } from "./icons/transform/mdx.qwik.mjs";
 import { findImportBySource, getImportSource, hasImportSpecifier, injectTypeImport } from "./ast/imports.qwik.mjs";
-import { getJSXElementName, isJSXElementWithName } from "./ast/jsx-helpers.qwik.mjs";
 import { readPackageJson } from "./package-json.qwik.mjs";
 import { injectAsChildTypesImport, injectAsChildTypesIntoComponent, transformTypeFile } from "./transform-dts.qwik.mjs";
 
-export { CollectionLoader, buildSVGElement, discoverAllIconifyCollections, extractChildren, extractFromElement, extractFromNode, extractJSXMemberExpressionName, extractMDXAttributes, extractMDXImportAliases, extractProps, findIconElements, findImportBySource, generateIconImport, generateImportVar, getAttributeValue, getAvailableCollections, getImportSource, getJSXElementName, getLineNumber, getNodeText, handleCallExpression, handleConditionalExpression, handleExpression, handleIdentifierExpression, handleLogicalExpression, handleMemberExpression, hasImportSpecifier, injectAsChildTypesImport, injectAsChildTypesIntoComponent, injectTypeImport, isCallExpressionWithName, isIconElement, isIdentifierWithName, isJSXElement, isJSXElementWithName, isJSXExpressionContainer, isJSXText, isSupportedExpressionType, mapImportToPack, propsObjectToAttributes, readPackageJson, resolveIconNames, resolveImportAliases, sanitizeIconName, toKebabCase, toPascalCase, transformIconElement, transformMDXFile, transformTSXFile, transformTypeFile };
+export { CollectionLoader, buildSVGElement, discoverAllIconifyCollections, extractChildren, extractFromElement, extractFromNode, extractJSXMemberExpressionName, extractMDXAttributes, extractMDXImportAliases, extractProps, findIconElements, findImportBySource, generateIconImport, generateImportVar, getAttributeValue, getAvailableCollections, getImportSource, getJSXElementName, getLineNumber, getNodeText, handleCallExpression, handleConditionalExpression, handleExpression, handleIdentifierExpression, handleLogicalExpression, handleMemberExpression, hasImportSpecifier, injectAsChildTypesImport, injectAsChildTypesIntoComponent, injectTypeImport, isCallExpressionWithName, isIconElement, isIdentifierWithName, isJSXElement, isJSXElementWithName, isJSXExpressionContainer, isJSXText, isSupportedExpressionType, mapImportToPack, propsObjectToAttributes, readPackageJson, resolveIconNames, resolveImportAliases, sanitizeIconName, toKebabCase, toPascalCase, transformIconElement, transformMDXFile, transformMDXFileCore, transformTSXFile, transformTSXFileCore, transformTypeFile };

package/{lib-types/tools → lib}/utils/transform-dts.d.ts

@@ -4,12 +4,13 @@ import MagicString from "magic-string";
 import { parseSync } from "oxc-parser";
 declare function injectAsChildTypesIntoComponent(node: Node, content: string, s: MagicString): boolean;
 /**
- * Injects AsChildTypes import into the declaration file
+ * Injects AsChildTypes import using a relative path to the local as-child-types file
  */
 declare function injectAsChildTypesImport(options: {
     ast: ReturnType<typeof parseSync>;
     magicString: MagicString;
-    toolsImportNode: Node | null;
+    dtsPath: string;
+    declDir: string;
 }): void;
-declare function transformTypeFile(dtsPath: string, sourcePath: string): Promise<boolean>;
+declare function transformTypeFile(dtsPath: string, sourcePath: string, declDir: string): Promise<boolean>;
 export { injectAsChildTypesImport, injectAsChildTypesIntoComponent, transformTypeFile };

package/lib/utils/transform-dts.qwik.mjs

@@ -1,10 +1,10 @@
-import { findImportBySource, hasImportSpecifier, injectTypeImport } from "./ast/imports.qwik.mjs";
 import { detectsRenderComponentUsage } from "./ast/qwik.qwik.mjs";
+import { injectTypeImport } from "./ast/imports.qwik.mjs";
 import { walkFiles } from "./fs.qwik.mjs";
+import { dirname, join, relative } from "node:path";
 import MagicString from "magic-string";
 import { parseSync } from "oxc-parser";
 import { walk } from "oxc-walker";
-import { join, relative } from "node:path";
 import { readFile, stat, writeFile } from "node:fs/promises";
 
 //#region utils/transform-dts.ts
@@ -36,27 +36,21 @@ function injectAsChildTypesIntoComponent(node, content, s) {
 	return hasChanges;
 }
 /**
-* Injects AsChildTypes import into the declaration file
+* Injects AsChildTypes import using a relative path to the local as-child-types file
 */ function injectAsChildTypesImport(options) {
+	const asChildTypesTarget = join(options.declDir, "types");
+	let relImport = relative(dirname(options.dtsPath), asChildTypesTarget);
+	if (!relImport.startsWith(".")) relImport = "./" + relImport;
 	injectTypeImport({
 		ast: options.ast,
 		magicString: options.magicString,
-		importSource: "@qds.dev/tools",
-		specifierName: "AsChildTypes",
-		existingImportNode: options.toolsImportNode
+		importSource: relImport,
+		specifierName: "AsChildTypes"
 	});
 }
-async function transformTypeFile(dtsPath, sourcePath) {
+async function transformTypeFile(dtsPath, sourcePath, declDir) {
 	const content = await readFile(dtsPath, "utf-8");
-	const hasAsChildTypesUsage = content.includes("AsChildTypes");
-	if (hasAsChildTypesUsage) try {
-		const toolsImportNode = findImportBySource(parseSync(dtsPath, content), content, "@qds.dev/tools");
-		if (toolsImportNode) {
-			if (hasImportSpecifier(toolsImportNode, "AsChildTypes")) return false;
-		}
-	} catch {
-		return false;
-	}
+	if (content.includes("AsChildTypes")) return false;
 	try {
 		if (!detectsRenderComponentUsage(await readFile(sourcePath, "utf-8"))) return false;
 	} catch {
@@ -69,11 +63,12 @@ async function transformTypeFile(dtsPath, sourcePath) {
 		walk(ast.program, { enter(node) {
 			if (injectAsChildTypesIntoComponent(node, content, s)) hasChanges = true;
 		} });
-		if (!hasChanges && !hasAsChildTypesUsage) return false;
+		if (!hasChanges) return false;
 		injectAsChildTypesImport({
 			ast,
 			magicString: s,
-			toolsImportNode: findImportBySource(ast, content, "@qds.dev/tools")
+			dtsPath,
+			declDir
 		});
 		await writeFile(dtsPath, s.toString(), "utf-8");
 		return true;
@@ -84,8 +79,8 @@ async function transformTypeFile(dtsPath, sourcePath) {
 }
 async function main() {
 	const sourceDir = process.argv[2] || "./src";
-	const declDir = process.argv[3] || "./lib-types";
-	console.log(`🔍 Scanning ${sourceDir} for source files...`);
+	const declDir = process.argv[3] || "./lib/src";
+	console.log(`Scanning ${sourceDir} for source files...`);
 	let processedCount = 0;
 	let changedCount = 0;
 	for await (const sourcePath of walkFiles(sourceDir, ".tsx")) {
@@ -96,12 +91,12 @@ async function main() {
 			continue;
 		}
 		processedCount++;
-		if (await transformTypeFile(dtsPath, sourcePath)) {
+		if (await transformTypeFile(dtsPath, sourcePath, declDir)) {
 			changedCount++;
-			console.log(`✓ Transformed ${dtsPath}`);
+			console.log(`Transformed ${dtsPath}`);
 		}
 	}
-	console.log(`\n✨ Processed ${processedCount} files, transformed ${changedCount} files`);
+	console.log(`\nProcessed ${processedCount} files, transformed ${changedCount} files`);
 }
 if (import.meta.url === `file://${process.argv[1]}`) main().catch((error) => {
 	console.error("Error:", error);

package/lib/utils/transform-dts.unit.d.ts

@@ -0,0 +1 @@
+export {};

package/{lib-types/tools → lib}/vite/index.d.ts

@@ -1,4 +1,4 @@
-export type { AsChildPluginOptions, AsChildTypes, IconsPluginOptions, InlineAssetPluginOptions, PacksMap } from "../rolldown/index";
+export type { AsChildPluginOptions, AsChildTypes, IconsPluginOptions, InlineAssetPluginOptions, PacksMap, QdsOptions, QdsSubPlugin, UiPluginOptions } from "../rolldown/index";
 export type { Plugin as VitePlugin, PluginOption as VitePluginOption } from "vite";
-export { asChild, icons, inlineAsset } from "../rolldown/index";
+export { inlineAsset, qds } from "../rolldown/index";
 export { minifyContentPlugin } from "./minify-content";

package/lib/vite/index.qwik.mjs

@@ -1,6 +1,5 @@
-import { asChild } from "../rolldown/as-child.qwik.mjs";
-import { icons } from "../rolldown/icons.qwik.mjs";
 import { inlineAsset } from "../rolldown/inline-asset.qwik.mjs";
+import { qds } from "../rolldown/qds.qwik.mjs";
 import { minifyContentPlugin } from "./minify-content.qwik.mjs";
 
-export { asChild, icons, inlineAsset, minifyContentPlugin };
+export { inlineAsset, minifyContentPlugin, qds };

package/lib/vite/minify-content.qwik.mjs

@@ -1,6 +1,6 @@
-import { char, createRegExp, exactly, oneOrMore } from "magic-regexp";
 import { existsSync, readFileSync, writeFileSync } from "node:fs";
 import { resolve, sep } from "node:path";
+import { char, createRegExp, exactly, oneOrMore } from "magic-regexp";
 import { minifySync } from "oxc-minify";
 import { transform } from "oxc-transform";
 

package/lib/vite/minify-content.unit.d.ts

@@ -0,0 +1 @@
+export {};