@ship-ui/core 0.19.1 → 0.19.3

package/bin/ship-fg.mjs

@@ -3235,7 +3235,7 @@ import { parseArgs } from "util";
 // bin/src/ship-fg.ts
 import { spawnSync } from "child_process";
 import { watch } from "fs";
-import { readFile as readFile2, writeFile } from "fs/promises";
+import { readFile as readFile2, writeFile, readdir } from "fs/promises";
 import { dirname, join, resolve } from "path";
 import { fileURLToPath } from "url";
 import { gzipSync } from "zlib";
@@ -3326,6 +3326,104 @@ function formatFileSize(bytes, dm = 2) {
 var _dirname = dirname(fileURLToPath(import.meta.url));
 var CWD_PATH = process.cwd();
 var PHOSPHOR_SRC_PATH = resolve(CWD_PATH, "node_modules", "@phosphor-icons", "web", "src");
+var jsScannerFallback = async (PROJECT_SRC, shipUiDir, CWD_PATH2) => {
+  const uniqueIcons = new Set;
+  const isValidIcon = (s) => /^[a-z0-9-]+$/.test(s);
+  try {
+    const pkgPath = resolve(shipUiDir, "package.json");
+    const pkgData = JSON.parse(await readFile2(pkgPath, "utf8"));
+    if (pkgData.libraryIcons) {
+      pkgData.libraryIcons.forEach((i) => uniqueIcons.add(i));
+    }
+  } catch (e) {}
+  async function scanDir(dir) {
+    const entries = await readdir(dir, { withFileTypes: true }).catch(() => []);
+    for (const entry of entries) {
+      if (entry.name === "node_modules" || entry.name.startsWith("."))
+        continue;
+      const fullPath = resolve(dir, entry.name);
+      if (entry.isDirectory()) {
+        await scanDir(fullPath);
+      } else if (entry.name.endsWith(".html") || entry.name.endsWith(".ts")) {
+        const contents = await readFile2(fullPath, "utf8");
+        const htmlStartMatches = contents.matchAll(/<sh-icon[^>]*icon=['"]([^'"]+)['"][^>]*>/g);
+        for (const m of htmlStartMatches) {
+          const icon = m[1].trim();
+          if (isValidIcon(icon))
+            uniqueIcons.add(icon);
+        }
+        const htmlContentMatches = contents.matchAll(/<sh-icon[^>]*>([^<]+)<\/sh-icon>/g);
+        for (const m of htmlContentMatches) {
+          const icon = m[1].trim();
+          if (isValidIcon(icon))
+            uniqueIcons.add(icon);
+        }
+        const tsMatches = contents.matchAll(/shicon:([^'"]+)['"]/g);
+        for (const m of tsMatches) {
+          const icon = m[1].trim();
+          if (isValidIcon(icon))
+            uniqueIcons.add(icon);
+        }
+      }
+    }
+  }
+  await scanDir(PROJECT_SRC);
+  const variants = ["bold", "thin", "light", "fill", "regular", "duotone"];
+  const glyphMaps = new Map;
+  for (const variant of variants) {
+    try {
+      const selPath = resolve(CWD_PATH2, "node_modules", "@phosphor-icons", "web", "src", variant, "selection.json");
+      const parsed = JSON.parse(await readFile2(selPath, "utf8"));
+      const isDuotone = variant === "duotone";
+      for (const icon of parsed.icons || []) {
+        const hexCode = icon.properties.code.toString(16);
+        const unicodeStr = `U+${hexCode}`;
+        const glyph = String.fromCodePoint(icon.properties.code);
+        let glyphName = isDuotone ? icon.properties.name : icon.properties.ligatures;
+        if (glyphName)
+          glyphMaps.set(glyphName, [glyph, unicodeStr]);
+      }
+    } catch (e) {}
+  }
+  const grouped = {
+    bold: [],
+    thin: [],
+    light: [],
+    fill: [],
+    regular: [],
+    duotone: [],
+    text: [],
+    missing: []
+  };
+  for (const icon of uniqueIcons) {
+    const isBold = icon.endsWith("-bold");
+    const isThin = icon.endsWith("-thin");
+    const isLight = icon.endsWith("-light");
+    const isFill = icon.endsWith("-fill");
+    const isDuotone = icon.endsWith("-duotone");
+    const isRegular = !isBold && !isThin && !isLight && !isFill && !isDuotone;
+    const mapEntry = glyphMaps.get(icon);
+    if (mapEntry) {
+      const tuple1 = [icon, ""];
+      const tuple2 = mapEntry;
+      if (isBold)
+        grouped.bold.push(tuple1, tuple2);
+      else if (isThin)
+        grouped.thin.push(tuple1, tuple2);
+      else if (isLight)
+        grouped.light.push(tuple1, tuple2);
+      else if (isFill)
+        grouped.fill.push(tuple1, tuple2);
+      else if (isDuotone)
+        grouped.duotone.push(tuple1, tuple2);
+      else
+        grouped.regular.push(tuple1, tuple2);
+    } else {
+      grouped.missing.push(icon);
+    }
+  }
+  return grouped;
+};
 var writtenCssSize = 0;
 var compressedCssSize = 0;
 var watchers = [];
@@ -3339,15 +3437,20 @@ var run = async (PROJECT_SRC, PROJECT_PUBLIC, TARGET_FONT_TYPE, values) => {
   try {
     const proc = spawnSync(scannerPath, [PROJECT_SRC, shipUiDir, CWD_PATH]);
     if (proc.error || proc.status !== 0) {
-      console.error("Error running scanner:", proc.stderr?.toString() || proc.error);
       throw new Error("Native scanner failed");
     }
-    const parsed = JSON.parse(proc.stdout?.toString() || "{}");
-    groupedIcons = parsed;
-    missingIconsArray = parsed.missing || [];
+    const { missing, ...rest } = JSON.parse(proc.stdout?.toString() || "{}");
+    groupedIcons = rest;
+    missingIconsArray = missing || [];
   } catch (err) {
-    console.error("Failed to run high-performance zig scanner:", err);
-    throw err;
+    try {
+      const { missing, ...rest } = await jsScannerFallback(PROJECT_SRC, shipUiDir, CWD_PATH);
+      groupedIcons = rest;
+      missingIconsArray = missing || [];
+    } catch (fallbackErr) {
+      console.error("Failed to run high-performance zig scanner and the javascript fallback failed:", fallbackErr);
+      throw err;
+    }
   }
   if (missingIconsArray.length) {
     console.log(`Following icons does not exist in font: 

package/bin/src/ship-fg.ts

@@ -2,7 +2,7 @@
 
 import { spawnSync } from 'child_process';
 import { FSWatcher, watch } from 'fs';
-import { readFile, writeFile } from 'fs/promises';
+import { readFile, writeFile, readdir } from 'fs/promises';
 import { dirname, join, resolve } from 'path';
 import { fileURLToPath } from 'url';
 import { gzipSync } from 'zlib';
@@ -16,6 +16,107 @@ import { formatFileSize, InputArguments, SupportedFontTypes } from './utilities'
 const CWD_PATH = process.cwd();
 const PHOSPHOR_SRC_PATH = resolve(CWD_PATH, 'node_modules', '@phosphor-icons', 'web', 'src');
 
+const jsScannerFallback = async (PROJECT_SRC: string, shipUiDir: string, CWD_PATH: string) => {
+  const uniqueIcons = new Set<string>();
+
+  const isValidIcon = (s: string) => /^[a-z0-9-]+$/.test(s);
+
+  try {
+    const pkgPath = resolve(shipUiDir, 'package.json');
+    const pkgData = JSON.parse(await readFile(pkgPath, 'utf8'));
+    if (pkgData.libraryIcons) {
+      pkgData.libraryIcons.forEach((i: string) => uniqueIcons.add(i));
+    }
+  } catch (e) {}
+
+  async function scanDir(dir: string) {
+    const entries = await readdir(dir, { withFileTypes: true }).catch(() => []);
+    for (const entry of entries) {
+      if (entry.name === 'node_modules' || entry.name.startsWith('.')) continue;
+      const fullPath = resolve(dir, entry.name);
+      if (entry.isDirectory()) {
+        await scanDir(fullPath);
+      } else if (entry.name.endsWith('.html') || entry.name.endsWith('.ts')) {
+        const contents = await readFile(fullPath, 'utf8');
+
+        const htmlStartMatches = contents.matchAll(/<sh-icon[^>]*icon=['"]([^'"]+)['"][^>]*>/g);
+        for (const m of htmlStartMatches) {
+          const icon = m[1].trim();
+          if (isValidIcon(icon)) uniqueIcons.add(icon);
+        }
+        const htmlContentMatches = contents.matchAll(/<sh-icon[^>]*>([^<]+)<\/sh-icon>/g);
+        for (const m of htmlContentMatches) {
+          const icon = m[1].trim();
+          if (isValidIcon(icon)) uniqueIcons.add(icon);
+        }
+
+        const tsMatches = contents.matchAll(/shicon:([^'"]+)['"]/g);
+        for (const m of tsMatches) {
+          const icon = m[1].trim();
+          if (isValidIcon(icon)) uniqueIcons.add(icon);
+        }
+      }
+    }
+  }
+  await scanDir(PROJECT_SRC);
+
+  const variants = ['bold', 'thin', 'light', 'fill', 'regular', 'duotone'];
+  const glyphMaps = new Map<string, [string, string]>();
+
+  for (const variant of variants) {
+    try {
+      const selPath = resolve(CWD_PATH, 'node_modules', '@phosphor-icons', 'web', 'src', variant, 'selection.json');
+      const parsed = JSON.parse(await readFile(selPath, 'utf8'));
+      const isDuotone = variant === 'duotone';
+
+      for (const icon of parsed.icons || []) {
+        const hexCode = icon.properties.code.toString(16);
+        const unicodeStr = `U+${hexCode}`;
+        const glyph = String.fromCodePoint(icon.properties.code);
+
+        let glyphName = isDuotone ? icon.properties.name : icon.properties.ligatures;
+        if (glyphName) glyphMaps.set(glyphName, [glyph, unicodeStr]);
+      }
+    } catch (e) {}
+  }
+
+  const grouped = {
+    bold: [] as [string, string][],
+    thin: [] as [string, string][],
+    light: [] as [string, string][],
+    fill: [] as [string, string][],
+    regular: [] as [string, string][],
+    duotone: [] as [string, string][],
+    text: [] as [string, string][],
+    missing: [] as string[],
+  };
+
+  for (const icon of uniqueIcons) {
+    const isBold = icon.endsWith('-bold');
+    const isThin = icon.endsWith('-thin');
+    const isLight = icon.endsWith('-light');
+    const isFill = icon.endsWith('-fill');
+    const isDuotone = icon.endsWith('-duotone');
+    const isRegular = !isBold && !isThin && !isLight && !isFill && !isDuotone;
+
+    const mapEntry = glyphMaps.get(icon);
+    if (mapEntry) {
+      const tuple1: [string, string] = [icon, ''];
+      const tuple2 = mapEntry; // [glyph, unicodeStr]
+      if (isBold) grouped.bold.push(tuple1, tuple2);
+      else if (isThin) grouped.thin.push(tuple1, tuple2);
+      else if (isLight) grouped.light.push(tuple1, tuple2);
+      else if (isFill) grouped.fill.push(tuple1, tuple2);
+      else if (isDuotone) grouped.duotone.push(tuple1, tuple2);
+      else grouped.regular.push(tuple1, tuple2);
+    } else {
+      grouped.missing.push(icon);
+    }
+  }
+
+  return grouped;
+};
+
 let writtenCssSize = 0;
 let compressedCssSize = 0;
 let watchers: FSWatcher[] = [];
@@ -37,16 +138,21 @@ const run = async (
   try {
     const proc = spawnSync(scannerPath, [PROJECT_SRC, shipUiDir, CWD_PATH]);
     if (proc.error || proc.status !== 0) {
-      console.error('Error running scanner:', proc.stderr?.toString() || proc.error);
       throw new Error('Native scanner failed');
     }
 
-    const parsed = JSON.parse(proc.stdout?.toString() || '{}');
-    groupedIcons = parsed;
-    missingIconsArray = parsed.missing || [];
+    const { missing, ...rest } = JSON.parse(proc.stdout?.toString() || '{}');
+    groupedIcons = rest;
+    missingIconsArray = missing || [];
   } catch (err) {
-    console.error('Failed to run high-performance zig scanner:', err);
-    throw err;
+    try {
+      const { missing, ...rest } = await jsScannerFallback(PROJECT_SRC, shipUiDir, CWD_PATH);
+      groupedIcons = rest;
+      missingIconsArray = missing || [];
+    } catch (fallbackErr) {
+      console.error('Failed to run high-performance zig scanner and the javascript fallback failed:', fallbackErr);
+      throw err;
+    }
   }
 
   if (missingIconsArray.length) {

package/fesm2022/ship-ui-core.mjs

@@ -1,7 +1,6 @@
 import * as i0 from '@angular/core';
 import { InjectionToken, inject, computed, ElementRef, Renderer2, input, ChangeDetectionStrategy, Component, viewChild, effect, HostListener, NgModule, signal, Injectable, DOCUMENT, model, output, ApplicationRef, OutputEmitterRef, TemplateRef, createComponent, isSignal, DestroyRef, PLATFORM_ID, ViewChild, booleanAttribute, Directive, untracked, contentChild, contentChildren, afterNextRender, Injector, HostBinding, runInInjectionContext, ChangeDetectorRef, viewChildren, ViewContainerRef, EnvironmentInjector } from '@angular/core';
 import { isPlatformBrowser, JsonPipe, DatePipe, isPlatformServer, NgTemplateOutlet } from '@angular/common';
-import { ShipButton as ShipButton$1 } from 'ship-ui';
 import { NgModel } from '@angular/forms';
 import { isObservable, firstValueFrom } from 'rxjs';
 
@@ -3660,13 +3659,13 @@ class ShipColorPickerInput {
         }
       </div>
     </sh-form-field-popover>
-  `, isInline: true, dependencies: [{ kind: "component", type: ShipFormFieldPopover, selector: "sh-form-field-popover", inputs: ["isOpen", "color", "variant", "size", "readonly"], outputs: ["isOpenChange", "closed"] }, { kind: "component", type: ShipColorPicker, selector: "sh-color-picker", inputs: ["showDarkColors", "renderingType", "gridSize", "hue", "direction", "selectedColor", "alpha"], outputs: ["hueChange", "selectedColorChange", "alphaChange", "currentColor"] }, { kind: "component", type: ShipIcon, selector: "sh-icon", inputs: ["color", "size"] }, { kind: "component", type: ShipButton$1, selector: "[shButton]", inputs: ["color", "variant", "size", "readonly"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+  `, isInline: true, dependencies: [{ kind: "component", type: ShipFormFieldPopover, selector: "sh-form-field-popover", inputs: ["isOpen", "color", "variant", "size", "readonly"], outputs: ["isOpenChange", "closed"] }, { kind: "component", type: ShipColorPicker, selector: "sh-color-picker", inputs: ["showDarkColors", "renderingType", "gridSize", "hue", "direction", "selectedColor", "alpha"], outputs: ["hueChange", "selectedColorChange", "alphaChange", "currentColor"] }, { kind: "component", type: ShipIcon, selector: "sh-icon", inputs: ["color", "size"] }, { kind: "component", type: ShipButton, selector: "[shButton]", inputs: ["color", "variant", "size", "readonly"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.6", ngImport: i0, type: ShipColorPickerInput, decorators: [{
             type: Component,
             args: [{
                     selector: 'sh-color-picker-input',
-                    imports: [ShipFormFieldPopover, ShipColorPicker, ShipIcon, ShipButton$1],
+                    imports: [ShipFormFieldPopover, ShipColorPicker, ShipIcon, ShipButton],
                     template: `
     <sh-form-field-popover 
       (closed)="close()"