Skip to content

feat(): support ios/md attribute of ion-icon #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 30, 2024
Merged

feat(): support ios/md attribute of ion-icon #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
775edb0
feat(): support ios/md attribute of ion-icon
rdlabo Jan 23, 2024
b92951c
Merge branch 'main' of github.com:ionic-team/ionic-angular-standalone…
rdlabo Jan 28, 2024
5d740f8
fmt
rdlabo Jan 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions packages/cli/src/angular/migrations/standalone/0002-import-standalone-component.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ describe("migrateComponents", () => {

@Component({
selector: 'my-component',
template: '<ion-icon name="logo-ionic"></ion-icon>',
template: '<ion-icon name="logo-ionic" ios="add" md="remove"></ion-icon>',
standalone: true
})
export class MyComponent { }
Expand All @@ -149,18 +149,18 @@ describe("migrateComponents", () => {
dedent(`
import { Component } from "@angular/core";
import { addIcons } from "ionicons";
import { logoIonic } from "ionicons/icons";
import { logoIonic, add, remove } from "ionicons/icons";
import { IonIcon } from "@ionic/angular/standalone";

@Component({
selector: 'my-component',
template: '<ion-icon name="logo-ionic"></ion-icon>',
template: '<ion-icon name="logo-ionic" ios="add" md="remove"></ion-icon>',
standalone: true,
imports: [IonIcon]
})
export class MyComponent {
constructor() {
addIcons({ logoIonic });
addIcons({ logoIonic, add, remove });
}
}
`),
Expand Down
110 changes: 56 additions & 54 deletions packages/cli/src/angular/migrations/standalone/0002-import-standalone-component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,68 +267,70 @@ function detectIonicComponentsAndIcons(htmlAsString: string, filePath: string) {
}

if (node.name === "ion-icon") {
const staticNameAttribute = node.attributes.find(
(a: any) => a.name === "name" || a.name === "icon",
);

if (staticNameAttribute) {
const iconName = staticNameAttribute.value;
if (!ionIcons.includes(iconName)) {
ionIcons.push(iconName);
}
} else {
const boundNameAttribute = node.inputs.find(
(a: any) => a.name === "name" || a.name === "icon",
for (const attribute of ["name", "icon", "ios", "md"]) {
const staticNameAttribute = node.attributes.find(
(a: any) => a.name === attribute,
);

if (boundNameAttribute) {
const skippedIcon = node.sourceSpan.toString();

const iconNameRegex = /{{\s*'([^']+)'\s*}}/;
/**
* Attempt to find the icon name from the bound name attribute
* when the developer has a template like this:
* <ion-icon name="'user'"></ion-icon>
*/
const iconNameMatch = skippedIcon.match(iconNameRegex);

const deepGetIconConditional = (
ast: typeof boundNameAttribute.value.ast,
icons: string[],
): string[] => {
if (ast.trueExp.type === "LiteralPrimitive") {
if (!ionIcons.includes(ast.trueExp.value)) {
ionIcons.push(ast.trueExp.value);
if (staticNameAttribute) {
const iconName = staticNameAttribute.value;
if (!ionIcons.includes(iconName)) {
ionIcons.push(iconName);
}
} else {
const boundNameAttribute = node.inputs.find(
(a: any) => a.name === attribute,
);

if (boundNameAttribute) {
const skippedIcon = node.sourceSpan.toString();

const iconNameRegex = /{{\s*'([^']+)'\s*}}/;
/**
* Attempt to find the icon name from the bound name attribute
* when the developer has a template like this:
* <ion-icon name="'user'"></ion-icon>
*/
const iconNameMatch = skippedIcon.match(iconNameRegex);

const deepGetIconConditional = (
ast: typeof boundNameAttribute.value.ast,
icons: string[],
): string[] => {
if (ast.trueExp.type === "LiteralPrimitive") {
if (!ionIcons.includes(ast.trueExp.value)) {
ionIcons.push(ast.trueExp.value);
}
} else if (ast.trueExp.type === "Conditional") {
deepGetIconConditional(ast.trueExp, icons);
} else {
skippedIconsHtml.push(skippedIcon);
}
} else if (ast.trueExp.type === "Conditional") {
deepGetIconConditional(ast.trueExp, icons);
} else {
skippedIconsHtml.push(skippedIcon);
}

if (ast.falseExp.type === "LiteralPrimitive") {
if (!ionIcons.includes(ast.falseExp.value)) {
ionIcons.push(ast.falseExp.value);
if (ast.falseExp.type === "LiteralPrimitive") {
if (!ionIcons.includes(ast.falseExp.value)) {
ionIcons.push(ast.falseExp.value);
}
} else if (ast.falseExp.type === "Conditional") {
deepGetIconConditional(ast.falseExp, icons);
} else {
skippedIconsHtml.push(skippedIcon);
}
return icons;
};

if (iconNameMatch) {
if (!ionIcons.includes(iconNameMatch[1])) {
ionIcons.push(iconNameMatch[1]);
}
} else if (ast.falseExp.type === "Conditional") {
deepGetIconConditional(ast.falseExp, icons);
} else if (boundNameAttribute.value.ast.type === "Conditional") {
deepGetIconConditional(boundNameAttribute.value.ast, ionIcons);
} else {
// IonIcon name is a calculated value from a variable or function.
// We can't determine the value of the name at this time.
// The developer will need to manually import these icons.
skippedIconsHtml.push(skippedIcon);
}
return icons;
};

if (iconNameMatch) {
if (!ionIcons.includes(iconNameMatch[1])) {
ionIcons.push(iconNameMatch[1]);
}
} else if (boundNameAttribute.value.ast.type === "Conditional") {
deepGetIconConditional(boundNameAttribute.value.ast, ionIcons);
} else {
// IonIcon name is a calculated value from a variable or function.
// We can't determine the value of the name at this time.
// The developer will need to manually import these icons.
skippedIconsHtml.push(skippedIcon);
}
}
}
Expand Down